[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=43a24ac

The following commit has been merged in the master branch:
commit 43a24ac12e0b57619fe83c25be0e6f0453b274fa
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Jun 17 18:44:46 2014 +0200

    Figure out Messages.sh after code refactoring
    
    KDED is translated again
    Rename the core's pot to kdeconnect-core.pot and make sure the library
    loads the catalog when it's linked to.
    Provide a separate translations file for all the plugins, together.
    
    REVIEW: 118774
---
 core/Messages.sh    | 10 ++--------
 core/daemon.cpp     |  3 +++
 kded/Messages.sh    |  4 ++++
 plugins/Messages.sh |  4 ++++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/core/Messages.sh b/core/Messages.sh
index 2a61de2..002bda0 100755
--- a/core/Messages.sh
+++ b/core/Messages.sh
@@ -1,10 +1,4 @@
 #!/usr/bin/env bash
 
-$EXTRACTRC `find -name '*.ui' -o -name '*.rc'` >> rc.cpp
-$XGETTEXT rc.cpp -o $podir/kdeconnect-kded.pot
-rm -f rc.cpp
-
-#.cpp (-j passed to merge into existing file)
-$XGETTEXT `find . -name '*.cpp'` -j -o $podir/kdeconnect-kded.pot
-
-#.desktop and .notifyrc files doesn't need to be included here
+$EXTRACTRC `find . -name '*.ui' -o -name '*.rc'` >> rc.cpp
+$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-core.pot
diff --git a/core/daemon.cpp b/core/daemon.cpp
index 4243ea9..9a259ee 100644
--- a/core/daemon.cpp
+++ b/core/daemon.cpp
@@ -41,6 +41,9 @@
 #include "backends/devicelink.h"
 #include "backends/linkprovider.h"
 
+static const KCatalogLoader loader("kdeconnect-core");
+static const KCatalogLoader loaderPlugins("kdeconnect-plugins");
+
 struct DaemonPrivate
 {
     //Different ways to find devices and connect to them
diff --git a/kded/Messages.sh b/kded/Messages.sh
new file mode 100644
index 0000000..268721e
--- /dev/null
+++ b/kded/Messages.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+$EXTRACTRC `find . -name '*.ui' -o -name '*.rc'` >> rc.cpp
+$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-kded.pot
diff --git a/plugins/Messages.sh b/plugins/Messages.sh
new file mode 100644
index 0000000..93278d2
--- /dev/null
+++ b/plugins/Messages.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+$EXTRACTRC `find . -name '*.ui' -o -name '*.rc'` >> rc.cpp
+$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-plugins.pot

-- 
kdeconnect packaging