From 43267c74cc57661a03ba1894c8bbd8394eadb6a5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 16 Jun 2014 04:30:47 +0000 Subject: [PATCH 1/6] SVN_SILENT made messages (.desktop file) --- .../kdeconnectsendfile.desktop | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index aa65875b4..611a1b3e5 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -1,8 +1,26 @@ [Desktop Entry] Type=Service Name=Send file via KDE Connect service +Name[ca]=Envia un fitxer a través del servei KDE Connect +Name[hu]=Fájl küldése a KDE csatlakozás szolgáltatáson keresztül +Name[nl]=Bestand via de service KDE Connect versturen +Name[pl]=Wyślij plik przez usługę KDE Connect +Name[pt]=Enviar um ficheiro pelo serviço KDE Connect +Name[pt_BR]=Enviar um arquivo pelo serviço KDE Connect +Name[sv]=Skicka fil via KDE:s anslutningstjänst +Name[uk]=Надсилання файла за допомогою служби з’єднання KDE +Name[x-test]=xxSend file via KDE Connect servicexx X-KDE-Library=kdeconnectfiletiemaction X-KDE-Submenu=Connect +X-KDE-Submenu[ca]=Connecta +X-KDE-Submenu[hu]=Csatlakozás +X-KDE-Submenu[nl]=Verbinden +X-KDE-Submenu[pl]=Połącz +X-KDE-Submenu[pt]=Ligar +X-KDE-Submenu[pt_BR]=Conectar +X-KDE-Submenu[sv]=Anslut +X-KDE-Submenu[uk]=З’єднання +X-KDE-Submenu[x-test]=xxConnectxx Icon=preferences-system-network ServiceTypes=KFileItemAction/Plugin From 43a24ac12e0b57619fe83c25be0e6f0453b274fa Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Tue, 17 Jun 2014 18:44:46 +0200 Subject: [PATCH 2/6] 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(-) create mode 100644 kded/Messages.sh create mode 100644 plugins/Messages.sh diff --git a/core/Messages.sh b/core/Messages.sh index 2a61de22c..002bda0cf 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 4243ea9f7..9a259eebf 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 000000000..268721e7e --- /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 000000000..93278d219 --- /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 From dd43479956e886a84b323579628dd36574e40b3a Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Tue, 17 Jun 2014 22:21:20 +0200 Subject: [PATCH 3/6] Now plugins load by default the kdeconnect-plugins catalog. --- plugins/battery/batteryplugin.cpp | 2 +- plugins/clipboard/clipboardplugin.cpp | 2 +- plugins/mpriscontrol/mpriscontrolplugin.cpp | 2 +- plugins/notifications/notificationsplugin.cpp | 2 +- plugins/pausemusic/pausemusicplugin.cpp | 2 +- plugins/ping/pingplugin.cpp | 2 +- plugins/sftp/sftpplugin.cpp | 2 +- plugins/share/shareplugin.cpp | 2 +- plugins/telephony/telephonyplugin.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/battery/batteryplugin.cpp b/plugins/battery/batteryplugin.cpp index af3e47aaf..7b677c211 100644 --- a/plugins/battery/batteryplugin.cpp +++ b/plugins/battery/batteryplugin.cpp @@ -28,7 +28,7 @@ #include "batterydbusinterface.h" K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< BatteryPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_battery", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_battery", "kdeconnect-plugins") ) BatteryPlugin::BatteryPlugin(QObject *parent, const QVariantList &args) : KdeConnectPlugin(parent, args) diff --git a/plugins/clipboard/clipboardplugin.cpp b/plugins/clipboard/clipboardplugin.cpp index bb31bb546..655cb104f 100644 --- a/plugins/clipboard/clipboardplugin.cpp +++ b/plugins/clipboard/clipboardplugin.cpp @@ -24,7 +24,7 @@ #include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< ClipboardPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_clipboard", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_clipboard", "kdeconnect-plugins") ) ClipboardPlugin::ClipboardPlugin(QObject *parent, const QVariantList &args) : KdeConnectPlugin(parent, args) diff --git a/plugins/mpriscontrol/mpriscontrolplugin.cpp b/plugins/mpriscontrol/mpriscontrolplugin.cpp index 30a78c65e..f76002098 100644 --- a/plugins/mpriscontrol/mpriscontrolplugin.cpp +++ b/plugins/mpriscontrol/mpriscontrolplugin.cpp @@ -34,7 +34,7 @@ #include "propertiesdbusinterface.h" K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< MprisControlPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_mpriscontrol", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_mpriscontrol", "kdeconnect-plugins") ) MprisControlPlugin::MprisControlPlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) diff --git a/plugins/notifications/notificationsplugin.cpp b/plugins/notifications/notificationsplugin.cpp index 67fa82530..1387a7e05 100644 --- a/plugins/notifications/notificationsplugin.cpp +++ b/plugins/notifications/notificationsplugin.cpp @@ -26,7 +26,7 @@ #include "notificationsdbusinterface.h" K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< NotificationsPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_notifications", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_notifications", "kdeconnect-plugins") ) NotificationsPlugin::NotificationsPlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) diff --git a/plugins/pausemusic/pausemusicplugin.cpp b/plugins/pausemusic/pausemusicplugin.cpp index a89bd6fe3..cf0d35916 100644 --- a/plugins/pausemusic/pausemusicplugin.cpp +++ b/plugins/pausemusic/pausemusicplugin.cpp @@ -33,7 +33,7 @@ #include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< PauseMusicPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_pausemusic", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_pausemusic", "kdeconnect-plugins") ) //TODO: Port this away from KMix to use only Pulseaudio int PauseMusicPlugin::isKMixMuted() { diff --git a/plugins/ping/pingplugin.cpp b/plugins/ping/pingplugin.cpp index 11826e233..182cdbcdb 100644 --- a/plugins/ping/pingplugin.cpp +++ b/plugins/ping/pingplugin.cpp @@ -28,7 +28,7 @@ #include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< PingPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_ping", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_ping", "kdeconnect-plugins") ) PingPlugin::PingPlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) diff --git a/plugins/sftp/sftpplugin.cpp b/plugins/sftp/sftpplugin.cpp index 716b52571..1a04dc0a3 100644 --- a/plugins/sftp/sftpplugin.cpp +++ b/plugins/sftp/sftpplugin.cpp @@ -38,7 +38,7 @@ #include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< SftpPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_sftp", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_sftp", "kdeconnect-plugins") ) static const QSet fields_c = QSet() << "ip" << "port" << "user" << "port" << "path"; diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp index 8af0ae1f8..7e4e0836a 100644 --- a/plugins/share/shareplugin.cpp +++ b/plugins/share/shareplugin.cpp @@ -38,7 +38,7 @@ #include "autoclosingqfile.h" K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< SharePlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_share", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_share", "kdeconnect-plugins") ) SharePlugin::SharePlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) diff --git a/plugins/telephony/telephonyplugin.cpp b/plugins/telephony/telephonyplugin.cpp index 6b9378f22..e547ca9d1 100644 --- a/plugins/telephony/telephonyplugin.cpp +++ b/plugins/telephony/telephonyplugin.cpp @@ -26,7 +26,7 @@ #include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< TelephonyPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_telephony", "kdeconnect-kded") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_telephony", "kdeconnect-plugins") ) TelephonyPlugin::TelephonyPlugin(QObject *parent, const QVariantList &args) : KdeConnectPlugin(parent, args) From 1f6cca406aee85e5e18ad83ac4463c8d5af87077 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Tue, 17 Jun 2014 22:21:31 +0200 Subject: [PATCH 4/6] Added a TODO --- kded/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index 23042227b..73cf45b92 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -10,4 +10,7 @@ target_link_libraries(kded_kdeconnect ${KDE4_KDECORE_LIBS}) install(TARGETS kdeconnectd DESTINATION ${LIBEXEC_INSTALL_DIR}) install(TARGETS kded_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) + +#TODO: Split this into several files for core and for each plugin install(FILES kdeconnect.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kdeconnect) + From f12a3768b40f3a7e4b2d40285dcd1fcbdd7cede6 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Tue, 17 Jun 2014 22:21:58 +0200 Subject: [PATCH 5/6] Translated sendfileitemaction and the CLI --- cli/Messages.sh | 3 +++ cli/kdeconnect-cli.cpp | 2 +- fileitemactionplugin/Messages.sh | 3 +++ fileitemactionplugin/sendfileitemaction.cpp | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 cli/Messages.sh create mode 100644 fileitemactionplugin/Messages.sh diff --git a/cli/Messages.sh b/cli/Messages.sh new file mode 100644 index 000000000..a41563757 --- /dev/null +++ b/cli/Messages.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-cli.pot diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp index 3366e7d18..184ef7e66 100644 --- a/cli/kdeconnect-cli.cpp +++ b/cli/kdeconnect-cli.cpp @@ -29,7 +29,7 @@ int main(int argc, char** argv) { - KAboutData about("kctool", 0, ki18n(("kctool")), "1.0", ki18n("KDE Connect CLI tool"), + KAboutData about("kctool", "kdeconnect-cli", ki18n(("kctool")), "1.0", ki18n("KDE Connect CLI tool"), KAboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez")); about.addAuthor( ki18n("Aleix Pol Gonzalez"), KLocalizedString(), "aleixpol@kde.org" ); KCmdLineArgs::init(argc, argv, &about); diff --git a/fileitemactionplugin/Messages.sh b/fileitemactionplugin/Messages.sh new file mode 100644 index 000000000..118c91208 --- /dev/null +++ b/fileitemactionplugin/Messages.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-filetiemaction.pot diff --git a/fileitemactionplugin/sendfileitemaction.cpp b/fileitemactionplugin/sendfileitemaction.cpp index 9d04dfd9c..6b2dd722b 100644 --- a/fileitemactionplugin/sendfileitemaction.cpp +++ b/fileitemactionplugin/sendfileitemaction.cpp @@ -38,7 +38,7 @@ #include K_PLUGIN_FACTORY(SendFileItemActionFactory, registerPlugin();) -K_EXPORT_PLUGIN(SendFileItemActionFactory("SendFileItemAction", "kdeconnectfiletiemaction")) +K_EXPORT_PLUGIN(SendFileItemActionFactory("SendFileItemAction", "kdeconnect-filetiemaction")) SendFileItemAction::SendFileItemAction(QObject* parent, const QVariantList& ): KFileItemActionPlugin(parent) { From 893378287494ad987f5100605103c0e45d9e1330 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Wed, 18 Jun 2014 02:41:55 +0200 Subject: [PATCH 6/6] Submit .reviewboardrc file Simplifies reviewboard patches submision --- .reviewboardrc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .reviewboardrc diff --git a/.reviewboardrc b/.reviewboardrc new file mode 100644 index 000000000..064c03e03 --- /dev/null +++ b/.reviewboardrc @@ -0,0 +1,3 @@ +REVIEWBOARD_URL = "https://git.reviewboard.kde.org" +REPOSITORY = 'git://anongit.kde.org/kdeconnect-kde' +TARGET_GROUPS = 'kdeconnect'