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

List:       kde-commits
Subject:    [networkmanagement/nm09] /: Prevent conflicts with solidcontrol
From:       "Lamarque V. Souza" <lamarque () kde ! org>
Date:       2011-10-08 13:42:27
Message-ID: 20111008134227.A667AA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 5acb241c994c17122af8b42d6729c57a15a79cf0 by Lamarque V. Souza.
Committed on 08/10/2011 at 15:39.
Pushed by lvsouza into branch 'nm09'.

Prevent conflicts with solidcontrol i18n catalog already used by
kde-workspace.

CCMAIL: lueck@hube-lueck.de

M  +1    -1    applet/networkmanager.cpp
M  +1    -1    solidcontrolfuture/libs/solid/control/Messages.sh

http://commits.kde.org/networkmanagement/5acb241c994c17122af8b42d6729c57a15a79cf0

diff --git a/applet/networkmanager.cpp b/applet/networkmanager.cpp
index b388fc1..8ca5c58 100644
--- a/applet/networkmanager.cpp
+++ b/applet/networkmanager.cpp
@@ -79,7 +79,7 @@ NetworkManagerApplet::NetworkManagerApplet(QObject * parent, const \
QVariantList  m_activeSystrayInterface(0)
 {
     KGlobal::locale()->insertCatalog("libknetworkmanager");
-    KGlobal::locale()->insertCatalog("solidcontrol");
+    KGlobal::locale()->insertCatalog("solidcontrolnm09");
 
     setHasConfigurationInterface(true);
     setPopupIcon("networkmanager");
diff --git a/solidcontrolfuture/libs/solid/control/Messages.sh \
b/solidcontrolfuture/libs/solid/control/Messages.sh index b9a8080..c9d6d44 100644
--- a/solidcontrolfuture/libs/solid/control/Messages.sh
+++ b/solidcontrolfuture/libs/solid/control/Messages.sh
@@ -1,2 +1,2 @@
 #! /usr/bin/env bash
-$XGETTEXT *.cpp -o $podir/solidcontrol.pot
+$XGETTEXT *.cpp -o $podir/solidcontrolnm09.pot


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