Fix message extraction a bit

applets/kickoff/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
 $XGETTEXT `find . -name \*.qml -o -name \*.js -o -name \*.cpp` -o $podir/plasma_applet_org.kde.plasma.kickoff.pot
-rm -f rc.cpp

applets/kimpanel/backend/ibus/emojier/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
 $XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/org.kde.plasma.emojier.pot
-rm -f rc.cpp

applets/showActivityManager/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
 $XGETTEXT `find . -name \*.qml -o -name \*.cpp` -o $podir/plasma_applet_org.kde.plasma.showActivityManager.pot
-rm -f rc.cpp

applets/taskmanager/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
 $XGETTEXT `find . -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/plasma_applet_org.kde.plasma.taskmanager.pot
-rm -f rc.cpp

applets/trash/package/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
 $XGETTEXT `find . -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/plasma_applet_org.kde.plasma.trash.pot
-rm -f rc.cpp

applets/window-list/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
 $XGETTEXT `find . -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/plasma_applet_org.kde.plasma.windowlist.pot
-rm -f rc.cpp

containments/desktop/Messages.sh

@@ -1,6 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
-pofile=$podir/plasma_applet_org.kde.desktopcontainment.pot
-$XGETTEXT `find . -name \*.qml` -L Java -o $pofile
-$XGETTEXT `find . -name \*.cpp` -j -o $pofile
-rm -f rc.cpp
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -o -name \*.qml` -o $podir/plasma_applet_org.kde.desktopcontainment.pot

containments/panel/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
 $XGETTEXT `find . -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/plasma_applet_org.kde.panel.pot
-rm -f rc.cpp

kcms/cursortheme/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find -name \*.ui` >> rc.cpp || exit 11
 $XGETTEXT `find . -name \*.cpp -o -name \*.qml` -o $podir/kcm_cursortheme.pot
-rm -f rc.cpp

kcms/desktoptheme/Messages.sh

@@ -1,4 +1,4 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
+$EXTRACTRC `find . -name "*.kcfg"` >> rc.cpp || exit 11
 $XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_desktoptheme.pot
 rm -f rc.cpp

kcms/kded/Messages.sh

@@ -1,2 +1,2 @@
 #! /usr/bin/env bash
-$XGETTEXT *.cpp -o $podir/kcm5_kded.pot
+$XGETTEXT `find . -name \*.cc -o -name \*.cpp -o -name \*.h -o -name \*.qml` -o $podir/kcm5_kded.pot

kcms/kded/package/contents/ui/main.qml

@@ -28,13 +28,7 @@ import org.kde.private.kcms.style 1.0 as Private
 KCM.ScrollViewKCM {
     id: root
 
-    KCM.ConfigModule.quickHelp: i18n("<p>This module allows you to have an overview of all plugins of the
-KDE Daemon, also referred to as KDE Services. Generally, there are two types of service:</p>
-<ul><li>Services invoked at startup</li><li>Services called on demand</li></ul>
-<p>The latter are only listed for convenience. The startup services can be started and stopped.
-You can also define whether services should be loaded at startup.</p>
-<p><b>Use this with care: some services are vital for Plasma; do not deactivate services if you
- do not know what you are doing.</b></p>")
+    KCM.ConfigModule.quickHelp: i18n("<p>This module allows you to have an overview of all plugins of the KDE Daemon, also referred to as KDE Services. Generally, there are two types of service:</p> <ul><li>Services invoked at startup</li><li>Services called on demand</li></ul> <p>The latter are only listed for convenience. The startup services can be started and stopped. You can also define whether services should be loaded at startup.</p> <p><b>Use this with care: some services are vital for Plasma; do not deactivate services if you  do not know what you are doing.</b></p>")
 
     Binding {
         target: kcm.filteredModel

kcms/ksplash/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
 $XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_splashscreen.pot
-rm -f rc.cpp

kcms/lookandfeel/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
 $XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_lookandfeel.pot
-rm -f rc.cpp

kcms/runners/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
 $XGETTEXT `find . -name "*.cpp"` -o $podir/kcm_search.pot
-rm -f rc.cpp

toolboxes/desktoptoolbox/Messages.sh

@@ -1,4 +1,2 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
 $XGETTEXT `find . -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/plasma_toolbox_org.kde.desktoptoolbox.pot
-rm -f rc.cpp