Hi,

plasma seems to be like a big black hole i18n-wise, it's eating all our 
translations, but refuses to display them :(

there are a lot of i18n bugs caused by not matching names in the EXPORT makros 
and catalognames used in the corresponding Messages.sh.

attached a list from branch 4.3 with these errors.

according to my talk with aseigo on irc these naming conflicts should be solved 
by renaming the message catalogs.
this should be done in one step (change Messages.sh + rename all existing 
translation catalogs), to avoid loosing any translations.

as i suppose none of you has a full checkout of l10n-kde4/messages, this 
should be done by the kde-i18n-doc team?

what about kdeplasma-addons/dataengines/comic/?
is plasma_packagestructure_comic or plasma_engine_comic the proper catalog 
name?

beside these naming bugs there are some more issues to solve:

- applets/system-monitor
aseigo tried to fix the bug this morning in trunk and branch, but his fix does 
not work, so i wrote my own for branch, patch attached for review.

- lancelot_launcher
„Configure Shortcuts...“ in context menu untranslated

- weather + weatherstation
missing i18n calls for the strings from 
kdebase/workspace/plasma/dataengines/weather?

-- 
Burkhard Lück


kd...@rebutia:~/svn/kdebase/workspace/plasma$ wcgrep "\.pot\|K_EXPORT_PLASMA_" .

./applets/system-monitor/net.h:74:K_EXPORT_PLASMA_APPLET(sm_net, SM::Net)       
                          
./applets/system-monitor/hwinfo.h:63:K_EXPORT_PLASMA_APPLET(sm_hwinfo, HWInfo)  
                          
./applets/system-monitor/hdd.h:66:K_EXPORT_PLASMA_APPLET(sm_hdd, Hdd)           
                          
./applets/system-monitor/temperature.h:69:K_EXPORT_PLASMA_APPLET(sm_temperature,
 Temperature)             
./applets/system-monitor/cpu.h:70:K_EXPORT_PLASMA_APPLET(sm_cpu, SM::Cpu)       
                          
./applets/system-monitor/system-monitor.h:64:K_EXPORT_PLASMA_APPLET(system-monitor_applet,
 SystemMonitor) 
./applets/system-monitor/ram.h:68:K_EXPORT_PLASMA_APPLET(sm_ram, SM::Ram)       
                          
./applets/system-monitor/Messages.sh:3:$XGETTEXT *.cpp -o 
$podir/plasma_applet_system-monitor.pot         

./scriptengines/google_gadgets/ggl_applet_script.cpp:53:K_EXPORT_PLASMA_APPLETSCRIPTENGINE(googlegadget,
 GglAppletScript)                   
./scriptengines/google_gadgets/Messages.sh:2:$XGETTEXT *.cpp -o 
$podir/plasma_scriptengine_ggl.pot                                          
./scriptengines/google_gadgets/ggl_package.cpp:41:K_EXPORT_PLASMA_PACKAGESTRUCTURE(googlegadget,
 GglPackage)                                
plasma_scriptengine_ggl != plasma_appletscriptengine_googlegadget

./scriptengines/qedjescript/qedje_package.cpp:32:K_EXPORT_PLASMA_PACKAGESTRUCTURE(qedjescripts,
 QEdjePackage)                               
./scriptengines/qedjescript/Messages.sh:3:$XGETTEXT *.cpp -o 
$podir/plasma_appletscript_qedje.pot                                           
./scriptengines/qedjescript/qedje_applet.cpp:29:K_EXPORT_PLASMA_APPLETSCRIPTENGINE(qedjescripts,
 QEdjeAppletScript)                         
plasma_appletscript_qedje != plasma_appletscriptengine_qedjescripts

./containments/screensaver/desktop.cpp:104:K_EXPORT_PLASMA_APPLET(saverdesktop, 
SaverDesktop)
./containments/screensaver/Messages.sh:2:$XGETTEXT *.cpp -o 
$podir/plasma_containment_saverdesktop.pot
plasma_containment_saverdesktop != plasma_applet_saverdesktop


kd...@rebutia:~/svn/kdeplasma-addons$ wcgrep "\.pot\|K_EXPORT_PLASMA_" .

./applets/konsoleprofiles/konsoleprofilesapplet.h:55:K_EXPORT_PLASMA_APPLET(konsoleprofilesapplet,
 KonsoleProfilesApplet )
./applets/konsoleprofiles/Messages.sh:2:$XGETTEXT *.cpp -o 
$podir/plasma_applet_konsoleprofiles.pot                       
plasma_applet_konsoleprofiles != plasma_applet_konsoleprofilesapplet

./applets/charselect/charselect.h:54:K_EXPORT_PLASMA_APPLET(CharSelectApplet, 
CharSelectApplet)                           
./applets/charselect/Messages.sh:2:$XGETTEXT *.cpp -o 
$podir/plasma_applet_charselect.pot                                 
plasma_applet_charselect != plasma_applet_CharSelectApplet

./applets/microblog/microblog.h:175:K_EXPORT_PLASMA_APPLET(microblog, 
MicroBlog)                                          
./applets/microblog/Messages.sh:2:$XGETTEXT *.cpp -o 
$podir/plasma_applet_twitter.pot                                     
plasma_applet_twitter != plasma_applet_microblog

./applets/dict/dict.h:85:K_EXPORT_PLASMA_APPLET(qstardict, DictApplet)          
                                          
./applets/dict/Messages.sh:2:$XGETTEXT *.cpp -o $podir/plasma_applet_dict.pot
plasma_applet_dict != plasma_applet_qstardict

./applets/konqprofiles/konqprofilesapplet.h:56:K_EXPORT_PLASMA_APPLET(konqprofilesapplet,
 KonqProfilesApplet )
./applets/konqprofiles/Messages.sh:2:$XGETTEXT *.cpp -o 
$podir/plasma_applet_konqprofiles.pot
plasma_applet_konqprofiles != plasma_applet_konqprofilesapplet

./applets/bball/Messages.sh:2:$XGETTEXT *.cpp -o $podir/plasma_applet_bball.pot
./applets/bball/bball.h:95:K_EXPORT_PLASMA_APPLET (BbalL, bballApplet)
plasma_applet_bball != plasma_applet_BbalL

./dataengines/comic/comic_package_plugin.cpp:21:K_EXPORT_PLASMA_PACKAGESTRUCTURE(comic,
 ComicPackage)
./dataengines/comic/Messages.sh:2:$XGETTEXT *.cpp -o 
$podir/plasma_packagestructure_comic.pot
./dataengines/comic/comic.h:69:K_EXPORT_PLASMA_DATAENGINE( comic, ComicEngine )
plasma_packagestructure_comic ?
or
plasma_engine_comic ?

./dataengines/ocs/lib/Messages.sh:2:$XGETTEXT *.cpp -o $podir/libocsclient.pot
./dataengines/ocs/ocsengine.h:80:K_EXPORT_PLASMA_DATAENGINE(attica, OcsEngine )
./dataengines/ocs/Messages.sh:2:$XGETTEXT *.cpp -o $podir/plasma_engine_ocs.pot
Index: kdebase/workspace/plasma/applets/system-monitor/ram.cpp
===================================================================
--- kdebase/workspace/plasma/applets/system-monitor/ram.cpp	(Revision 992561)
+++ kdebase/workspace/plasma/applets/system-monitor/ram.cpp	(Arbeitskopie)
@@ -39,6 +39,7 @@
 
 void SM::Ram::init()
 {
+    KGlobal::locale()->insertCatalog("plasma_applet_system-monitor");
     KConfigGroup cg = config();
     setEngine(dataEngine("systemmonitor"));
     setInterval(cg.readEntry("interval", 2) * 1000);
Index: kdebase/workspace/plasma/applets/system-monitor/net.cpp
===================================================================
--- kdebase/workspace/plasma/applets/system-monitor/net.cpp	(Revision 992561)
+++ kdebase/workspace/plasma/applets/system-monitor/net.cpp	(Arbeitskopie)
@@ -42,6 +42,7 @@
 
 void SM::Net::init()
 {
+    KGlobal::locale()->insertCatalog("plasma_applet_system-monitor");
     KConfigGroup cg = config();
     setEngine(dataEngine("systemmonitor"));
     setInterval(cg.readEntry("interval", 2) * 1000);
Index: kdebase/workspace/plasma/applets/system-monitor/hwinfo.cpp
===================================================================
--- kdebase/workspace/plasma/applets/system-monitor/hwinfo.cpp	(Revision 992561)
+++ kdebase/workspace/plasma/applets/system-monitor/hwinfo.cpp	(Arbeitskopie)
@@ -52,6 +52,7 @@
 
 void HWInfo::init()
 {
+    KGlobal::locale()->insertCatalog("plasma_applet_system-monitor");
     setTitle(i18n("Hardware Info"));
     appendItem("info");
     connectToEngine();
Index: kdebase/workspace/plasma/applets/system-monitor/hdd.cpp
===================================================================
--- kdebase/workspace/plasma/applets/system-monitor/hdd.cpp	(Revision 992561)
+++ kdebase/workspace/plasma/applets/system-monitor/hdd.cpp	(Arbeitskopie)
@@ -40,6 +40,7 @@
 
 void Hdd::init()
 {
+    KGlobal::locale()->insertCatalog("plasma_applet_system-monitor");
     KConfigGroup cg = config();
     QString predicateString("IS StorageVolume");
     setEngine(dataEngine("soliddevice"));
Index: kdebase/workspace/plasma/applets/system-monitor/system-monitor.cpp
===================================================================
--- kdebase/workspace/plasma/applets/system-monitor/system-monitor.cpp	(Revision 992561)
+++ kdebase/workspace/plasma/applets/system-monitor/system-monitor.cpp	(Arbeitskopie)
@@ -86,9 +86,7 @@
         connect(button, SIGNAL(toggled(bool)), this, SLOT(toggled(bool)));
         m_buttons->addItem(button);
         m_monitorButtons << button;
-        KGlobal::locale()->insertCatalog(pluginInfo.pluginName());
     }
-
     m_layout->addItem(m_buttons);
     foreach (const QString& applet, appletNames) {
         if (appletsFound.contains(applet)) {
Index: kdebase/workspace/plasma/applets/system-monitor/cpu.cpp
===================================================================
--- kdebase/workspace/plasma/applets/system-monitor/cpu.cpp	(Revision 992561)
+++ kdebase/workspace/plasma/applets/system-monitor/cpu.cpp	(Arbeitskopie)
@@ -39,6 +39,7 @@
 
 void SM::Cpu::init()
 {
+    KGlobal::locale()->insertCatalog("plasma_applet_system-monitor");
     KConfigGroup cg = config();
     setEngine(dataEngine("systemmonitor"));
     setInterval(cg.readEntry("interval", 2) * 1000);
Index: kdebase/workspace/plasma/applets/system-monitor/temperature.cpp
===================================================================
--- kdebase/workspace/plasma/applets/system-monitor/temperature.cpp	(Revision 992561)
+++ kdebase/workspace/plasma/applets/system-monitor/temperature.cpp	(Arbeitskopie)
@@ -43,6 +43,7 @@
 
 void Temperature::init()
 {
+    KGlobal::locale()->insertCatalog("plasma_applet_system-monitor");
     KConfigGroup cg = config();
     setEngine(dataEngine("systemmonitor"));
     setInterval(cg.readEntry("interval", 2) * 1000);
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel

Reply via email to