From 77748fd2ffbe09cde6b5786f2c0ebd7b1ae8219c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 28 Nov 2014 04:14:57 +0000 Subject: [PATCH 01/21] SVN_SILENT made messages (.desktop file) --- plugins/kdeconnect.notifyrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 34b35e02c..662868566 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -55,7 +55,7 @@ Name[ca]=Sol·licitud d'aparellament Name[cs]=Požadavek na párování Name[de]=Verbindungsanfrage Name[es]=Petición de vinculación -Name[fi]=Parituspyyntö +Name[fi]=Paripyyntö Name[nl]=Verzoek om een paar te maken Name[pl]=Żądanie parowania Name[pt]=Pedido de Emparelhamento @@ -68,7 +68,7 @@ Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu Comment[cs]=Požadavek na párování přijat ze zařízení Comment[de]=Verbindungsanfrage von einem Gerät erhalten Comment[es]=Petición de vinculación recibida desde un dispositivo -Comment[fi]=Saatiin parituspyyntö laitteelta +Comment[fi]=Saatiin paripyyntö laitteelta Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat Comment[pl]=Otrzymano żądanie parowania z urządzeń Comment[pt]=Pedido de emparelhamento recebido de um dispositivo @@ -390,7 +390,7 @@ Name[ca]=Sol·licitud d'aparellament Name[cs]=Požadavek na párování Name[de]=Verbindungsanfrage Name[es]=Petición de vinculación -Name[fi]=Parituspyyntö +Name[fi]=Paripyyntö Name[nl]=Verzoek om een paar te maken Name[pl]=Żądanie parowania Name[pt]=Pedido de Emparelhamento @@ -403,7 +403,7 @@ Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu Comment[cs]=Požadavek na párování přijat ze zařízení Comment[de]=Verbindungsanfrage von einem Gerät erhalten Comment[es]=Petición de vinculación recibida desde un dispositivo -Comment[fi]=Saatiin parituspyyntö laitteelta +Comment[fi]=Saatiin paripyyntö laitteelta Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat Comment[pl]=Otrzymano żądanie parowania z urządzeń Comment[pt]=Pedido de emparelhamento recebido de um dispositivo From bba11e7978d496103daa0616498a15c7e6df9027 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 10 Dec 2014 03:58:34 +0000 Subject: [PATCH 02/21] SVN_SILENT made messages (.desktop file) --- plugins/kdeconnect.notifyrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 662868566..6917ac9f4 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -56,6 +56,7 @@ Name[cs]=Požadavek na párování Name[de]=Verbindungsanfrage Name[es]=Petición de vinculación Name[fi]=Paripyyntö +Name[hu]=Párosítási kérés Name[nl]=Verzoek om een paar te maken Name[pl]=Żądanie parowania Name[pt]=Pedido de Emparelhamento @@ -69,6 +70,7 @@ Comment[cs]=Požadavek na párování přijat ze zařízení Comment[de]=Verbindungsanfrage von einem Gerät erhalten Comment[es]=Petición de vinculación recibida desde un dispositivo Comment[fi]=Saatiin paripyyntö laitteelta +Comment[hu]=Párosítási kérés érkezett egy eszköztől Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat Comment[pl]=Otrzymano żądanie parowania z urządzeń Comment[pt]=Pedido de emparelhamento recebido de um dispositivo @@ -391,6 +393,7 @@ Name[cs]=Požadavek na párování Name[de]=Verbindungsanfrage Name[es]=Petición de vinculación Name[fi]=Paripyyntö +Name[hu]=Párosítási kérés Name[nl]=Verzoek om een paar te maken Name[pl]=Żądanie parowania Name[pt]=Pedido de Emparelhamento @@ -404,6 +407,7 @@ Comment[cs]=Požadavek na párování přijat ze zařízení Comment[de]=Verbindungsanfrage von einem Gerät erhalten Comment[es]=Petición de vinculación recibida desde un dispositivo Comment[fi]=Saatiin paripyyntö laitteelta +Comment[hu]=Párosítási kérés érkezett egy eszköztől Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat Comment[pl]=Otrzymano żądanie parowania z urządzeń Comment[pt]=Pedido de emparelhamento recebido de um dispositivo From 88a33ae242dc5c54fcbf8c5e22a541b725908c39 Mon Sep 17 00:00:00 2001 From: Michael Hathaway Date: Wed, 10 Dec 2014 23:30:40 -0800 Subject: [PATCH 03/21] Implemented drag'n drop in the mousepad plugin. REVIEW: 121414 CCMAIL: michael@hathaways.me.uk --- plugins/mousepad/mousepadplugin.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/mousepad/mousepadplugin.cpp b/plugins/mousepad/mousepadplugin.cpp index 69fba1a4c..9a8b489c7 100644 --- a/plugins/mousepad/mousepadplugin.cpp +++ b/plugins/mousepad/mousepadplugin.cpp @@ -87,11 +87,12 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np) bool isDoubleClick = np.get("doubleclick", false); bool isMiddleClick = np.get("middleclick", false); bool isRightClick = np.get("rightclick", false); + bool isSingleHold = np.get("singlehold", false); bool isScroll = np.get("scroll", false); QString key = np.get("key", ""); int specialKey = np.get("specialKey", 0); - if (isSingleClick || isDoubleClick || isMiddleClick || isRightClick || isScroll || !key.isEmpty() || specialKey) { + if (isSingleClick || isDoubleClick || isMiddleClick || isRightClick || isSingleHold || isScroll || !key.isEmpty() || specialKey) { if(!m_display) { m_display = XOpenDisplay(NULL); @@ -115,7 +116,9 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np) } else if (isRightClick) { XTestFakeButtonEvent(m_display, RightMouseButton, True, 0); XTestFakeButtonEvent(m_display, RightMouseButton, False, 0); - } else if( isScroll ) { + } else if (isSingleHold){ + XTestFakeButtonEvent(m_display, LeftMouseButton, True, 0); + }else if( isScroll ) { if (dy < 0) { XTestFakeButtonEvent(m_display, MouseWheelDown, True, 0); XTestFakeButtonEvent(m_display, MouseWheelDown, False, 0); From 0782682f7b3e72d0abc3a233fb2c2f02d7618df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zelina?= Date: Sat, 13 Dec 2014 14:41:53 -0800 Subject: [PATCH 04/21] Implemented current/total time and progress slider in MPRIS plugin CCMAIL: zelitomas@gmail.com. --- plugins/mpriscontrol/mpriscontrolplugin.cpp | 43 +++++++++++++++++++++ plugins/mpriscontrol/mpriscontrolplugin.h | 1 + 2 files changed, 44 insertions(+) diff --git a/plugins/mpriscontrol/mpriscontrolplugin.cpp b/plugins/mpriscontrol/mpriscontrolplugin.cpp index 2b7564d81..2f15fc701 100644 --- a/plugins/mpriscontrol/mpriscontrolplugin.cpp +++ b/plugins/mpriscontrol/mpriscontrolplugin.cpp @@ -83,6 +83,19 @@ void MprisControlPlugin::addPlayer(const QString& service) OrgFreedesktopDBusPropertiesInterface* freedesktopInterface = new OrgFreedesktopDBusPropertiesInterface(service, "/org/mpris/MediaPlayer2", QDBusConnection::sessionBus(), this); connect(freedesktopInterface, SIGNAL(PropertiesChanged(QString, QVariantMap, QStringList)), this, SLOT(propertiesChanged(QString, QVariantMap))); + OrgMprisMediaPlayer2PlayerInterface* mprisInterface0 = new OrgMprisMediaPlayer2PlayerInterface(service, "/org/mpris/MediaPlayer2", QDBusConnection::sessionBus()); + connect(mprisInterface0, SIGNAL(Seeked(qlonglong)), this, SLOT(seeked(qlonglong))); +} + +void MprisControlPlugin::seeked(qlonglong position){ + kDebug(debugArea()) << "Seeked in player"; + NetworkPackage np(PACKAGE_TYPE_MPRIS); + np.set("pos", position); + OrgFreedesktopDBusPropertiesInterface* interface = (OrgFreedesktopDBusPropertiesInterface*)sender(); + const QString& service = interface->service(); + const QString& player = playerList.key(service); + np.set("player", player); + sendPackage(np); } void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, const QVariantMap& properties) @@ -111,6 +124,16 @@ void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, con np.set("nowPlaying",nowPlaying); somethingToSend = true; } + if (nowPlayingMap.contains("mpris:length")) { + QString length = ""; + if (nowPlayingMap.contains("mpris:length")) { + length = nowPlayingMap["mpris:length"].toString(); + }else{ + length = "Unknown"; + } + np.set("length",length); + somethingToSend = true; + } } if (properties.contains("PlaybackStatus")) { @@ -124,6 +147,10 @@ void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, con const QString& service = interface->service(); const QString& player = playerList.key(service); np.set("player", player); + // Always also update the position + OrgMprisMediaPlayer2PlayerInterface mprisInterface(playerList[player], "/org/mpris/MediaPlayer2", QDBusConnection::sessionBus()); + int pos = (int)mprisInterface.position(); + np.set("pos", pos); sendPackage(np); } } @@ -171,6 +198,12 @@ bool MprisControlPlugin::receivePackage (const NetworkPackage& np) mprisInterface.Seek(offset); } + if (np.has("SetPosition")){ + int position = np.get("SetPosition") - (int)mprisInterface.position(); + kDebug(debugArea()) << "Setting position by seeking" << position << "to" << playerList[player]; + mprisInterface.Seek(position); + } + //Send something read from the mpris interface NetworkPackage answer(PACKAGE_TYPE_MPRIS); bool somethingToSend = false; @@ -180,7 +213,17 @@ bool MprisControlPlugin::receivePackage (const NetworkPackage& np) QString nowPlaying = nowPlayingMap["xesam:title"].toString(); if (nowPlayingMap.contains("xesam:artist")) { nowPlaying = nowPlayingMap["xesam:artist"].toString() + " - " + nowPlaying; + }if (nowPlayingMap.contains("mpris:length")) { + QString length = ""; + if (nowPlayingMap.contains("mpris:length")) { + length = nowPlayingMap["mpris:length"].toString(); + }else{ + length = "Unknown"; + } + answer.set("length",length); } + int pos = (int)mprisInterface.position(); + answer.set("pos", pos); answer.set("nowPlaying",nowPlaying); diff --git a/plugins/mpriscontrol/mpriscontrolplugin.h b/plugins/mpriscontrol/mpriscontrolplugin.h index 7b1e6f505..737abc5f1 100644 --- a/plugins/mpriscontrol/mpriscontrolplugin.h +++ b/plugins/mpriscontrol/mpriscontrolplugin.h @@ -43,6 +43,7 @@ public Q_SLOTS: private Q_SLOTS: void serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner); void propertiesChanged(const QString& propertyInterface, const QVariantMap& properties); + void seeked(qlonglong); private: void addPlayer(const QString& ifaceName); From c916575311c64814c093f49efc6257ca8955f449 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Sat, 13 Dec 2014 18:44:20 -0800 Subject: [PATCH 05/21] Better support for seeking long media: -Using miliseconds instead of nanoseconds for time. -Using longs instead of ints CCMAIL: zelitomas@gmail.com --- plugins/mpriscontrol/mpriscontrolplugin.cpp | 35 +++++++++------------ 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/plugins/mpriscontrol/mpriscontrolplugin.cpp b/plugins/mpriscontrol/mpriscontrolplugin.cpp index 2f15fc701..003ad4227 100644 --- a/plugins/mpriscontrol/mpriscontrolplugin.cpp +++ b/plugins/mpriscontrol/mpriscontrolplugin.cpp @@ -90,7 +90,7 @@ void MprisControlPlugin::addPlayer(const QString& service) void MprisControlPlugin::seeked(qlonglong position){ kDebug(debugArea()) << "Seeked in player"; NetworkPackage np(PACKAGE_TYPE_MPRIS); - np.set("pos", position); + np.set("pos", position/1000); //Send milis instead of nanos OrgFreedesktopDBusPropertiesInterface* interface = (OrgFreedesktopDBusPropertiesInterface*)sender(); const QString& service = interface->service(); const QString& player = playerList.key(service); @@ -125,13 +125,10 @@ void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, con somethingToSend = true; } if (nowPlayingMap.contains("mpris:length")) { - QString length = ""; if (nowPlayingMap.contains("mpris:length")) { - length = nowPlayingMap["mpris:length"].toString(); - }else{ - length = "Unknown"; + long long length = nowPlayingMap["mpris:length"].toLongLong(); + np.set("length",length/1000); //milis to nanos } - np.set("length",length); somethingToSend = true; } @@ -149,8 +146,10 @@ void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, con np.set("player", player); // Always also update the position OrgMprisMediaPlayer2PlayerInterface mprisInterface(playerList[player], "/org/mpris/MediaPlayer2", QDBusConnection::sessionBus()); - int pos = (int)mprisInterface.position(); - np.set("pos", pos); + if (mprisInterface.canSeek()) { + long long pos = mprisInterface.position(); + np.set("pos", pos/1000); //Send milis instead of nanos + } sendPackage(np); } } @@ -199,9 +198,10 @@ bool MprisControlPlugin::receivePackage (const NetworkPackage& np) } if (np.has("SetPosition")){ - int position = np.get("SetPosition") - (int)mprisInterface.position(); - kDebug(debugArea()) << "Setting position by seeking" << position << "to" << playerList[player]; - mprisInterface.Seek(position); + qlonglong position = np.get("SetPosition",0)*1000; + qlonglong seek = position - mprisInterface.position(); + kDebug(debugArea()) << "Setting position by seeking" << seek << "to" << playerList[player]; + mprisInterface.Seek(seek); } //Send something read from the mpris interface @@ -214,16 +214,11 @@ bool MprisControlPlugin::receivePackage (const NetworkPackage& np) if (nowPlayingMap.contains("xesam:artist")) { nowPlaying = nowPlayingMap["xesam:artist"].toString() + " - " + nowPlaying; }if (nowPlayingMap.contains("mpris:length")) { - QString length = ""; - if (nowPlayingMap.contains("mpris:length")) { - length = nowPlayingMap["mpris:length"].toString(); - }else{ - length = "Unknown"; - } - answer.set("length",length); + qlonglong length = nowPlayingMap["mpris:length"].toLongLong(); + answer.set("length",length/1000); } - int pos = (int)mprisInterface.position(); - answer.set("pos", pos); + qlonglong pos = mprisInterface.position(); + answer.set("pos", pos/1000); answer.set("nowPlaying",nowPlaying); From 640f63b87849b24e2e41dea99e9073cb493a6e1a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Dec 2014 04:09:09 +0000 Subject: [PATCH 06/21] SVN_SILENT made messages (.desktop file) --- plugins/share/kdeconnect_share.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/share/kdeconnect_share.desktop b/plugins/share/kdeconnect_share.desktop index 5f2c3201a..160c96c14 100644 --- a/plugins/share/kdeconnect_share.desktop +++ b/plugins/share/kdeconnect_share.desktop @@ -34,7 +34,7 @@ Name[uk]=Оприлюднення і отримання Name[x-test]=xxShare and receivexx Comment=Receive and send files, URLs or plain text easily Comment[bg]=Лесно получаване и изпращане на файлове, адреси и обикновен текст -Comment[ca]=Rep i envia fitxers, els URL o text pla amb facilitat +Comment[ca]=Rep i envia fitxers, els URL o text net amb facilitat Comment[cs]=Jednoduše přijímejte a posílejte soubory, URL nebo čistý text Comment[da]=Modtag og send filer, URL'er eller klartekst på nem måde Comment[de]=Empfang und Senden von Dateien, URLs oder einfacher Text From 0271aa9511e74c0ddc4f61eb2e2784b9da595488 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Sun, 21 Dec 2014 19:16:30 -0800 Subject: [PATCH 07/21] Ping plugin packet type define shouldn't be in core. --- core/networkpackagetypes.h | 1 - plugins/ping/pingplugin.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/networkpackagetypes.h b/core/networkpackagetypes.h index 553faba5d..6aa24a297 100644 --- a/core/networkpackagetypes.h +++ b/core/networkpackagetypes.h @@ -24,6 +24,5 @@ #define PACKAGE_TYPE_IDENTITY QLatin1String("kdeconnect.identity") #define PACKAGE_TYPE_PAIR QLatin1String("kdeconnect.pair") #define PACKAGE_TYPE_ENCRYPTED QLatin1String("kdeconnect.encrypted") -#define PACKAGE_TYPE_PING QLatin1String("kdeconnect.ping") #endif // NETWORKPACKAGETYPES_H diff --git a/plugins/ping/pingplugin.h b/plugins/ping/pingplugin.h index 6893ce590..614da4850 100644 --- a/plugins/ping/pingplugin.h +++ b/plugins/ping/pingplugin.h @@ -25,6 +25,8 @@ #include +#define PACKAGE_TYPE_PING QLatin1String("kdeconnect.ping") + class KDE_EXPORT PingPlugin : public KdeConnectPlugin { From c5bf6547ecef40a5c4aea6ba573cafdfdff6cc6c Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Sun, 21 Dec 2014 19:34:32 -0800 Subject: [PATCH 08/21] Added a README about how to create a plugin. Based on the work of Mikhail Ivchenko as part of a GCI task. --- plugins/README.txt | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 plugins/README.txt diff --git a/plugins/README.txt b/plugins/README.txt new file mode 100644 index 000000000..d88ea52a1 --- /dev/null +++ b/plugins/README.txt @@ -0,0 +1,42 @@ +Writting a plugin for KDE Connect +================================= + +For the desktop client (this project): +-------------------------------------- + +1. Enter the "plugins" directory. +2. Copy the "ping" under a different name ("findmyphone" in this example). +3. Add "add_subdirectory(findmyphone)" to CMakeLists.txt after the others "add_subdirectory". +1. Enter the new "findmyphone" directory. +5. Edit CMakeLists.txt by replacing "ping" with "findmyphone". +6. Rename other files in this directory by replacing "ping" with "findmyphone" +7. Write a description of your plugin into "README" +8. Edit findmyphoneplugin.cpp and findmyphoneplugin.h. + A. Change license header. + B. Replace (case sensitive) "ping" with "findmyphone", "PingPlugin" with "FindMyPhonePlugin" and "PING" with "FINDMYPHONE". +9. Edit kdeconnect_findmyphone.desktop file: + A. Replace "ping" with "findmyphone". + B. Change name, description, icon, author, email, version, website, license info. + C. Remove all the translations + D. Set X-KDEConnect-SupportedPackageType and X-KDEConnect-OutgoingPackageType to the package type your plugin will receive + and send, respectively. In this example this is "kdeconnect.findmyphone". Make sure that this matches what is defined in + the findmyplugin.h file (in the line "#define PACKAGE_TYPE_..."), and also in Android. +10. Now you have an empty skeleton to implement your new plugin logic. + +For Android (project kdeconnect-android): +----------------------------------------- + +1. Change directory to src/org/kde/kdeconnect/Plugins. +2. Copy "PingPlugin" under a different name ("FindMyPhonePlugin" in this example). +1. Enter the new "FindMyPhonePlugin" directory. +4. Rename "PingPlugin.java" to "FindMyPhonePlugin.java" +5. Edit it. Replace (case sensitive) "Ping" with "FindMyPhone", "ping" with "findmyphone", "PING" with "FINDMYPHONE" + and "plugin_ping" with "plugin_findmyphone". +6. Open res/values/strings.xml. Find and copy the lines "pref_plugin_ping_desc" and "pref_plugin_ping" replacing "ping" + with "findmyphone" and edit the plugin name and description between ). +7. Open src/org/kde/kdeconnect/Plugins/PluginFactory.java. + A. Copy "import … PingPlugin" line with replacing "PingPlugin" with "FindMyPhonePlugin". + B. Copy "PluginFactory.registerPlugin(PingPlugin.class);" line with replacing "PingPlugin" with "FindMyPhonePlugin". +8. Open src/org/kde/kdeconnect/NetworkPackage.java. Copy a "public final static String PACKAGE_TYPE_PING = …" line + replacing "PING" with the package type you will be using (should match the desktop client). +9. Now you have an empty skeleton to implement your new plugin logic. From 365b2c55b2f71e9c27d8e494ba6634f23dbff2a5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 Dec 2014 04:06:46 +0000 Subject: [PATCH 09/21] SVN_SILENT made messages (.desktop file) --- .../kdeconnectsendfile.desktop | 2 -- kcm/kcm_kdeconnect.desktop | 3 --- kcm/kdeconnect.desktop | 2 -- kded/kdeconnect.desktop | 2 -- plasmoid/package/metadata.desktop | 2 -- plugins/battery/kdeconnect_battery.desktop | 2 -- plugins/clipboard/kdeconnect_clipboard.desktop | 2 -- plugins/kdeconnect.notifyrc | 18 ------------------ plugins/kdeconnect_plugin.desktop | 1 - plugins/mousepad/kdeconnect_mousepad.desktop | 2 -- .../kdeconnect_mpriscontrol.desktop | 2 -- .../kdeconnect_notifications.desktop | 2 -- .../pausemusic/kdeconnect_pausemusic.desktop | 2 -- .../kdeconnect_pausemusic_config.desktop | 1 - plugins/ping/kdeconnect_ping.desktop | 2 -- plugins/sftp/kdeconnect_sftp.desktop | 2 -- plugins/sftp/kdeconnect_sftp_config.desktop | 1 - plugins/share/kdeconnect_share.desktop | 2 -- plugins/share/kdeconnect_share_config.desktop | 1 - plugins/telephony/kdeconnect_telephony.desktop | 2 -- 20 files changed, 53 deletions(-) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index ac0d01b26..c283960ac 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -16,7 +16,6 @@ Name[pt_BR]=Enviar um arquivo pelo serviço KDE Connect Name[sk]=Poslať súbor cez službu 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 @@ -34,7 +33,6 @@ X-KDE-Submenu[pt_BR]=Conectar X-KDE-Submenu[sk]=Pripojiť X-KDE-Submenu[sv]=Anslut X-KDE-Submenu[uk]=З’єднання -X-KDE-Submenu[x-test]=xxConnectxx Icon=preferences-system-network ServiceTypes=KFileItemAction/Plugin diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index f626b7825..b9084f51f 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -33,7 +33,6 @@ Name[sk]=KDE Connect Name[sv]=KDE anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE -Name[x-test]=xxKDE Connectxx Comment=Connect and sync your devices with KDE Comment[bg]=Свържете и синхронизирайте устройствата си с КДЕ @@ -57,7 +56,6 @@ Comment[sk]=Pripojiť a synchronizovať vaše zariadenia s KDE Comment[sv]=Anslut och synkronisera dina apparater med KDE Comment[tr]=Aygıtlarınıza KDE ile bağlanın ve eşitleyin Comment[uk]=З’єднання і синхронізація ваших пристроїв з KDE -Comment[x-test]=xxConnect and sync your devices with KDExx X-KDE-Keywords=Network,Android,Devices X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства @@ -81,6 +79,5 @@ X-KDE-Keywords[sk]=Sieť,Android,Zariadenia X-KDE-Keywords[sv]=Nätverk, Android, apparater X-KDE-Keywords[tr]=Ağ,Android,Cihazlar,Aygıtlar X-KDE-Keywords[uk]=Network,Android,Devices,мережа,андроїд,пристрої -X-KDE-Keywords[x-test]=xxNetwork,Android,Devicesxx Categories=Qt;KDE;X-KDE-settings-kdeconnect; diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop index 336680b9e..706d7f4c6 100755 --- a/kcm/kdeconnect.desktop +++ b/kcm/kdeconnect.desktop @@ -26,7 +26,6 @@ Name[sk]=KDE Connect Name[sv]=KDE anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE -Name[x-test]=xxKDE Connectxx GenericName=Connect smartphones to your KDE Plasma Workspace GenericName[bg]=Свържете смартфони към вашето работно пространство на Plasma GenericName[ca]=Connecta els telèfons intel·ligents al vostre espai de treball Plasma del KDE @@ -46,6 +45,5 @@ GenericName[sk]=Pripojiť smartfóny k vašej pracovnej ploche KDE Plasma GenericName[sv]=Anslut smartphone till KDE Plasma arbetsyta GenericName[tr]=Akıllı telefonları KDE Plasma Çalışma Alanı'nıza bağlayın GenericName[uk]=З’єднання смартфонів з вашим робочим простором Плазми KDE -GenericName[x-test]=xxConnect smartphones to your KDE Plasma Workspacexx Categories=Qt;KDE;Settings;HardwareSettings; Hidden=true diff --git a/kded/kdeconnect.desktop b/kded/kdeconnect.desktop index 1a1200e55..77b4b5b64 100644 --- a/kded/kdeconnect.desktop +++ b/kded/kdeconnect.desktop @@ -31,7 +31,6 @@ Name[sk]=KDE Connect Name[sv]=KDE anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE -Name[x-test]=xxKDE Connectxx Comment=Connect KDE with your smartphone Comment[bg]=Свържете КДЕ с вашия смартфон @@ -55,4 +54,3 @@ Comment[sk]=Prepojiť KDE s vašim smartfónom Comment[sv]=Anslut KDE till din smartphone Comment[tr]=KDE'yi akıllı telefonunuz ile bağlayın Comment[uk]=З’єднання KDE з вашим смартфоном -Comment[x-test]=xxConnect KDE with your smartphonexx diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index 1dbbbd7dc..13f660ede 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -22,7 +22,6 @@ Name[sk]=KDE Connect Name[sv]=KDE anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE -Name[x-test]=xxKDE Connectxx Comment=Show notifications from your devices using KDE Connect Comment[bg]=Показване на уведомления от вашите устройства чрез KDE Connect Comment[bs]=Prikaži obavlještenja sa uređaja koji koriste KDE konekciju @@ -45,7 +44,6 @@ Comment[sk]=Zobraziť oznámenia z vašich zariadení pomocou KDE Connect Comment[sv]=Visa underrättelser från apparater med KDE anslut Comment[tr]=KDE Bağlan kullanılarak cihazınızdan bildirimleri görüntüleyin Comment[uk]=Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE» -Comment[x-test]=xxShow notifications from your devices using KDE Connectxx Icon=kdeconnect Type=Service diff --git a/plugins/battery/kdeconnect_battery.desktop b/plugins/battery/kdeconnect_battery.desktop index 9601e045a..026b656a7 100644 --- a/plugins/battery/kdeconnect_battery.desktop +++ b/plugins/battery/kdeconnect_battery.desktop @@ -34,7 +34,6 @@ Name[sk]=Monitor batérie Name[sv]=Batteriövervakare Name[tr]=Pil izleyici Name[uk]=Монітор акумулятора -Name[x-test]=xxBattery monitorxx Comment=Show your phone battery next to your computer battery Comment[bg]=Показване на батерията на телефона редом с тази на компютъра Comment[bs]=Prikažite Vašu bateriju sa mobilnog telefona poted Vaše računarske baterije @@ -57,7 +56,6 @@ Comment[sk]=Zobraziť batériu vášho telefónu pri batérii počítača Comment[sv]=Visa telefonens batteri intill datorbatteriet Comment[tr]=Bilgisayar pilinizin yanında telefon pil durumunu göster Comment[uk]=Показ даних щодо рівня заряду акумулятора на телефоні поряд з даними щодо рівня заряду акумулятора комп’ютера -Comment[x-test]=xxShow your phone battery next to your computer batteryxx X-KdeConnect-SupportedPackageType=kdeconnect.battery X-KdeConnect-OutgoingPackageType=kdeconnect.battery diff --git a/plugins/clipboard/kdeconnect_clipboard.desktop b/plugins/clipboard/kdeconnect_clipboard.desktop index 94faa7830..386e228c7 100644 --- a/plugins/clipboard/kdeconnect_clipboard.desktop +++ b/plugins/clipboard/kdeconnect_clipboard.desktop @@ -34,7 +34,6 @@ Name[sk]=Schránka Name[sv]=Klippbord Name[tr]=Pano Name[uk]=Буфер обміну -Name[x-test]=xxClipboardxx Comment=Share the clipboard between devices Comment[bg]=Споделяне на буфера за обмен между устройства Comment[bs]=Podijeli Clipboard među uređajima @@ -58,7 +57,6 @@ Comment[sk]=Zdieľať schránku medzi zariadeniami Comment[sv]=Dela klippbordet mellan apparater Comment[tr]=Aygıtlar arasında panoyu paylaştır Comment[uk]=Спільне використання буфера обміну даними на пристроях -Comment[x-test]=xxShare the clipboard between devicesxx X-KdeConnect-SupportedPackageType=kdeconnect.clipboard X-KdeConnect-OutgoingPackageType=kdeconnect.clipboard diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 6917ac9f4..dc140b79e 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -23,7 +23,6 @@ Name[sk]=KDE Connect Name[sv]=KDE anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE -Name[x-test]=xxKDE Connectxx Comment=Notifications from your devices Comment[bg]=Уведомления от устройствата ви Comment[bs]=Notifikacija sa Vašeg uređaja @@ -47,7 +46,6 @@ Comment[sk]=Oznámenia z vašich zariadení Comment[sv]=Underrättelser från dina apparater Comment[tr]=Cihazınızdan bildirimler Comment[uk]=Сповіщення з вашого пристрою -Comment[x-test]=xxNotifications from your devicesxx [Event/pairingRequest] Name=Pairing Request @@ -63,7 +61,6 @@ Name[pt]=Pedido de Emparelhamento Name[pt_BR]=Solicitação de emparelhamento Name[sk]=Požiadavka na spárovanie Name[uk]=Запит щодо пов’язування -Name[x-test]=xxPairing Requestxx Comment=Pairing request received from a devices Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu Comment[cs]=Požadavek na párování přijat ze zařízení @@ -77,7 +74,6 @@ Comment[pt]=Pedido de emparelhamento recebido de um dispositivo Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo Comment[sk]=Požiadavka na spárovanie prijatá zo zariadenia Comment[uk]=Від пристрою отримано запит щодо пов’язування -Comment[x-test]=xxPairing request received from a devicesxx Action=Popup [Event/callReceived] @@ -104,7 +100,6 @@ Name[sk]=Volanie Name[sv]=Samtal Name[tr]=Aranıyor Name[uk]=Виклик -Name[x-test]=xxCallingxx Comment=Someone is calling you Comment[bg]=Някой ви се обажда Comment[bs]=Neko Vas zove @@ -128,7 +123,6 @@ Comment[sk]=Niekto vám volá Comment[sv]=Någon ringer till dig Comment[tr]=Biri sizi arıyor Comment[uk]=Хтось телефонує вам -Comment[x-test]=xxSomeone is calling youxx Action=Popup [Event/missedCall] @@ -155,7 +149,6 @@ Name[sk]=Zmeškané Name[sv]=Missat Name[tr]=Cevapsız Name[uk]=Пропущено -Name[x-test]=xxMissedxx Comment=You have a missed call Comment[bg]=Имате неприето обаждане Comment[bs]=Imate propušten poziv @@ -179,7 +172,6 @@ Comment[sk]=Máte zmeškaný hovor Comment[sv]=Du har missat ett samtal Comment[tr]=Cevapsız çağrınız var Comment[uk]=Вами пропущено телефонний дзвінок -Comment[x-test]=xxYou have a missed callxx Action=Popup [Event/smsReceived] @@ -206,7 +198,6 @@ Name[sk]=SMS Name[sv]=SMS Name[tr]=SMS Name[uk]=SMS -Name[x-test]=xxSMSxx Comment=Someone sent you an SMS Comment[bg]=Някой ви изпрати текстово съобщение Comment[bs]=Neko Vam je poslao SMS poruku @@ -230,7 +221,6 @@ Comment[sk]=Niekto vám poslal SMS Comment[sv]=Någon skickade ett SMS till dig Comment[tr]=Biri size SMS gönderdi Comment[uk]=Хтось надіслав вам SMS -Comment[x-test]=xxSomeone sent you an SMSxx Action=Popup [Event/batteryLow] @@ -257,7 +247,6 @@ Name[sk]=Batéria Name[sv]=Batteri Name[tr]=Pil Name[uk]=Акумулятор -Name[x-test]=xxBatteryxx Comment=Your battery is in low state Comment[bg]=Батерията ви е с нисък заряд Comment[bs]=Vaša baterija je gotovo prazna @@ -281,7 +270,6 @@ Comment[sk]=Vaša batéria je na nízkom stave Comment[sv]=Batteriet är nästan slut Comment[tr]=Pilinizin seviyesi düşük Comment[uk]=Рівень заряду акумулятора є низьким -Comment[x-test]=xxYour battery is in low statexx Action=Popup [Event/pingReceived] @@ -308,7 +296,6 @@ Name[sk]=Ping Name[sv]=Ping Name[tr]=Ping Name[uk]=Луна -Name[x-test]=xxPingxx Comment=Ping received Comment[bg]=Пингът е приет Comment[bs]=Primili ste ping @@ -332,7 +319,6 @@ Comment[sk]=Prijatý ping Comment[sv]=Ping mottaget Comment[tr]=Ping alındı Comment[uk]=Отримано сигнал підтримки зв’язку -Comment[x-test]=xxPing receivedxx Action=Popup [Event/notification] @@ -359,7 +345,6 @@ Name[sk]=Upozornenie Name[sv]=Underrättelse Name[tr]=Bildirim Name[uk]=Сповіщення -Name[x-test]=xxNotificationxx Comment=Notification received Comment[bg]=Уведомлението е прието Comment[bs]=Primjeno obavještenje @@ -383,7 +368,6 @@ Comment[sk]=Prijaté oznámenie Comment[sv]=Underrättelse mottagen Comment[tr]=Bildirim alındı Comment[uk]=Отримано сповіщення -Comment[x-test]=xxNotification receivedxx Action=Popup [Event/transferReceived] @@ -400,7 +384,6 @@ Name[pt]=Pedido de Emparelhamento Name[pt_BR]=Solicitação de emparelhamento Name[sk]=Požiadavka na spárovanie Name[uk]=Запит щодо пов’язування -Name[x-test]=xxPairing Requestxx Comment=Pairing request received from a devices Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu Comment[cs]=Požadavek na párování přijat ze zařízení @@ -414,7 +397,6 @@ Comment[pt]=Pedido de emparelhamento recebido de um dispositivo Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo Comment[sk]=Požiadavka na spárovanie prijatá zo zariadenia Comment[uk]=Від пристрою отримано запит щодо пов’язування -Comment[x-test]=xxPairing request received from a devicesxx Action=Popup diff --git a/plugins/kdeconnect_plugin.desktop b/plugins/kdeconnect_plugin.desktop index 02bdde62e..b3ccd7361 100644 --- a/plugins/kdeconnect_plugin.desktop +++ b/plugins/kdeconnect_plugin.desktop @@ -25,7 +25,6 @@ Name[sk]=Plugin KDEConnect Name[sv]=KDE anslutningsinsticksprogram Name[tr]=KDEConnect Eklentisi Name[uk]=Додаток KDEConnect -Name[x-test]=xxKDEConnect Pluginxx # mandatory, list of all the package types supported [PropertyDef::X-KdeConnect-SupportedPackageType] diff --git a/plugins/mousepad/kdeconnect_mousepad.desktop b/plugins/mousepad/kdeconnect_mousepad.desktop index 1c3204af5..3009e9c8a 100644 --- a/plugins/mousepad/kdeconnect_mousepad.desktop +++ b/plugins/mousepad/kdeconnect_mousepad.desktop @@ -26,7 +26,6 @@ Name[pt_BR]=Touchpad Name[sk]=Touchpad Name[sv]=Tryckplatta Name[uk]=Сенсорна панель -Name[x-test]=xxTouchpadxx Comment=Use your phone as a touchpad Comment[ca]=Usa el vostre telèfon com un plafó tàctil Comment[cs]=Používejte svůj telefon jako touchpad @@ -43,7 +42,6 @@ Comment[pt_BR]=Use seu celular como touchpad Comment[sk]=Použiť váš mobil ako touchpad Comment[sv]=Använd telefonen som en tryckplatta Comment[uk]=Використання телефону як сенсорної панелі -Comment[x-test]=xxUse your phone as a touchpadxx X-KdeConnect-SupportedPackageType=kdeconnect.mousepad X-KdeConnect-OutgoingPackageType=kdeconnect.mousepad diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop b/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop index e9d4e3ca7..7d4458f9b 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop @@ -33,7 +33,6 @@ Name[sk]=Prijímač ovládania multimédií Name[sv]=Mottagare av multimediastyrning Name[tr]=Çoklu ortam denetim alıcısı Name[uk]=Отримувач команд щодо керування мультимедійними функціями -Name[x-test]=xxMultimedia control receiverxx Comment=Remote control your music and videos Comment[bg]=Отдалечен контрол за вашата музика и видео Comment[bs]=Daljinsko upravljenje Vaše muzike i videa @@ -56,7 +55,6 @@ Comment[sk]=Vzdialene ovládať vašu hudbu a videá Comment[sv]=Fjärrstyr musik och videor Comment[tr]=Müzik ve videonuzu uzaktan kontrol edin Comment[uk]=Віддалене керування відтворенням музики та відео -Comment[x-test]=xxRemote control your music and videosxx X-KdeConnect-SupportedPackageType=kdeconnect.mpris X-KdeConnect-OutgoingPackageType=kdeconnect.mpris diff --git a/plugins/notifications/kdeconnect_notifications.desktop b/plugins/notifications/kdeconnect_notifications.desktop index 040f5fef5..44f3140a0 100644 --- a/plugins/notifications/kdeconnect_notifications.desktop +++ b/plugins/notifications/kdeconnect_notifications.desktop @@ -34,7 +34,6 @@ Name[sk]=Synchronizácia pripomienok Name[sv]=Synkronisering av underrättelser Name[tr]=Bildirim eşitleme Name[uk]=Синхронізація сповіщень -Name[x-test]=xxNotification syncxx Comment=Show phone notifications in KDE and keep them in sync Comment[bg]=Показване и синхронизиране на уведомления от телефона в КДЕ Comment[bs]=Prikaži objavještenja sa mobitela u KDE i održavaj ih sinhronizovanim @@ -57,7 +56,6 @@ Comment[sk]=Zobraziť oznámenia v KDE a ponechať ich v synchronizácii Comment[sv]=Visa telefonunderrättelser i KDE och håll dem synkroniserade Comment[tr]=Telefon bildirimlerini KDE içinde eşitler ve eşzamanlı tutar Comment[uk]=Показ сповіщень з телефону у KDE та підтримання синхронізації даних сповіщень -Comment[x-test]=xxShow phone notifications in KDE and keep them in syncxx X-KdeConnect-SupportedPackageType=kdeconnect.notification X-KdeConnect-OutgoingPackageType=kdeconnect.notification diff --git a/plugins/pausemusic/kdeconnect_pausemusic.desktop b/plugins/pausemusic/kdeconnect_pausemusic.desktop index 2aeeca21f..31192b2f5 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.desktop +++ b/plugins/pausemusic/kdeconnect_pausemusic.desktop @@ -33,7 +33,6 @@ Name[sk]=Pozastaviť médiá počas hovorov Name[sv]=Pausa media under samtal Name[tr]=Çağrılar sırasında ortamı duraklat Name[uk]=Призупинка відтворення під час дзвінків -Name[x-test]=xxPause media during callsxx Comment=Pause music/videos during a phone call Comment[bg]=Спиране музиката/видеото при позвъняване на телефона Comment[bs]=Stopiraj muziku/videe prilikom poziva @@ -56,6 +55,5 @@ Comment[sk]=Pozastaviť hudbu/videá počas telefónneho hovoru Comment[sv]=Pausa musik eller videor under ett telefonsamtal Comment[tr]=Bir telefon çağrısı sırasında müzik/videoları duraklat Comment[uk]=Призупинка відтворення музики і відео на час телефонних дзвінків -Comment[x-test]=xxPause music/videos during a phone callxx X-KdeConnect-SupportedPackageType=kdeconnect.telephony diff --git a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop index 0d9a30914..0e4abc4c5 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop +++ b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop @@ -24,6 +24,5 @@ Name[sk]=Nastavenia pluginu pozastavenia hudby Name[sv]=Inställningar av insticksprogram för paus i musik Name[tr]=Müziği Duraklat eklenti ayarları Name[uk]=Параметри додатка призупинення відтворення музики -Name[x-test]=xxPause Music plugin settingsxx Categories=Qt;KDE;X-KDE-settings-kdeconnect; diff --git a/plugins/ping/kdeconnect_ping.desktop b/plugins/ping/kdeconnect_ping.desktop index 7757bf67b..7dc27dcc0 100644 --- a/plugins/ping/kdeconnect_ping.desktop +++ b/plugins/ping/kdeconnect_ping.desktop @@ -34,7 +34,6 @@ Name[sk]=Ping Name[sv]=Ping Name[tr]=Ping Name[uk]=Луна -Name[x-test]=xxPingxx Comment=Send and receive pings Comment[bg]=Изпращане и получаване на пингове Comment[bs]=Šalji i primaj ping-ove @@ -58,7 +57,6 @@ Comment[sk]=Poslať a prijať pingy Comment[sv]=Skicka och ta emot ping Comment[tr]=Ping gönder ve al Comment[uk]=Надсилання і отримання сигналів підтримання зв’язку -Comment[x-test]=xxSend and receive pingsxx X-KdeConnect-SupportedPackageType=kdeconnect.ping X-KdeConnect-OutgoingPackageType=kdeconnect.ping diff --git a/plugins/sftp/kdeconnect_sftp.desktop b/plugins/sftp/kdeconnect_sftp.desktop index 9c3c53c7d..64407d80b 100644 --- a/plugins/sftp/kdeconnect_sftp.desktop +++ b/plugins/sftp/kdeconnect_sftp.desktop @@ -30,7 +30,6 @@ Name[sk]=Prehliadač vzdialeného súborového systému Name[sv]=Fjärrfilsystembläddrare Name[tr]=Uzak dosya sistemi tarayıcı Name[uk]=Перегляд віддалених файлових систем -Name[x-test]=xxRemote filesystem browserxx Comment=Browse the remote device filesystem using SFTP Comment[bg]=Отдалечено разглеждане на файловете на устройство чрез SFTP Comment[ca]=Navega pel sistema de fitxers dels dispositius remots usant SFTP @@ -50,7 +49,6 @@ Comment[sk]=Prehliadať súborový systém vzdialeného zariadenia pomocou SFTP Comment[sv]=Bläddra i fjärrenhetens filsystem med SFTP Comment[tr]=SFTP kullanarak uzak aygıt dosya sisteminde gezin Comment[uk]=Перегляд файлових систем на сторонніх пристроях за допомогою SFTP -Comment[x-test]=xxBrowse the remote device filesystem using SFTPxx X-KdeConnect-SupportedPackageType=kdeconnect.sftp X-KdeConnect-OutgoingPackageType=kdeconnect.sftp diff --git a/plugins/sftp/kdeconnect_sftp_config.desktop b/plugins/sftp/kdeconnect_sftp_config.desktop index 17477c551..4a89b11d1 100644 --- a/plugins/sftp/kdeconnect_sftp_config.desktop +++ b/plugins/sftp/kdeconnect_sftp_config.desktop @@ -24,6 +24,5 @@ Name[sk]=Nastavenia pluginu prehliadača súborov SFTP Name[sv]=Inställningar av insticksprogram för SFTP-filbläddrare Name[tr]=SFTP dosya tarayıcı eklenti ayarları Name[uk]=Параметри додатка перегляду файлів за допомогою SFTP -Name[x-test]=xxSFTP filebrowser plugin settingsxx Categories=Qt;KDE;X-KDE-settings-kdeconnect; diff --git a/plugins/share/kdeconnect_share.desktop b/plugins/share/kdeconnect_share.desktop index 160c96c14..3c9be1679 100644 --- a/plugins/share/kdeconnect_share.desktop +++ b/plugins/share/kdeconnect_share.desktop @@ -31,7 +31,6 @@ Name[sk]=Zdieľať a prijať Name[sv]=Dela och ta emot Name[tr]=Paylaş ve al Name[uk]=Оприлюднення і отримання -Name[x-test]=xxShare and receivexx Comment=Receive and send files, URLs or plain text easily Comment[bg]=Лесно получаване и изпращане на файлове, адреси и обикновен текст Comment[ca]=Rep i envia fitxers, els URL o text net amb facilitat @@ -51,7 +50,6 @@ Comment[sk]=Prijať a poslať súbory, URL alebo čisté texty jednoducho Comment[sv]=Ta emot och skicka filer, webbadresser eller vanlig text enkelt Comment[tr]=Kolaylıkla dosya, adres veya düz metin alıp gönderin Comment[uk]=Спрощене отримання і надсилання файлів, адрес або текстових фрагментів -Comment[x-test]=xxReceive and send files, URLs or plain text easilyxx X-KdeConnect-SupportedPackageType=kdeconnect.share X-KdeConnect-OutgoingPackageType=kdeconnect.share diff --git a/plugins/share/kdeconnect_share_config.desktop b/plugins/share/kdeconnect_share_config.desktop index 5e5cefaed..cb5008c25 100644 --- a/plugins/share/kdeconnect_share_config.desktop +++ b/plugins/share/kdeconnect_share_config.desktop @@ -24,6 +24,5 @@ Name[sk]=Nastavenia pluginu zdieľania Name[sv]=Inställningar av delningsinsticksprogram Name[tr]=Paylaşma eklentisi ayarları Name[uk]=Параметри додатка оприлюднення даних -Name[x-test]=xxShare plugin settingsxx Categories=Qt;KDE;X-KDE-settings-kdeconnect; diff --git a/plugins/telephony/kdeconnect_telephony.desktop b/plugins/telephony/kdeconnect_telephony.desktop index 2a7224849..2a2ee2565 100644 --- a/plugins/telephony/kdeconnect_telephony.desktop +++ b/plugins/telephony/kdeconnect_telephony.desktop @@ -34,7 +34,6 @@ Name[sk]=Integrácia telefónie Name[sv]=Integrering av telefoni Name[tr]=Telefon tümleştirmesi Name[uk]=Інтеграція з системою телефонії -Name[x-test]=xxTelephony integrationxx Comment=Show notifications for calls and SMS (answering coming soon) Comment[bg]=Показване на уведомления за обаждания и текстови съобщения (а скоро и отговаряне) Comment[bs]=Prikaži obavlještenja za pozive i SMS poruke(Odgovor slijedi uskoro) @@ -57,7 +56,6 @@ Comment[sk]=Zobraziť oznámenia pre hovory a SMS (čoskoro aj odpovede) Comment[sv]=Visa underrättelser om samtal och SMS (att svara kommer snart) Comment[tr]=Çağrı ve SMS'ler için bildirim göster (yanıtlama yakında geliyor) Comment[uk]=Показ сповіщень щодо дзвінків і SMS (скоро буде реалізовано і автовідповідач) -Comment[x-test]=xxShow notifications for calls and SMS (answering coming soon)xx X-KdeConnect-SupportedPackageType=kdeconnect.telephony X-KdeConnect-OutgoingPackageType= From 917104ff99ca384fa798acb458099b2482fc0d45 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 26 Dec 2014 04:20:08 +0000 Subject: [PATCH 10/21] SVN_SILENT made messages (.desktop file) --- .../kdeconnectsendfile.desktop | 2 ++ kcm/kcm_kdeconnect.desktop | 3 +++ kcm/kdeconnect.desktop | 2 ++ kded/kdeconnect.desktop | 2 ++ plasmoid/package/metadata.desktop | 2 ++ plugins/battery/kdeconnect_battery.desktop | 2 ++ plugins/clipboard/kdeconnect_clipboard.desktop | 2 ++ plugins/kdeconnect.notifyrc | 18 ++++++++++++++++++ plugins/kdeconnect_plugin.desktop | 1 + plugins/mousepad/kdeconnect_mousepad.desktop | 2 ++ .../kdeconnect_mpriscontrol.desktop | 2 ++ .../kdeconnect_notifications.desktop | 2 ++ .../pausemusic/kdeconnect_pausemusic.desktop | 2 ++ .../kdeconnect_pausemusic_config.desktop | 1 + plugins/ping/kdeconnect_ping.desktop | 2 ++ plugins/sftp/kdeconnect_sftp.desktop | 2 ++ plugins/sftp/kdeconnect_sftp_config.desktop | 1 + plugins/share/kdeconnect_share.desktop | 2 ++ plugins/share/kdeconnect_share_config.desktop | 1 + plugins/telephony/kdeconnect_telephony.desktop | 2 ++ 20 files changed, 53 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index c283960ac..ac0d01b26 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -16,6 +16,7 @@ Name[pt_BR]=Enviar um arquivo pelo serviço KDE Connect Name[sk]=Poslať súbor cez službu 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 @@ -33,6 +34,7 @@ X-KDE-Submenu[pt_BR]=Conectar X-KDE-Submenu[sk]=Pripojiť X-KDE-Submenu[sv]=Anslut X-KDE-Submenu[uk]=З’єднання +X-KDE-Submenu[x-test]=xxConnectxx Icon=preferences-system-network ServiceTypes=KFileItemAction/Plugin diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index b9084f51f..f626b7825 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -33,6 +33,7 @@ Name[sk]=KDE Connect Name[sv]=KDE anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE +Name[x-test]=xxKDE Connectxx Comment=Connect and sync your devices with KDE Comment[bg]=Свържете и синхронизирайте устройствата си с КДЕ @@ -56,6 +57,7 @@ Comment[sk]=Pripojiť a synchronizovať vaše zariadenia s KDE Comment[sv]=Anslut och synkronisera dina apparater med KDE Comment[tr]=Aygıtlarınıza KDE ile bağlanın ve eşitleyin Comment[uk]=З’єднання і синхронізація ваших пристроїв з KDE +Comment[x-test]=xxConnect and sync your devices with KDExx X-KDE-Keywords=Network,Android,Devices X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства @@ -79,5 +81,6 @@ X-KDE-Keywords[sk]=Sieť,Android,Zariadenia X-KDE-Keywords[sv]=Nätverk, Android, apparater X-KDE-Keywords[tr]=Ağ,Android,Cihazlar,Aygıtlar X-KDE-Keywords[uk]=Network,Android,Devices,мережа,андроїд,пристрої +X-KDE-Keywords[x-test]=xxNetwork,Android,Devicesxx Categories=Qt;KDE;X-KDE-settings-kdeconnect; diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop index 706d7f4c6..336680b9e 100755 --- a/kcm/kdeconnect.desktop +++ b/kcm/kdeconnect.desktop @@ -26,6 +26,7 @@ Name[sk]=KDE Connect Name[sv]=KDE anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE +Name[x-test]=xxKDE Connectxx GenericName=Connect smartphones to your KDE Plasma Workspace GenericName[bg]=Свържете смартфони към вашето работно пространство на Plasma GenericName[ca]=Connecta els telèfons intel·ligents al vostre espai de treball Plasma del KDE @@ -45,5 +46,6 @@ GenericName[sk]=Pripojiť smartfóny k vašej pracovnej ploche KDE Plasma GenericName[sv]=Anslut smartphone till KDE Plasma arbetsyta GenericName[tr]=Akıllı telefonları KDE Plasma Çalışma Alanı'nıza bağlayın GenericName[uk]=З’єднання смартфонів з вашим робочим простором Плазми KDE +GenericName[x-test]=xxConnect smartphones to your KDE Plasma Workspacexx Categories=Qt;KDE;Settings;HardwareSettings; Hidden=true diff --git a/kded/kdeconnect.desktop b/kded/kdeconnect.desktop index 77b4b5b64..1a1200e55 100644 --- a/kded/kdeconnect.desktop +++ b/kded/kdeconnect.desktop @@ -31,6 +31,7 @@ Name[sk]=KDE Connect Name[sv]=KDE anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE +Name[x-test]=xxKDE Connectxx Comment=Connect KDE with your smartphone Comment[bg]=Свържете КДЕ с вашия смартфон @@ -54,3 +55,4 @@ Comment[sk]=Prepojiť KDE s vašim smartfónom Comment[sv]=Anslut KDE till din smartphone Comment[tr]=KDE'yi akıllı telefonunuz ile bağlayın Comment[uk]=З’єднання KDE з вашим смартфоном +Comment[x-test]=xxConnect KDE with your smartphonexx diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index 13f660ede..1dbbbd7dc 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -22,6 +22,7 @@ Name[sk]=KDE Connect Name[sv]=KDE anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE +Name[x-test]=xxKDE Connectxx Comment=Show notifications from your devices using KDE Connect Comment[bg]=Показване на уведомления от вашите устройства чрез KDE Connect Comment[bs]=Prikaži obavlještenja sa uređaja koji koriste KDE konekciju @@ -44,6 +45,7 @@ Comment[sk]=Zobraziť oznámenia z vašich zariadení pomocou KDE Connect Comment[sv]=Visa underrättelser från apparater med KDE anslut Comment[tr]=KDE Bağlan kullanılarak cihazınızdan bildirimleri görüntüleyin Comment[uk]=Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE» +Comment[x-test]=xxShow notifications from your devices using KDE Connectxx Icon=kdeconnect Type=Service diff --git a/plugins/battery/kdeconnect_battery.desktop b/plugins/battery/kdeconnect_battery.desktop index 026b656a7..9601e045a 100644 --- a/plugins/battery/kdeconnect_battery.desktop +++ b/plugins/battery/kdeconnect_battery.desktop @@ -34,6 +34,7 @@ Name[sk]=Monitor batérie Name[sv]=Batteriövervakare Name[tr]=Pil izleyici Name[uk]=Монітор акумулятора +Name[x-test]=xxBattery monitorxx Comment=Show your phone battery next to your computer battery Comment[bg]=Показване на батерията на телефона редом с тази на компютъра Comment[bs]=Prikažite Vašu bateriju sa mobilnog telefona poted Vaše računarske baterije @@ -56,6 +57,7 @@ Comment[sk]=Zobraziť batériu vášho telefónu pri batérii počítača Comment[sv]=Visa telefonens batteri intill datorbatteriet Comment[tr]=Bilgisayar pilinizin yanında telefon pil durumunu göster Comment[uk]=Показ даних щодо рівня заряду акумулятора на телефоні поряд з даними щодо рівня заряду акумулятора комп’ютера +Comment[x-test]=xxShow your phone battery next to your computer batteryxx X-KdeConnect-SupportedPackageType=kdeconnect.battery X-KdeConnect-OutgoingPackageType=kdeconnect.battery diff --git a/plugins/clipboard/kdeconnect_clipboard.desktop b/plugins/clipboard/kdeconnect_clipboard.desktop index 386e228c7..94faa7830 100644 --- a/plugins/clipboard/kdeconnect_clipboard.desktop +++ b/plugins/clipboard/kdeconnect_clipboard.desktop @@ -34,6 +34,7 @@ Name[sk]=Schránka Name[sv]=Klippbord Name[tr]=Pano Name[uk]=Буфер обміну +Name[x-test]=xxClipboardxx Comment=Share the clipboard between devices Comment[bg]=Споделяне на буфера за обмен между устройства Comment[bs]=Podijeli Clipboard među uređajima @@ -57,6 +58,7 @@ Comment[sk]=Zdieľať schránku medzi zariadeniami Comment[sv]=Dela klippbordet mellan apparater Comment[tr]=Aygıtlar arasında panoyu paylaştır Comment[uk]=Спільне використання буфера обміну даними на пристроях +Comment[x-test]=xxShare the clipboard between devicesxx X-KdeConnect-SupportedPackageType=kdeconnect.clipboard X-KdeConnect-OutgoingPackageType=kdeconnect.clipboard diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index dc140b79e..6917ac9f4 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -23,6 +23,7 @@ Name[sk]=KDE Connect Name[sv]=KDE anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE +Name[x-test]=xxKDE Connectxx Comment=Notifications from your devices Comment[bg]=Уведомления от устройствата ви Comment[bs]=Notifikacija sa Vašeg uređaja @@ -46,6 +47,7 @@ Comment[sk]=Oznámenia z vašich zariadení Comment[sv]=Underrättelser från dina apparater Comment[tr]=Cihazınızdan bildirimler Comment[uk]=Сповіщення з вашого пристрою +Comment[x-test]=xxNotifications from your devicesxx [Event/pairingRequest] Name=Pairing Request @@ -61,6 +63,7 @@ Name[pt]=Pedido de Emparelhamento Name[pt_BR]=Solicitação de emparelhamento Name[sk]=Požiadavka na spárovanie Name[uk]=Запит щодо пов’язування +Name[x-test]=xxPairing Requestxx Comment=Pairing request received from a devices Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu Comment[cs]=Požadavek na párování přijat ze zařízení @@ -74,6 +77,7 @@ Comment[pt]=Pedido de emparelhamento recebido de um dispositivo Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo Comment[sk]=Požiadavka na spárovanie prijatá zo zariadenia Comment[uk]=Від пристрою отримано запит щодо пов’язування +Comment[x-test]=xxPairing request received from a devicesxx Action=Popup [Event/callReceived] @@ -100,6 +104,7 @@ Name[sk]=Volanie Name[sv]=Samtal Name[tr]=Aranıyor Name[uk]=Виклик +Name[x-test]=xxCallingxx Comment=Someone is calling you Comment[bg]=Някой ви се обажда Comment[bs]=Neko Vas zove @@ -123,6 +128,7 @@ Comment[sk]=Niekto vám volá Comment[sv]=Någon ringer till dig Comment[tr]=Biri sizi arıyor Comment[uk]=Хтось телефонує вам +Comment[x-test]=xxSomeone is calling youxx Action=Popup [Event/missedCall] @@ -149,6 +155,7 @@ Name[sk]=Zmeškané Name[sv]=Missat Name[tr]=Cevapsız Name[uk]=Пропущено +Name[x-test]=xxMissedxx Comment=You have a missed call Comment[bg]=Имате неприето обаждане Comment[bs]=Imate propušten poziv @@ -172,6 +179,7 @@ Comment[sk]=Máte zmeškaný hovor Comment[sv]=Du har missat ett samtal Comment[tr]=Cevapsız çağrınız var Comment[uk]=Вами пропущено телефонний дзвінок +Comment[x-test]=xxYou have a missed callxx Action=Popup [Event/smsReceived] @@ -198,6 +206,7 @@ Name[sk]=SMS Name[sv]=SMS Name[tr]=SMS Name[uk]=SMS +Name[x-test]=xxSMSxx Comment=Someone sent you an SMS Comment[bg]=Някой ви изпрати текстово съобщение Comment[bs]=Neko Vam je poslao SMS poruku @@ -221,6 +230,7 @@ Comment[sk]=Niekto vám poslal SMS Comment[sv]=Någon skickade ett SMS till dig Comment[tr]=Biri size SMS gönderdi Comment[uk]=Хтось надіслав вам SMS +Comment[x-test]=xxSomeone sent you an SMSxx Action=Popup [Event/batteryLow] @@ -247,6 +257,7 @@ Name[sk]=Batéria Name[sv]=Batteri Name[tr]=Pil Name[uk]=Акумулятор +Name[x-test]=xxBatteryxx Comment=Your battery is in low state Comment[bg]=Батерията ви е с нисък заряд Comment[bs]=Vaša baterija je gotovo prazna @@ -270,6 +281,7 @@ Comment[sk]=Vaša batéria je na nízkom stave Comment[sv]=Batteriet är nästan slut Comment[tr]=Pilinizin seviyesi düşük Comment[uk]=Рівень заряду акумулятора є низьким +Comment[x-test]=xxYour battery is in low statexx Action=Popup [Event/pingReceived] @@ -296,6 +308,7 @@ Name[sk]=Ping Name[sv]=Ping Name[tr]=Ping Name[uk]=Луна +Name[x-test]=xxPingxx Comment=Ping received Comment[bg]=Пингът е приет Comment[bs]=Primili ste ping @@ -319,6 +332,7 @@ Comment[sk]=Prijatý ping Comment[sv]=Ping mottaget Comment[tr]=Ping alındı Comment[uk]=Отримано сигнал підтримки зв’язку +Comment[x-test]=xxPing receivedxx Action=Popup [Event/notification] @@ -345,6 +359,7 @@ Name[sk]=Upozornenie Name[sv]=Underrättelse Name[tr]=Bildirim Name[uk]=Сповіщення +Name[x-test]=xxNotificationxx Comment=Notification received Comment[bg]=Уведомлението е прието Comment[bs]=Primjeno obavještenje @@ -368,6 +383,7 @@ Comment[sk]=Prijaté oznámenie Comment[sv]=Underrättelse mottagen Comment[tr]=Bildirim alındı Comment[uk]=Отримано сповіщення +Comment[x-test]=xxNotification receivedxx Action=Popup [Event/transferReceived] @@ -384,6 +400,7 @@ Name[pt]=Pedido de Emparelhamento Name[pt_BR]=Solicitação de emparelhamento Name[sk]=Požiadavka na spárovanie Name[uk]=Запит щодо пов’язування +Name[x-test]=xxPairing Requestxx Comment=Pairing request received from a devices Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu Comment[cs]=Požadavek na párování přijat ze zařízení @@ -397,6 +414,7 @@ Comment[pt]=Pedido de emparelhamento recebido de um dispositivo Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo Comment[sk]=Požiadavka na spárovanie prijatá zo zariadenia Comment[uk]=Від пристрою отримано запит щодо пов’язування +Comment[x-test]=xxPairing request received from a devicesxx Action=Popup diff --git a/plugins/kdeconnect_plugin.desktop b/plugins/kdeconnect_plugin.desktop index b3ccd7361..02bdde62e 100644 --- a/plugins/kdeconnect_plugin.desktop +++ b/plugins/kdeconnect_plugin.desktop @@ -25,6 +25,7 @@ Name[sk]=Plugin KDEConnect Name[sv]=KDE anslutningsinsticksprogram Name[tr]=KDEConnect Eklentisi Name[uk]=Додаток KDEConnect +Name[x-test]=xxKDEConnect Pluginxx # mandatory, list of all the package types supported [PropertyDef::X-KdeConnect-SupportedPackageType] diff --git a/plugins/mousepad/kdeconnect_mousepad.desktop b/plugins/mousepad/kdeconnect_mousepad.desktop index 3009e9c8a..1c3204af5 100644 --- a/plugins/mousepad/kdeconnect_mousepad.desktop +++ b/plugins/mousepad/kdeconnect_mousepad.desktop @@ -26,6 +26,7 @@ Name[pt_BR]=Touchpad Name[sk]=Touchpad Name[sv]=Tryckplatta Name[uk]=Сенсорна панель +Name[x-test]=xxTouchpadxx Comment=Use your phone as a touchpad Comment[ca]=Usa el vostre telèfon com un plafó tàctil Comment[cs]=Používejte svůj telefon jako touchpad @@ -42,6 +43,7 @@ Comment[pt_BR]=Use seu celular como touchpad Comment[sk]=Použiť váš mobil ako touchpad Comment[sv]=Använd telefonen som en tryckplatta Comment[uk]=Використання телефону як сенсорної панелі +Comment[x-test]=xxUse your phone as a touchpadxx X-KdeConnect-SupportedPackageType=kdeconnect.mousepad X-KdeConnect-OutgoingPackageType=kdeconnect.mousepad diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop b/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop index 7d4458f9b..e9d4e3ca7 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop @@ -33,6 +33,7 @@ Name[sk]=Prijímač ovládania multimédií Name[sv]=Mottagare av multimediastyrning Name[tr]=Çoklu ortam denetim alıcısı Name[uk]=Отримувач команд щодо керування мультимедійними функціями +Name[x-test]=xxMultimedia control receiverxx Comment=Remote control your music and videos Comment[bg]=Отдалечен контрол за вашата музика и видео Comment[bs]=Daljinsko upravljenje Vaše muzike i videa @@ -55,6 +56,7 @@ Comment[sk]=Vzdialene ovládať vašu hudbu a videá Comment[sv]=Fjärrstyr musik och videor Comment[tr]=Müzik ve videonuzu uzaktan kontrol edin Comment[uk]=Віддалене керування відтворенням музики та відео +Comment[x-test]=xxRemote control your music and videosxx X-KdeConnect-SupportedPackageType=kdeconnect.mpris X-KdeConnect-OutgoingPackageType=kdeconnect.mpris diff --git a/plugins/notifications/kdeconnect_notifications.desktop b/plugins/notifications/kdeconnect_notifications.desktop index 44f3140a0..040f5fef5 100644 --- a/plugins/notifications/kdeconnect_notifications.desktop +++ b/plugins/notifications/kdeconnect_notifications.desktop @@ -34,6 +34,7 @@ Name[sk]=Synchronizácia pripomienok Name[sv]=Synkronisering av underrättelser Name[tr]=Bildirim eşitleme Name[uk]=Синхронізація сповіщень +Name[x-test]=xxNotification syncxx Comment=Show phone notifications in KDE and keep them in sync Comment[bg]=Показване и синхронизиране на уведомления от телефона в КДЕ Comment[bs]=Prikaži objavještenja sa mobitela u KDE i održavaj ih sinhronizovanim @@ -56,6 +57,7 @@ Comment[sk]=Zobraziť oznámenia v KDE a ponechať ich v synchronizácii Comment[sv]=Visa telefonunderrättelser i KDE och håll dem synkroniserade Comment[tr]=Telefon bildirimlerini KDE içinde eşitler ve eşzamanlı tutar Comment[uk]=Показ сповіщень з телефону у KDE та підтримання синхронізації даних сповіщень +Comment[x-test]=xxShow phone notifications in KDE and keep them in syncxx X-KdeConnect-SupportedPackageType=kdeconnect.notification X-KdeConnect-OutgoingPackageType=kdeconnect.notification diff --git a/plugins/pausemusic/kdeconnect_pausemusic.desktop b/plugins/pausemusic/kdeconnect_pausemusic.desktop index 31192b2f5..2aeeca21f 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.desktop +++ b/plugins/pausemusic/kdeconnect_pausemusic.desktop @@ -33,6 +33,7 @@ Name[sk]=Pozastaviť médiá počas hovorov Name[sv]=Pausa media under samtal Name[tr]=Çağrılar sırasında ortamı duraklat Name[uk]=Призупинка відтворення під час дзвінків +Name[x-test]=xxPause media during callsxx Comment=Pause music/videos during a phone call Comment[bg]=Спиране музиката/видеото при позвъняване на телефона Comment[bs]=Stopiraj muziku/videe prilikom poziva @@ -55,5 +56,6 @@ Comment[sk]=Pozastaviť hudbu/videá počas telefónneho hovoru Comment[sv]=Pausa musik eller videor under ett telefonsamtal Comment[tr]=Bir telefon çağrısı sırasında müzik/videoları duraklat Comment[uk]=Призупинка відтворення музики і відео на час телефонних дзвінків +Comment[x-test]=xxPause music/videos during a phone callxx X-KdeConnect-SupportedPackageType=kdeconnect.telephony diff --git a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop index 0e4abc4c5..0d9a30914 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop +++ b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop @@ -24,5 +24,6 @@ Name[sk]=Nastavenia pluginu pozastavenia hudby Name[sv]=Inställningar av insticksprogram för paus i musik Name[tr]=Müziği Duraklat eklenti ayarları Name[uk]=Параметри додатка призупинення відтворення музики +Name[x-test]=xxPause Music plugin settingsxx Categories=Qt;KDE;X-KDE-settings-kdeconnect; diff --git a/plugins/ping/kdeconnect_ping.desktop b/plugins/ping/kdeconnect_ping.desktop index 7dc27dcc0..7757bf67b 100644 --- a/plugins/ping/kdeconnect_ping.desktop +++ b/plugins/ping/kdeconnect_ping.desktop @@ -34,6 +34,7 @@ Name[sk]=Ping Name[sv]=Ping Name[tr]=Ping Name[uk]=Луна +Name[x-test]=xxPingxx Comment=Send and receive pings Comment[bg]=Изпращане и получаване на пингове Comment[bs]=Šalji i primaj ping-ove @@ -57,6 +58,7 @@ Comment[sk]=Poslať a prijať pingy Comment[sv]=Skicka och ta emot ping Comment[tr]=Ping gönder ve al Comment[uk]=Надсилання і отримання сигналів підтримання зв’язку +Comment[x-test]=xxSend and receive pingsxx X-KdeConnect-SupportedPackageType=kdeconnect.ping X-KdeConnect-OutgoingPackageType=kdeconnect.ping diff --git a/plugins/sftp/kdeconnect_sftp.desktop b/plugins/sftp/kdeconnect_sftp.desktop index 64407d80b..9c3c53c7d 100644 --- a/plugins/sftp/kdeconnect_sftp.desktop +++ b/plugins/sftp/kdeconnect_sftp.desktop @@ -30,6 +30,7 @@ Name[sk]=Prehliadač vzdialeného súborového systému Name[sv]=Fjärrfilsystembläddrare Name[tr]=Uzak dosya sistemi tarayıcı Name[uk]=Перегляд віддалених файлових систем +Name[x-test]=xxRemote filesystem browserxx Comment=Browse the remote device filesystem using SFTP Comment[bg]=Отдалечено разглеждане на файловете на устройство чрез SFTP Comment[ca]=Navega pel sistema de fitxers dels dispositius remots usant SFTP @@ -49,6 +50,7 @@ Comment[sk]=Prehliadať súborový systém vzdialeného zariadenia pomocou SFTP Comment[sv]=Bläddra i fjärrenhetens filsystem med SFTP Comment[tr]=SFTP kullanarak uzak aygıt dosya sisteminde gezin Comment[uk]=Перегляд файлових систем на сторонніх пристроях за допомогою SFTP +Comment[x-test]=xxBrowse the remote device filesystem using SFTPxx X-KdeConnect-SupportedPackageType=kdeconnect.sftp X-KdeConnect-OutgoingPackageType=kdeconnect.sftp diff --git a/plugins/sftp/kdeconnect_sftp_config.desktop b/plugins/sftp/kdeconnect_sftp_config.desktop index 4a89b11d1..17477c551 100644 --- a/plugins/sftp/kdeconnect_sftp_config.desktop +++ b/plugins/sftp/kdeconnect_sftp_config.desktop @@ -24,5 +24,6 @@ Name[sk]=Nastavenia pluginu prehliadača súborov SFTP Name[sv]=Inställningar av insticksprogram för SFTP-filbläddrare Name[tr]=SFTP dosya tarayıcı eklenti ayarları Name[uk]=Параметри додатка перегляду файлів за допомогою SFTP +Name[x-test]=xxSFTP filebrowser plugin settingsxx Categories=Qt;KDE;X-KDE-settings-kdeconnect; diff --git a/plugins/share/kdeconnect_share.desktop b/plugins/share/kdeconnect_share.desktop index 3c9be1679..160c96c14 100644 --- a/plugins/share/kdeconnect_share.desktop +++ b/plugins/share/kdeconnect_share.desktop @@ -31,6 +31,7 @@ Name[sk]=Zdieľať a prijať Name[sv]=Dela och ta emot Name[tr]=Paylaş ve al Name[uk]=Оприлюднення і отримання +Name[x-test]=xxShare and receivexx Comment=Receive and send files, URLs or plain text easily Comment[bg]=Лесно получаване и изпращане на файлове, адреси и обикновен текст Comment[ca]=Rep i envia fitxers, els URL o text net amb facilitat @@ -50,6 +51,7 @@ Comment[sk]=Prijať a poslať súbory, URL alebo čisté texty jednoducho Comment[sv]=Ta emot och skicka filer, webbadresser eller vanlig text enkelt Comment[tr]=Kolaylıkla dosya, adres veya düz metin alıp gönderin Comment[uk]=Спрощене отримання і надсилання файлів, адрес або текстових фрагментів +Comment[x-test]=xxReceive and send files, URLs or plain text easilyxx X-KdeConnect-SupportedPackageType=kdeconnect.share X-KdeConnect-OutgoingPackageType=kdeconnect.share diff --git a/plugins/share/kdeconnect_share_config.desktop b/plugins/share/kdeconnect_share_config.desktop index cb5008c25..5e5cefaed 100644 --- a/plugins/share/kdeconnect_share_config.desktop +++ b/plugins/share/kdeconnect_share_config.desktop @@ -24,5 +24,6 @@ Name[sk]=Nastavenia pluginu zdieľania Name[sv]=Inställningar av delningsinsticksprogram Name[tr]=Paylaşma eklentisi ayarları Name[uk]=Параметри додатка оприлюднення даних +Name[x-test]=xxShare plugin settingsxx Categories=Qt;KDE;X-KDE-settings-kdeconnect; diff --git a/plugins/telephony/kdeconnect_telephony.desktop b/plugins/telephony/kdeconnect_telephony.desktop index 2a2ee2565..2a7224849 100644 --- a/plugins/telephony/kdeconnect_telephony.desktop +++ b/plugins/telephony/kdeconnect_telephony.desktop @@ -34,6 +34,7 @@ Name[sk]=Integrácia telefónie Name[sv]=Integrering av telefoni Name[tr]=Telefon tümleştirmesi Name[uk]=Інтеграція з системою телефонії +Name[x-test]=xxTelephony integrationxx Comment=Show notifications for calls and SMS (answering coming soon) Comment[bg]=Показване на уведомления за обаждания и текстови съобщения (а скоро и отговаряне) Comment[bs]=Prikaži obavlještenja za pozive i SMS poruke(Odgovor slijedi uskoro) @@ -56,6 +57,7 @@ Comment[sk]=Zobraziť oznámenia pre hovory a SMS (čoskoro aj odpovede) Comment[sv]=Visa underrättelser om samtal och SMS (att svara kommer snart) Comment[tr]=Çağrı ve SMS'ler için bildirim göster (yanıtlama yakında geliyor) Comment[uk]=Показ сповіщень щодо дзвінків і SMS (скоро буде реалізовано і автовідповідач) +Comment[x-test]=xxShow notifications for calls and SMS (answering coming soon)xx X-KdeConnect-SupportedPackageType=kdeconnect.telephony X-KdeConnect-OutgoingPackageType= From 0779377337f7001280304c02ceb98faabf7e3b4f Mon Sep 17 00:00:00 2001 From: Pramod Dematagoda Date: Mon, 29 Dec 2014 00:03:41 -0800 Subject: [PATCH 11/21] Added a plugin to inhibit the screensaver when a device is connected. The inhibition is lifted when the plugin disconnects. REVIEW: 121692 --- plugins/CMakeLists.txt | 1 + plugins/screensaver-inhibit/CMakeLists.txt | 10 +++ plugins/screensaver-inhibit/README | 3 + .../kdeconnect_screensaver_inhibit.desktop | 15 ++++ .../screensaverinhibitplugin.cpp | 78 +++++++++++++++++++ .../screensaverinhibitplugin.h | 45 +++++++++++ 6 files changed, 152 insertions(+) create mode 100644 plugins/screensaver-inhibit/CMakeLists.txt create mode 100644 plugins/screensaver-inhibit/README create mode 100644 plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop create mode 100644 plugins/screensaver-inhibit/screensaverinhibitplugin.cpp create mode 100644 plugins/screensaver-inhibit/screensaverinhibitplugin.h diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index de1131d22..ed1efe088 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -11,6 +11,7 @@ add_subdirectory(mousepad) add_subdirectory(share) add_subdirectory(notifications) add_subdirectory(sftp) +add_subdirectory(screensaver-inhibit) #FIXME: If we split notifications in several files, they won't appear in the same group in the Notifications KCM install(FILES kdeconnect.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kdeconnect) diff --git a/plugins/screensaver-inhibit/CMakeLists.txt b/plugins/screensaver-inhibit/CMakeLists.txt new file mode 100644 index 000000000..2f0d56d56 --- /dev/null +++ b/plugins/screensaver-inhibit/CMakeLists.txt @@ -0,0 +1,10 @@ +set(kdeconnect_screensaver_inhibit_SRCS + screensaverinhibitplugin.cpp +) + +kde4_add_plugin(kdeconnect_screensaver_inhibit ${kdeconnect_screensaver_inhibit_SRCS}) + +target_link_libraries(kdeconnect_screensaver_inhibit kdeconnectcore ${KDE4_KDEUI_LIBS}) + +install(TARGETS kdeconnect_screensaver_inhibit DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(FILES kdeconnect_screensaver_inhibit.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/plugins/screensaver-inhibit/README b/plugins/screensaver-inhibit/README new file mode 100644 index 000000000..9f1b7ee19 --- /dev/null +++ b/plugins/screensaver-inhibit/README @@ -0,0 +1,3 @@ +This plugin inhibits the screensaver from kicking in when the device is connected +to kdeconnect, it then uninhibits the screensaver if the device was to go out of +range or be disconnected. \ No newline at end of file diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop new file mode 100644 index 000000000..80f72799c --- /dev/null +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Service +ServiceTypes=KdeConnect/Plugin +X-KDE-Library=kdeconnect_screensaver_inhibit +X-KDE-PluginInfo-Author=Pramod Dematagoda +X-KDE-PluginInfo-Email=pmdematagoda@mykolab.ch +X-KDE-PluginInfo-Name=kdeconnect_screensaver_inhibit +X-KDE-PluginInfo-Version=0.1 +X-KDE-PluginInfo-Website=http://albertvaka.wordpress.com +X-KDE-PluginInfo-License=GPL +X-KDE-PluginInfo-EnabledByDefault=false +Icon=preferences-desktop-screensaver +Name=Inhibit screensaver +Comment=Inhibit the screensaver when the device is connected \ No newline at end of file diff --git a/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp b/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp new file mode 100644 index 000000000..85ac1995f --- /dev/null +++ b/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp @@ -0,0 +1,78 @@ +/** + * Copyright 2014 Pramod Dematagoda + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License or (at your option) version 3 or any later version + * accepted by the membership of KDE e.V. (or its successor approved + * by the membership of KDE e.V.), which shall act as a proxy + * defined in Section 14 of version 3 of the license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "screensaverinhibitplugin.h" + +#include +#include +#include + +#include +#include +#include +#include + +K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< ScreensaverInhibitPlugin >(); ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_screensaver_inhibit", "kdeconnect-plugins") ) + +const QString INHIBIT_SERVICE = "org.freedesktop.ScreenSaver"; +const QString INHIBIT_INTERFACE = INHIBIT_SERVICE; +const QString INHIBIT_PATH = "/ScreenSaver"; +const QString INHIBIT_METHOD = "Inhibit"; +const QString UNINHIBIT_METHOD = "UnInhibit"; +const QString SIMULATE_ACTIVITY_METHOD = "SimulateUserActivity"; + +ScreensaverInhibitPlugin::ScreensaverInhibitPlugin(QObject* parent, const QVariantList& args) + : KdeConnectPlugin(parent, args) +{ + QDBusInterface inhibitInterface(INHIBIT_SERVICE, INHIBIT_PATH, INHIBIT_INTERFACE); + + QDBusMessage reply = inhibitInterface.call(INHIBIT_METHOD, "kdeconnect", "Phone is connected"); + + if (reply.errorMessage() != NULL) { + kDebug(debugArea()) << "Unable to inhibit the screensaver: " << reply.errorMessage(); + } else { + // Store the cookie we receive, this will be sent back when sending the uninhibit call. + this->inhibitCookie = reply.arguments().first().toUInt(); + } +} + +ScreensaverInhibitPlugin::~ScreensaverInhibitPlugin() +{ + QDBusInterface inhibitInterface(INHIBIT_SERVICE, INHIBIT_PATH, INHIBIT_INTERFACE); + inhibitInterface.call(UNINHIBIT_METHOD, this->inhibitCookie); + + /* + * Simulate user activity because what ever manages the screensaver does not seem to start the timer + * automatically when all inhibitions are lifted and the user does nothing which results in an + * unlocked desktop which would be dangerous. Ideally we should not be doing this and the screen should + * be locked anyway. + */ + inhibitInterface.call(SIMULATE_ACTIVITY_METHOD); +} + +void ScreensaverInhibitPlugin::connected() +{} + +bool ScreensaverInhibitPlugin::receivePackage(const NetworkPackage& np) +{ + return false; +} + diff --git a/plugins/screensaver-inhibit/screensaverinhibitplugin.h b/plugins/screensaver-inhibit/screensaverinhibitplugin.h new file mode 100644 index 000000000..460ac6023 --- /dev/null +++ b/plugins/screensaver-inhibit/screensaverinhibitplugin.h @@ -0,0 +1,45 @@ +/** + * Copyright 2014 Pramod Dematagoda + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License or (at your option) version 3 or any later version + * accepted by the membership of KDE e.V. (or its successor approved + * by the membership of KDE e.V.), which shall act as a proxy + * defined in Section 14 of version 3 of the license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef SCREENSAVERINHIBITPLUGIN_H +#define SCREENSAVERINHIBITPLUGIN_H + +#include + +#include + +class KDE_EXPORT ScreensaverInhibitPlugin + : public KdeConnectPlugin +{ + Q_OBJECT + +public: + explicit ScreensaverInhibitPlugin(QObject *parent, const QVariantList &args); + virtual ~ScreensaverInhibitPlugin(); + +public Q_SLOTS: + virtual bool receivePackage(const NetworkPackage& np); + virtual void connected(); + +private: + uint inhibitCookie; +}; + +#endif From 6926fca59830a022f6f4454ff2f9d6653670f4ea Mon Sep 17 00:00:00 2001 From: Pramod Dematagoda Date: Sun, 28 Dec 2014 20:49:05 -0800 Subject: [PATCH 12/21] Adjust socket parameters to detect device disconnection faster. REVIEW: 121711 --- core/backends/lan/lanlinkprovider.cpp | 35 +++++++++++++-------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp index 39d30370c..4bd31d224 100644 --- a/core/backends/lan/lanlinkprovider.cpp +++ b/core/backends/lan/lanlinkprovider.cpp @@ -38,27 +38,26 @@ void LanLinkProvider::configureSocket(QTcpSocket* socket) { int fd = socket->socketDescriptor(); - char enableKeepAlive = 1; - setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &enableKeepAlive, sizeof(enableKeepAlive)); -#ifdef TCP_KEEPIDLE - int maxIdle = 60; /* seconds */ - setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &maxIdle, sizeof(maxIdle)); -#endif + socket->setSocketOption(QAbstractSocket::KeepAliveOption, QVariant(1)); -#ifdef TCP_KEEPCNT - if (getprotobyname("TCP")) { - int count = 3; // send up to 3 keepalive packets out, then disconnect if no response - setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPCNT, &count, sizeof(count)); - } -#endif + #ifdef TCP_KEEPIDLE + // time to start sending keepalive packets (seconds) + int maxIdle = 10; + setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &maxIdle, sizeof(maxIdle)); + #endif -#ifdef TCP_KEEPINTVL - if (getprotobyname("TCP")) { - int interval = 5; // send a keepalive packet out every 2 seconds (after the 5 second idle period) - setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPINTVL, &interval, sizeof(interval)); - } -#endif + #ifdef TCP_KEEPINTVL + // interval between keepalive packets after the initial period (seconds) + int interval = 5; + setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &interval, sizeof(interval)); + #endif + + #ifdef TCP_KEEPCNT + // number of missed keepalive packets before disconnecting + int count = 3; + setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count)); + #endif } From 5baab6c7a9efd66f12ecbb59677be3fb3757bd73 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 31 Dec 2014 04:00:47 +0000 Subject: [PATCH 13/21] SVN_SILENT made messages (.desktop file) --- plugins/kdeconnect.notifyrc | 4 ++++ .../kdeconnect_screensaver_inhibit.desktop | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 6917ac9f4..1c70b2777 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -62,6 +62,7 @@ Name[pl]=Żądanie parowania Name[pt]=Pedido de Emparelhamento Name[pt_BR]=Solicitação de emparelhamento Name[sk]=Požiadavka na spárovanie +Name[sv]=Begäran om ihopparning Name[uk]=Запит щодо пов’язування Name[x-test]=xxPairing Requestxx Comment=Pairing request received from a devices @@ -76,6 +77,7 @@ Comment[pl]=Otrzymano żądanie parowania z urządzeń Comment[pt]=Pedido de emparelhamento recebido de um dispositivo Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo Comment[sk]=Požiadavka na spárovanie prijatá zo zariadenia +Comment[sv]=Begäran om ihopparning mottagen från en apparat Comment[uk]=Від пристрою отримано запит щодо пов’язування Comment[x-test]=xxPairing request received from a devicesxx Action=Popup @@ -399,6 +401,7 @@ Name[pl]=Żądanie parowania Name[pt]=Pedido de Emparelhamento Name[pt_BR]=Solicitação de emparelhamento Name[sk]=Požiadavka na spárovanie +Name[sv]=Begäran om ihopparning Name[uk]=Запит щодо пов’язування Name[x-test]=xxPairing Requestxx Comment=Pairing request received from a devices @@ -413,6 +416,7 @@ Comment[pl]=Otrzymano żądanie parowania z urządzeń Comment[pt]=Pedido de emparelhamento recebido de um dispositivo Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo Comment[sk]=Požiadavka na spárovanie prijatá zo zariadenia +Comment[sv]=Begäran om ihopparning mottagen från en apparat Comment[uk]=Від пристрою отримано запит щодо пов’язування Comment[x-test]=xxPairing request received from a devicesxx Action=Popup diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop index 80f72799c..d6486fdab 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop @@ -12,4 +12,4 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=false Icon=preferences-desktop-screensaver Name=Inhibit screensaver -Comment=Inhibit the screensaver when the device is connected \ No newline at end of file +Comment=Inhibit the screensaver when the device is connected From 5e3b981de25572bd7c73499985f9fa5b9e918119 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 1 Jan 2015 04:02:02 +0000 Subject: [PATCH 14/21] SVN_SILENT made messages (.desktop file) --- .../kdeconnect_screensaver_inhibit.desktop | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop index d6486fdab..9cc224aad 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop @@ -12,4 +12,20 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=false Icon=preferences-desktop-screensaver Name=Inhibit screensaver +Name[ca]=Inhibeix l'estalvi de pantalla +Name[nl]=Schermbeveiliging tegenhouden +Name[pl]=Powstrzymaj wygaszacz ekranu +Name[pt]=Inibir o protector de ecrã +Name[pt_BR]=Inibir o protetor de tela +Name[sv]=Stoppa skärmsläckare +Name[uk]=Заборона зберігача екрана +Name[x-test]=xxInhibit screensaverxx Comment=Inhibit the screensaver when the device is connected +Comment[ca]=Inhibeix l'estalvi de pantalla quan es connecta el dispositiu +Comment[nl]=Houdt de schermbeveiliging tegen wanneer het apparaat is verbonden +Comment[pl]=Powstrzymaj wygaszacz ekrany po podłączeniu urządzenia +Comment[pt]=Inibir o protector de ecrã quando o dispositivo é ligado +Comment[pt_BR]=Inibir o protetor de tela quando o dispositivo estiver conectado +Comment[sv]=Stoppa skärmsläckaren när apparaten ansluts +Comment[uk]=Забороняє зберігач екрана, якщо з’єднано пристрій +Comment[x-test]=xxInhibit the screensaver when the device is connectedxx From 73e3a1d683f453437ff80637524e69a03cf92fe5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 2 Jan 2015 04:06:52 +0000 Subject: [PATCH 15/21] SVN_SILENT made messages (.desktop file) --- fileitemactionplugin/kdeconnectsendfile.desktop | 2 ++ plugins/kdeconnect.notifyrc | 4 ++++ plugins/mousepad/kdeconnect_mousepad.desktop | 2 ++ .../kdeconnect_screensaver_inhibit.desktop | 2 ++ 4 files changed, 10 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index ac0d01b26..08268feaf 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -9,6 +9,7 @@ Name[es]=Enviar archivo usando el servicio KDE Connect Name[fi]=Lähetä tiedosto KDE-Connect-palvelulla Name[fr]=Envoyer un fichier via le service KDE Connect Name[hu]=Fájl küldése a KDE csatlakozás szolgáltatáson keresztül +Name[ko]=KDE Connect 서비스로 파일 보내기 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 @@ -27,6 +28,7 @@ X-KDE-Submenu[es]=Conectar X-KDE-Submenu[fi]=Yhdistä X-KDE-Submenu[fr]=Connecter X-KDE-Submenu[hu]=Csatlakozás +X-KDE-Submenu[ko]=연결 X-KDE-Submenu[nl]=Verbinden X-KDE-Submenu[pl]=Połącz X-KDE-Submenu[pt]=Ligar diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 1c70b2777..81aa1d0ac 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -57,6 +57,7 @@ Name[de]=Verbindungsanfrage Name[es]=Petición de vinculación Name[fi]=Paripyyntö Name[hu]=Párosítási kérés +Name[ko]=페어링 요청 Name[nl]=Verzoek om een paar te maken Name[pl]=Żądanie parowania Name[pt]=Pedido de Emparelhamento @@ -72,6 +73,7 @@ Comment[de]=Verbindungsanfrage von einem Gerät erhalten Comment[es]=Petición de vinculación recibida desde un dispositivo Comment[fi]=Saatiin paripyyntö laitteelta Comment[hu]=Párosítási kérés érkezett egy eszköztől +Comment[ko]=장치에서 페어링 요청을 받음 Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat Comment[pl]=Otrzymano żądanie parowania z urządzeń Comment[pt]=Pedido de emparelhamento recebido de um dispositivo @@ -396,6 +398,7 @@ Name[de]=Verbindungsanfrage Name[es]=Petición de vinculación Name[fi]=Paripyyntö Name[hu]=Párosítási kérés +Name[ko]=페어링 요청 Name[nl]=Verzoek om een paar te maken Name[pl]=Żądanie parowania Name[pt]=Pedido de Emparelhamento @@ -411,6 +414,7 @@ Comment[de]=Verbindungsanfrage von einem Gerät erhalten Comment[es]=Petición de vinculación recibida desde un dispositivo Comment[fi]=Saatiin paripyyntö laitteelta Comment[hu]=Párosítási kérés érkezett egy eszköztől +Comment[ko]=장치에서 페어링 요청을 받음 Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat Comment[pl]=Otrzymano żądanie parowania z urządzeń Comment[pt]=Pedido de emparelhamento recebido de um dispositivo diff --git a/plugins/mousepad/kdeconnect_mousepad.desktop b/plugins/mousepad/kdeconnect_mousepad.desktop index 1c3204af5..263041640 100644 --- a/plugins/mousepad/kdeconnect_mousepad.desktop +++ b/plugins/mousepad/kdeconnect_mousepad.desktop @@ -19,6 +19,7 @@ Name[es]=Cursor del ratón Name[fi]=Kosketuslevy Name[fr]=Pavé tactile Name[hu]=Érintőtábla +Name[ko]=터치패드 Name[nl]=Touchpad Name[pl]=Gładzik Name[pt]=Rato por Toque @@ -36,6 +37,7 @@ Comment[es]=Usar su teléfono como cursor del ratón Comment[fi]=Käytä puhelinta kosketuslevynä Comment[fr]=Utilisez votre téléphone comme un pavé tactile Comment[hu]=A telefon használata érintőtáblaként +Comment[ko]=내 장치를 터치패드로 사용하기 Comment[nl]=Uw telefoon gebruiken als touchpad Comment[pl]=Użyj swojego telefonu jako gładzika Comment[pt]=Usar o seu telemóvel como painel de rato diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop index 9cc224aad..5e5b25b0a 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop @@ -13,6 +13,7 @@ X-KDE-PluginInfo-EnabledByDefault=false Icon=preferences-desktop-screensaver Name=Inhibit screensaver Name[ca]=Inhibeix l'estalvi de pantalla +Name[ko]=화면 보호기 막기 Name[nl]=Schermbeveiliging tegenhouden Name[pl]=Powstrzymaj wygaszacz ekranu Name[pt]=Inibir o protector de ecrã @@ -22,6 +23,7 @@ Name[uk]=Заборона зберігача екрана Name[x-test]=xxInhibit screensaverxx Comment=Inhibit the screensaver when the device is connected Comment[ca]=Inhibeix l'estalvi de pantalla quan es connecta el dispositiu +Comment[ko]=장치가 연결되어 있을 때 화면 보호기 실행 막기 Comment[nl]=Houdt de schermbeveiliging tegen wanneer het apparaat is verbonden Comment[pl]=Powstrzymaj wygaszacz ekrany po podłączeniu urządzenia Comment[pt]=Inibir o protector de ecrã quando o dispositivo é ligado From a2b04c3f25bc82d8d7c223a98b35f90e1c0dcff8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 3 Jan 2015 03:53:09 +0000 Subject: [PATCH 16/21] SVN_SILENT made messages (.desktop file) --- plugins/kdeconnect.notifyrc | 4 ++-- plugins/ping/kdeconnect_ping.desktop | 4 ++-- .../kdeconnect_screensaver_inhibit.desktop | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 81aa1d0ac..ab20ab169 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -297,7 +297,7 @@ Name[cs]=Ping Name[da]=Ping Name[de]=Ping Name[es]=Ping -Name[fi]=Ping +Name[fi]=Tiedustelupaketti Name[fr]=Commande « Ping » Name[hu]=Ping Name[it]=Ping @@ -321,7 +321,7 @@ Comment[cs]=Ping přijat Comment[da]=Ping modtaget Comment[de]=Ping empfangen Comment[es]=Ping recibido -Comment[fi]=Vastaanotettiin ping +Comment[fi]=Vastaanotettiin tiedustelupaketti Comment[fr]=Commande « Ping » reçue Comment[hu]=Ping érkezett Comment[it]=Hai ricevuto un ping diff --git a/plugins/ping/kdeconnect_ping.desktop b/plugins/ping/kdeconnect_ping.desktop index 7757bf67b..46959a110 100644 --- a/plugins/ping/kdeconnect_ping.desktop +++ b/plugins/ping/kdeconnect_ping.desktop @@ -19,7 +19,7 @@ Name[cs]=Ping Name[da]=Ping Name[de]=Ping Name[es]=Ping -Name[fi]=Ping +Name[fi]=Tiedustelupaketti Name[fr]=Commande « Ping » Name[hu]=Ping Name[it]=Ping @@ -43,7 +43,7 @@ Comment[cs]=Posílat a přijímat ping Comment[da]=Send og modtag ping Comment[de]=Senden und Empfangen von Pings Comment[es]=Enviar y recibir pings -Comment[fi]=Lähetä ja vastaanota pingejä +Comment[fi]=Lähetä ja vastaanota tiedustelupaketteja Comment[fr]=Envoyez et recevez des « ping » Comment[hu]=Pingek küldése és fogadása Comment[it]=Invia e ricevi ping diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop index 5e5b25b0a..cf2ba2241 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop @@ -13,6 +13,7 @@ X-KDE-PluginInfo-EnabledByDefault=false Icon=preferences-desktop-screensaver Name=Inhibit screensaver Name[ca]=Inhibeix l'estalvi de pantalla +Name[fi]=Estä näytönsäästäjän käynnistyminen Name[ko]=화면 보호기 막기 Name[nl]=Schermbeveiliging tegenhouden Name[pl]=Powstrzymaj wygaszacz ekranu @@ -23,6 +24,7 @@ Name[uk]=Заборона зберігача екрана Name[x-test]=xxInhibit screensaverxx Comment=Inhibit the screensaver when the device is connected Comment[ca]=Inhibeix l'estalvi de pantalla quan es connecta el dispositiu +Comment[fi]=Estä näytönsäästäjän käynnistyminen, kun laite on yhteydessä Comment[ko]=장치가 연결되어 있을 때 화면 보호기 실행 막기 Comment[nl]=Houdt de schermbeveiliging tegen wanneer het apparaat is verbonden Comment[pl]=Powstrzymaj wygaszacz ekrany po podłączeniu urządzenia From 81a2855f30bd7213de753400c1d20bad7515e58b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 4 Jan 2015 04:08:04 +0000 Subject: [PATCH 17/21] SVN_SILENT made messages (.desktop file) --- .../screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop index cf2ba2241..c9dae5529 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop @@ -19,6 +19,7 @@ Name[nl]=Schermbeveiliging tegenhouden Name[pl]=Powstrzymaj wygaszacz ekranu Name[pt]=Inibir o protector de ecrã Name[pt_BR]=Inibir o protetor de tela +Name[sk]=Obmedziť šetrič obrazovky Name[sv]=Stoppa skärmsläckare Name[uk]=Заборона зберігача екрана Name[x-test]=xxInhibit screensaverxx @@ -30,6 +31,7 @@ Comment[nl]=Houdt de schermbeveiliging tegen wanneer het apparaat is verbonden Comment[pl]=Powstrzymaj wygaszacz ekrany po podłączeniu urządzenia Comment[pt]=Inibir o protector de ecrã quando o dispositivo é ligado Comment[pt_BR]=Inibir o protetor de tela quando o dispositivo estiver conectado +Comment[sk]=Obmedziť šetrič obrazovky keď je pripojené zariadenie Comment[sv]=Stoppa skärmsläckaren när apparaten ansluts Comment[uk]=Забороняє зберігач екрана, якщо з’єднано пристрій Comment[x-test]=xxInhibit the screensaver when the device is connectedxx From f6e7b04514fa4126c25bcd4fc08ecd05d725135c Mon Sep 17 00:00:00 2001 From: Mikhail Ivchenko Date: Mon, 5 Jan 2015 21:49:23 -0800 Subject: [PATCH 18/21] Added a button to incoming call notifications to mute the phone ringing. REVIEW: 121854 --- plugins/telephony/kdeconnect_telephony.desktop | 2 +- plugins/telephony/telephonyplugin.cpp | 14 +++++++++++++- plugins/telephony/telephonyplugin.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/plugins/telephony/kdeconnect_telephony.desktop b/plugins/telephony/kdeconnect_telephony.desktop index 2a7224849..d44b59512 100644 --- a/plugins/telephony/kdeconnect_telephony.desktop +++ b/plugins/telephony/kdeconnect_telephony.desktop @@ -60,4 +60,4 @@ Comment[uk]=Показ сповіщень щодо дзвінків і SMS (ск Comment[x-test]=xxShow notifications for calls and SMS (answering coming soon)xx X-KdeConnect-SupportedPackageType=kdeconnect.telephony -X-KdeConnect-OutgoingPackageType= +X-KdeConnect-OutgoingPackageType=kdeconnect.telephony diff --git a/plugins/telephony/telephonyplugin.cpp b/plugins/telephony/telephonyplugin.cpp index 4e1c0a1b2..5e46ba3bc 100644 --- a/plugins/telephony/telephonyplugin.cpp +++ b/plugins/telephony/telephonyplugin.cpp @@ -22,9 +22,9 @@ #include #include - #include + K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< TelephonyPlugin >(); ) K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_telephony", "kdeconnect-plugins") ) @@ -77,6 +77,11 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np) notification->setTitle(title); notification->setText(content); + if (event == "ringing") { + notification->setActions( QStringList(i18n("Mute call")) ); + connect(notification, SIGNAL(action1Activated()), this, SLOT(sendMutePackage())); + } + return notification; } @@ -99,3 +104,10 @@ bool TelephonyPlugin::receivePackage(const NetworkPackage& np) return true; } + +void TelephonyPlugin::sendMutePackage() +{ + NetworkPackage package(PACKAGE_TYPE_TELEPHONY); + package.set( "action", "mute" ); + sendPackage(package); +} diff --git a/plugins/telephony/telephonyplugin.h b/plugins/telephony/telephonyplugin.h index 1b11ad20d..047d9869f 100644 --- a/plugins/telephony/telephonyplugin.h +++ b/plugins/telephony/telephonyplugin.h @@ -40,6 +40,7 @@ public: public Q_SLOTS: virtual bool receivePackage(const NetworkPackage& np); virtual void connected() { } + void sendMutePackage(); private: KNotification* createNotification(const NetworkPackage& np); From 127a117c62f47177462b193cd2859324e3ac6188 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Tue, 6 Jan 2015 00:11:58 -0800 Subject: [PATCH 19/21] Added support for Ctrl, Alt and Shift combinations and F keys to keyboard. --- plugins/mousepad/mousepadplugin.cpp | 44 +++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/plugins/mousepad/mousepadplugin.cpp b/plugins/mousepad/mousepadplugin.cpp index 9a8b489c7..cf5f70ec9 100644 --- a/plugins/mousepad/mousepadplugin.cpp +++ b/plugins/mousepad/mousepadplugin.cpp @@ -53,6 +53,24 @@ int SpecialKeysMap[] = { XK_Return, // 12 XK_Delete, // 13 XK_Escape, // 14 + XK_Sys_Req, // 15 + XK_Scroll_Lock, // 16 + 0, // 17 + 0, // 18 + 0, // 19 + 0, // 20 + XK_F1, // 21 + XK_F2, // 22 + XK_F3, // 23 + XK_F4, // 24 + XK_F5, // 25 + XK_F6, // 26 + XK_F7, // 27 + XK_F8, // 28 + XK_F9, // 29 + XK_F10, // 30 + XK_F11, // 31 + XK_F12, // 32 }; template @@ -78,7 +96,9 @@ MousepadPlugin::~MousepadPlugin() bool MousepadPlugin::receivePackage(const NetworkPackage& np) { - //TODO: Split mouse/keyboard in two different plugins to avoid big if statements + //qDebug() << np.serialize(); + + //TODO: Split mouse/keyboard in two different plugins to avoid this big if statement float dx = np.get("dx", 0); float dy = np.get("dy", 0); @@ -88,6 +108,7 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np) bool isMiddleClick = np.get("middleclick", false); bool isRightClick = np.get("rightclick", false); bool isSingleHold = np.get("singlehold", false); + bool isSingleRelease = np.get("singlerelease", false); bool isScroll = np.get("scroll", false); QString key = np.get("key", ""); int specialKey = np.get("specialKey", 0); @@ -117,8 +138,12 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np) XTestFakeButtonEvent(m_display, RightMouseButton, True, 0); XTestFakeButtonEvent(m_display, RightMouseButton, False, 0); } else if (isSingleHold){ - XTestFakeButtonEvent(m_display, LeftMouseButton, True, 0); - }else if( isScroll ) { + //For drag'n drop + XTestFakeButtonEvent(m_display, LeftMouseButton, True, 0); + } else if (isSingleRelease){ + //For drag'n drop. NEVER USED (release is done by tapping, which actually triggers a isSingleClick). Kept here for future-proofnes. + XTestFakeButtonEvent(m_display, LeftMouseButton, False, 0); + } else if (isScroll) { if (dy < 0) { XTestFakeButtonEvent(m_display, MouseWheelDown, True, 0); XTestFakeButtonEvent(m_display, MouseWheelDown, False, 0); @@ -128,6 +153,14 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np) } } else if (!key.isEmpty() || specialKey) { + bool ctrl = np.get("ctrl", false); + bool alt = np.get("alt", false); + bool shift = np.get("shift", false); + + if (ctrl) XTestFakeKeyEvent (m_display, XKeysymToKeycode(m_display, XK_Control_L), True, 0); + if (alt) XTestFakeKeyEvent (m_display, XKeysymToKeycode(m_display, XK_Alt_L), True, 0); + if (shift) XTestFakeKeyEvent (m_display, XKeysymToKeycode(m_display, XK_Shift_L), True, 0); + if (specialKey) { if (specialKey > (int)arraySize(SpecialKeysMap)) { @@ -136,6 +169,7 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np) } int keycode = XKeysymToKeycode(m_display, SpecialKeysMap[specialKey]); + XTestFakeKeyEvent (m_display, keycode, True, 0); XTestFakeKeyEvent (m_display, keycode, False, 0); @@ -154,6 +188,10 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np) fakekey_release(m_fakekey); } + if (ctrl) XTestFakeKeyEvent (m_display, XKeysymToKeycode(m_display, XK_Control_L), False, 0); + if (alt) XTestFakeKeyEvent (m_display, XKeysymToKeycode(m_display, XK_Alt_L), False, 0); + if (shift) XTestFakeKeyEvent (m_display, XKeysymToKeycode(m_display, XK_Shift_L), False, 0); + } XFlush(m_display); From 4b6aa135e3ce62813193795564ec513356e01bb6 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Tue, 6 Jan 2015 21:48:25 -0800 Subject: [PATCH 20/21] Fixing memory leaks in LanDeviceLinkProvider and LanDeviceLink --- core/backends/devicelink.h | 1 + core/backends/lan/landevicelink.cpp | 23 +++++--- core/backends/lan/landevicelink.h | 2 +- core/backends/lan/lanlinkprovider.cpp | 81 ++++++++++++-------------- core/backends/lan/socketlinereader.cpp | 5 -- core/backends/lan/socketlinereader.h | 1 - core/backends/linkprovider.h | 2 +- 7 files changed, 55 insertions(+), 60 deletions(-) diff --git a/core/backends/devicelink.h b/core/backends/devicelink.h index b56389724..f8d652175 100644 --- a/core/backends/devicelink.h +++ b/core/backends/devicelink.h @@ -36,6 +36,7 @@ class DeviceLink public: DeviceLink(const QString& deviceId, LinkProvider* parent); + virtual ~DeviceLink() { }; const QString& deviceId() { return mDeviceId; } LinkProvider* provider() { return mLinkProvider; } diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp index be8a37b1f..e344e8374 100644 --- a/core/backends/lan/landevicelink.cpp +++ b/core/backends/lan/landevicelink.cpp @@ -30,16 +30,24 @@ #include "downloadjob.h" #include "socketlinereader.h" -LanDeviceLink::LanDeviceLink(const QString& d, LinkProvider* a, QTcpSocket* socket) - : DeviceLink(d, a) - , mSocketLineReader(new SocketLineReader(socket, a)) +LanDeviceLink::LanDeviceLink(const QString& deviceId, LinkProvider* parent, QTcpSocket* socket) + : DeviceLink(deviceId, parent) + , mSocketLineReader(new SocketLineReader(socket)) { - connect(mSocketLineReader, SIGNAL(disconnected()), - this, SLOT(deleteLater())); connect(mSocketLineReader, SIGNAL(readyRead()), this, SLOT(dataReceived())); + + //We take ownership of the socket. + //When the link provider distroys us, + //the socket (and the reader) will be + //destroyed as well + connect(socket, SIGNAL(disconnected()), + this, SLOT(deleteLater())); + mSocketLineReader->setParent(this); + socket->setParent(this); } + bool LanDeviceLink::sendPackageEncrypted(QCA::PublicKey& key, NetworkPackage& np) { if (np.hasPayload()) { @@ -54,7 +62,7 @@ bool LanDeviceLink::sendPackageEncrypted(QCA::PublicKey& key, NetworkPackage& np //TODO: Actually detect if a package is received or not, now we keep TCP //"ESTABLISHED" connections that look legit (return true when we use them), - //but that are actually broken + //but that are actually broken (until keepalive detects that they are down). return (written != -1); } @@ -67,9 +75,6 @@ bool LanDeviceLink::sendPackage(NetworkPackage& np) } int written = mSocketLineReader->write(np.serialize()); - //TODO: Actually detect if a package is received or not, now we keep TCP - //"ESTABLISHED" connections that look legit (return true when we use them), - //but that are actually broken return (written != -1); } diff --git a/core/backends/lan/landevicelink.h b/core/backends/lan/landevicelink.h index 2bc55f69c..7d31881fb 100644 --- a/core/backends/lan/landevicelink.h +++ b/core/backends/lan/landevicelink.h @@ -35,7 +35,7 @@ class LanDeviceLink Q_OBJECT public: - LanDeviceLink(const QString& d, LinkProvider* a, QTcpSocket* socket); + LanDeviceLink(const QString& deviceId, LinkProvider* parent, QTcpSocket* socket); bool sendPackage(NetworkPackage& np); bool sendPackageEncrypted(QCA::PublicKey& key, NetworkPackage& np); diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp index 4bd31d224..3042ff75a 100644 --- a/core/backends/lan/lanlinkprovider.cpp +++ b/core/backends/lan/lanlinkprovider.cpp @@ -104,44 +104,39 @@ void LanLinkProvider::onNetworkChange(QNetworkSession::State state) NetworkPackage::createIdentityPackage(&np); np.set("tcpPort", mTcpPort); mUdpSocket.writeDatagram(np.serialize(), QHostAddress("255.255.255.255"), port); - - //TODO: Ping active connections to see if they are still reachable } -//I'm the existing device, a new device is kindly introducing itself (I will create a TcpSocket) +//I'm the existing device, a new device is kindly introducing itself. +//I will create a TcpSocket and try to connect. This can result in either connected() or connectError(). void LanLinkProvider::newUdpConnection() { while (mUdpServer->hasPendingDatagrams()) { QByteArray datagram; datagram.resize(mUdpServer->pendingDatagramSize()); QHostAddress sender; - quint16 senderPort; - - mUdpServer->readDatagram(datagram.data(), datagram.size(), &sender, &senderPort); - - NetworkPackage* np = new NetworkPackage(""); - bool success = NetworkPackage::unserialize(datagram,np); mUdpServer->readDatagram(datagram.data(), datagram.size(), &sender); NetworkPackage* receivedPackage = new NetworkPackage(""); - success = NetworkPackage::unserialize(datagram, receivedPackage); + bool success = NetworkPackage::unserialize(datagram, receivedPackage); if (!success || receivedPackage->type() != PACKAGE_TYPE_IDENTITY) { delete receivedPackage; + return; } KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc"); const QString myId = config->group("myself").readEntry("id",""); - //kDebug(debugArea()) << "Ignoring my own broadcast"; if (receivedPackage->get("deviceId") == myId) { + //kDebug(debugArea()) << "Ignoring my own broadcast"; + delete receivedPackage; return; } int tcpPort = receivedPackage->get("tcpPort", port); - //kDebug(debugArea()) << "Received Udp presentation from" << sender << "asking for a tcp connection on port " << tcpPort; + //kDebug(debugArea()) << "Received Udp identity package from" << sender << " asking for a tcp connection on port " << tcpPort; QTcpSocket* socket = new QTcpSocket(this); receivedIdentityPackages[socket].np = receivedPackage; @@ -155,9 +150,9 @@ void LanLinkProvider::newUdpConnection() void LanLinkProvider::connectError() { QTcpSocket* socket = qobject_cast(sender()); - - disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError())); + if (!socket) return; disconnect(socket, SIGNAL(connected()), this, SLOT(connected())); + disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError())); kDebug(debugArea()) << "Fallback (1), try reverse connection"; NetworkPackage np(""); @@ -165,17 +160,17 @@ void LanLinkProvider::connectError() np.set("tcpPort", mTcpPort); mUdpSocket.writeDatagram(np.serialize(), receivedIdentityPackages[socket].sender, port); + //The socket we created didn't work, and we didn't manage + //to create a LanDeviceLink from it, deleting everything. delete receivedIdentityPackages[socket].np; receivedIdentityPackages.remove(socket); + delete socket; } void LanLinkProvider::connected() { - QTcpSocket* socket = qobject_cast(sender()); - if (!socket) return; - disconnect(socket, SIGNAL(connected()), this, SLOT(connected())); disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError())); @@ -189,12 +184,11 @@ void LanLinkProvider::connected() NetworkPackage np2(""); NetworkPackage::createIdentityPackage(&np2); - bool success = deviceLink->sendPackage(np2); if (success) { - //kDebug(debugArea()) << "Handshaking done (i'm the existing device)"; + kDebug(debugArea()) << "Handshaking done (i'm the existing device)"; connect(deviceLink, SIGNAL(destroyed(QObject*)), this, SLOT(deviceLinkDestroyed(QObject*))); @@ -214,62 +208,64 @@ void LanLinkProvider::connected() mLinks[deviceId] = deviceLink; } else { - //I think this will never happen + //I think this will never happen, but if it happens the deviceLink + //(or the socket that is now inside it) might not be valid. Delete them. + delete deviceLink; + kDebug(debugArea()) << "Fallback (2), try reverse connection"; mUdpSocket.writeDatagram(np2.serialize(), receivedIdentityPackages[socket].sender, port); - delete deviceLink; } - receivedIdentityPackages.remove(socket); - delete receivedPackage; - + receivedIdentityPackages.remove(socket); + //We don't delete the socket because now it's owned by the LanDeviceLink } -//I'm the new device and this is the answer to my UDP introduction (no data received yet) +//I'm the new device and this is the answer to my UDP identity package (no data received yet) void LanLinkProvider::newConnection() { //kDebug(debugArea()) << "LanLinkProvider newConnection"; while(mTcpServer->hasPendingConnections()) { QTcpSocket* socket = mTcpServer->nextPendingConnection(); - socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1); + configureSocket(socket); + //This socket is still managed by us (and child of the QTcpServer), if + //it disconnects before we manage to pass it to a LanDeviceLink, it's + //our responsability to delete it. We do so with this connection. + connect(socket, SIGNAL(disconnected()), + socket, SLOT(deleteLater())); + connect(socket, SIGNAL(readyRead()), + this, SLOT(dataReceived())); - connect(socket, SIGNAL(readyRead()), this, SLOT(dataReceived())); } -/* - NetworkPackage np(PACKAGE_TYPE_IDENTITY); - NetworkPackage::createIdentityPackage(&np); - int written = socket->write(np.serialize()); - - kDebug(debugArea()) << "LanLinkProvider sent package." << written << " bytes written, waiting for reply"; -*/ } -//I'm the new device and this is the answer to my UDP introduction (data received) +//I'm the new device and this is the answer to my UDP identity package (data received) void LanLinkProvider::dataReceived() { QTcpSocket* socket = qobject_cast(sender()); - configureSocket(socket); const QByteArray data = socket->readLine(); - - //kDebug(debugArea()) << "LanLinkProvider received reply:" << data; - NetworkPackage np(""); bool success = NetworkPackage::unserialize(data, &np); + //kDebug(debugArea()) << "LanLinkProvider received reply:" << data; if (!success || np.type() != PACKAGE_TYPE_IDENTITY) { kDebug(debugArea()) << "LanLinkProvider/newConnection: Not an identification package (wuh?)"; return; } + kDebug(debugArea()) << "Handshaking done (i'm the new device)"; + + //This socket will now be owned by the LanDeviceLink, forget about it + disconnect(socket, SIGNAL(readyRead()), + this, SLOT(dataReceived())); + disconnect(socket, SIGNAL(disconnected()), + socket, SLOT(deleteLater())); + const QString& deviceId = np.get("deviceId"); LanDeviceLink* deviceLink = new LanDeviceLink(deviceId, this, socket); - - //kDebug(debugArea()) << "Handshaking done (i'm the new device)"; - connect(deviceLink, SIGNAL(destroyed(QObject*)), this, SLOT(deviceLinkDestroyed(QObject*))); @@ -286,7 +282,6 @@ void LanLinkProvider::dataReceived() mLinks[deviceId] = deviceLink; - disconnect(socket,SIGNAL(readyRead()),this,SLOT(dataReceived())); } void LanLinkProvider::deviceLinkDestroyed(QObject* destroyedDeviceLink) diff --git a/core/backends/lan/socketlinereader.cpp b/core/backends/lan/socketlinereader.cpp index 26e9fd2c2..4fdaf1408 100644 --- a/core/backends/lan/socketlinereader.cpp +++ b/core/backends/lan/socketlinereader.cpp @@ -25,13 +25,8 @@ SocketLineReader::SocketLineReader(QTcpSocket* socket, QObject* parent) : QObject(parent) , mSocket(socket) { - - connect(mSocket, SIGNAL(disconnected()), - this, SIGNAL(disconnected())); - connect(mSocket, SIGNAL(readyRead()), this, SLOT(dataReceived())); - } void SocketLineReader::dataReceived() diff --git a/core/backends/lan/socketlinereader.h b/core/backends/lan/socketlinereader.h index d29560763..df11c3ee3 100644 --- a/core/backends/lan/socketlinereader.h +++ b/core/backends/lan/socketlinereader.h @@ -45,7 +45,6 @@ public: qint64 bytesAvailable() { return mPackages.size(); } Q_SIGNALS: - void disconnected(); void readyRead(); private Q_SLOTS: diff --git a/core/backends/linkprovider.h b/core/backends/linkprovider.h index bb89d1c42..00805c1b5 100644 --- a/core/backends/linkprovider.h +++ b/core/backends/linkprovider.h @@ -52,7 +52,7 @@ public Q_SLOTS: virtual void onNetworkChange(QNetworkSession::State state) = 0; Q_SIGNALS: - //NOTE: The provider will to destroy the DeviceLink when it's no longer accessible, + //NOTE: The provider will destroy the DeviceLink when it's no longer accessible, // and every user should listen to the destroyed signal to remove its references. // That's the reason because there is no "onConnectionLost". void onConnectionReceived(const NetworkPackage& identityPackage, DeviceLink*) const; From d4382eec318e3d7bc6ac7d7068182d54af20d60c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 9 Jan 2015 04:19:56 +0000 Subject: [PATCH 21/21] SVN_SILENT made messages (.desktop file) --- .../screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop index c9dae5529..957f3c78d 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.desktop @@ -13,6 +13,7 @@ X-KDE-PluginInfo-EnabledByDefault=false Icon=preferences-desktop-screensaver Name=Inhibit screensaver Name[ca]=Inhibeix l'estalvi de pantalla +Name[es]=Inhibir salvapantallas Name[fi]=Estä näytönsäästäjän käynnistyminen Name[ko]=화면 보호기 막기 Name[nl]=Schermbeveiliging tegenhouden @@ -25,6 +26,7 @@ Name[uk]=Заборона зберігача екрана Name[x-test]=xxInhibit screensaverxx Comment=Inhibit the screensaver when the device is connected Comment[ca]=Inhibeix l'estalvi de pantalla quan es connecta el dispositiu +Comment[es]=Inhibir el salvapantallas cuando el dispositivo está conectado Comment[fi]=Estä näytönsäästäjän käynnistyminen, kun laite on yhteydessä Comment[ko]=장치가 연결되어 있을 때 화면 보호기 실행 막기 Comment[nl]=Houdt de schermbeveiliging tegen wanneer het apparaat is verbonden