[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    extragear/sysadmin/muon
From:       Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date:       2010-11-06 17:43:34
Message-ID: 20101106174334.A8E2AAC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1193657 by jmthomas:

Separate the muon translation template into one template per application. (libmuon, \
muon, muon-updater, muon-installer and muon-notifier) Having one template shared \
between all these components turns out to be quite hard to package in a sane manner. \
I've inserted the libmuon translation catalog in to any applicaton deriving from \
MuonMainWindow in libmuon, so in theory this shouldn't cause any issues. If anything \
comes up, please do let me know.

CCMAIL:kde-i18n-doc@kde.org


 M  +9 -2      Messages.sh  
 M  +4 -2      installer/main.cpp  
 M  +1 -1      kded/MuonNotifier.cpp  
 M  +2 -0      muon/main.cpp  
 M  +3 -1      updater/main.cpp  


--- trunk/extragear/sysadmin/muon/Messages.sh #1193656:1193657
@@ -1,4 +1,11 @@
 #! /usr/bin/env bash
-$EXTRACTRC `find . -name \*.rc` >> rc.cpp
-$XGETTEXT rc.cpp `find . -name \*.cpp` -o $podir/muon.pot
+$EXTRACTRC `find muon/ -name \*.rc` >> muonrc.cpp
+$EXTRACTRC `find updater/ -name \*.rc` >> updaterrc.cpp
+$EXTRACTRC `find kded/ -name \*.rc` >> notifierrc.cpp
+$XGETTEXT `find libmuon -name \*.cpp` -o $podir/libmuon.pot
+$XGETTEXT muonrc.cpp `find muon -name \*.cpp` -o $podir/muon.pot
+$XGETTEXT updaterrc.cpp `find updater -name \*.cpp` -o $podir/muon-updater.pot
+$XGETTEXT `find installer -name \*.cpp` -o $podir/muon-installer.pot
+$XGETTEXT notifierrc.cpp `find kded/ -name \*.cpp` -o $podir/muon-notifier.pot
 rm -f rc.cpp
+rm -f updaterrc.cpp
--- trunk/extragear/sysadmin/muon/installer/main.cpp #1193656:1193657
@@ -29,11 +29,11 @@
 static const char description[] =
     I18N_NOOP("An application manager");
 
-static const char version[] = "1.0.1 \"Ambivalent Atraxi\"";
+static const char version[] = "1.0.60 \"Bullish Bandril\"";
 
 int main(int argc, char **argv)
 {
-    KAboutData about("muon-installer", "muon", ki18n("Muon Software Center"), \
version, ki18n(description), +    KAboutData about("muon-installer", \
                "muon-installer", ki18n("Muon Software Center"), version, \
                ki18n(description),
                      KAboutData::License_GPL, ki18n(" ©2010 Jonathan Thomas"), \
                KLocalizedString(), 0);
     about.addAuthor(ki18n("Jonathan Thomas"), KLocalizedString(), \
"echidnaman@kubuntu.org");  about.setProgramIconName("applications-other");
@@ -46,7 +46,9 @@
     }
 
     KUniqueApplication app;
+    // Translations from other templates
     KGlobal::locale()->insertCatalog("app-install-data");
+    KGlobal::locale()->insertCatalog("libmuon");
     app.disableSessionManagement();
 
     ApplicationWindow *mainWindow = new ApplicationWindow;
--- trunk/extragear/sysadmin/muon/kded/MuonNotifier.cpp #1193656:1193657
@@ -48,7 +48,7 @@
         , m_distUpgradeEvent(0)
         , m_configWatcher(0)
 {
-    KAboutData aboutData("muon-notifier", "muon",
+    KAboutData aboutData("muon-notifier", "muon-notifier",
                          ki18n("Muon Notification Daemon"),
                          "1.1", ki18n("A Notification Daemon for Muon"),
                          KAboutData::License_GPL,
--- trunk/extragear/sysadmin/muon/muon/main.cpp #1193656:1193657
@@ -47,6 +47,8 @@
 
     KUniqueApplication app;
     app.disableSessionManagement();
+    // Libmuon translations
+    KGlobal::locale()->insertCatalog("libmuon");
 
     MainWindow *mainWindow = new MainWindow;
     mainWindow->show();
--- trunk/extragear/sysadmin/muon/updater/main.cpp #1193656:1193657
@@ -33,7 +33,7 @@
 
 int main(int argc, char **argv)
 {
-    KAboutData about("muon-updater", "muon", ki18n("Muon Update Manager"), version, \
ki18n(description), +    KAboutData about("muon-updater", "muon-updater", ki18n("Muon \
                Update Manager"), version, ki18n(description),
                      KAboutData::License_GPL, ki18n(" ©2010 Jonathan Thomas"), \
                KLocalizedString(), 0);
     about.addAuthor(ki18n("Jonathan Thomas"), KLocalizedString(), \
"echidnaman@kubuntu.org");  about.setProgramIconName("system-software-update");
@@ -47,6 +47,8 @@
 
     KUniqueApplication app;
     app.disableSessionManagement();
+    // Libmuon translations
+    KGlobal::locale()->insertCatalog("libmuon");
 
     UpdaterWindow *mainWindow = new UpdaterWindow;
     mainWindow->show();


[prev in list] [next in list] [prev in thread] [next in thread]