[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 18:27:04 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=0dbacea
The following commit has been merged in the master branch:
commit 0dbaceafa39db74d2ec57461ed0bb4a141ae9230
Merge: 7a94e26162f67e7bfc9ea04ee1aef9faa6af80da 4cd190b86d6317f94063779225056c647595e0a7
Author: Albert Vaca <albertvaka at gmail.com>
Date: Thu Sep 29 10:53:29 2016 +0200
Merge branch 'master' into 1.x
# Conflicts:
# plugins/battery/kdeconnect_battery.json
# plugins/clipboard/kdeconnect_clipboard.json
# plugins/findmyphone/kdeconnect_findmyphone.json
# plugins/kdeconnect.notifyrc
# plugins/lockdevice/kdeconnect_lockdevice.json
# plugins/mousepad/kdeconnect_mousepad.json
# plugins/mpriscontrol/kdeconnect_mpriscontrol.json
# plugins/mprisremote/kdeconnect_mprisremote.json
# plugins/notifications/kdeconnect_notifications.json
# plugins/pausemusic/kdeconnect_pausemusic.json
# plugins/ping/kdeconnect_ping.json
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/remotecontrol/kdeconnect_remotecontrol.json
# plugins/runcommand/kdeconnect_runcommand.json
# plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
# plugins/sendnotifications/kdeconnect_sendnotifications.json
# plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
# plugins/sftp/kdeconnect_sftp.json
# plugins/share/kdeconnect_share.json
# plugins/telephony/kdeconnect_telephony.json
app/org.kde.kdeconnect.app.desktop | 12 ++
app/qml/DevicePage.qml | 48 +++----
app/qml/FindDevicesPage.qml | 5 +-
tests/testdaemon.h => app/qml/PluginItem.qml | 58 ++++----
app/qml/main.qml | 70 +++++++---
app/qml/mousepad.qml | 12 +-
app/qml/mpris.qml | 20 +--
app/resources.qrc | 1 +
core/daemon.cpp | 1 +
core/daemon.h | 1 +
core/device.cpp | 4 +-
core/kdeconnectconfig.cpp | 64 +++------
daemon/kdeconnect.desktop | 8 ++
daemon/kdeconnectd.desktop.cmake | 4 +
fileitemactionplugin/kdeconnectsendfile.desktop | 8 ++
interfaces/dbusinterfaces.cpp | 1 +
interfaces/dbusinterfaces.h | 2 +
kcm/kcm.cpp | 4 +
kcm/kcm_kdeconnect.desktop | 12 ++
kcm/org.kde.kdeconnect.kcm.desktop | 8 ++
kio/kiokdeconnect.cpp | 37 +++--
org.kde.kdeconnect.kcm.appdata.xml | 14 +-
org.kde.kdeconnect.nonplasma.desktop | 8 ++
plasmoid/declarativeplugin/CMakeLists.txt | 2 +-
.../kdeconnectdeclarativeplugin.cpp | 5 +
.../qml/{PluginChecker.qml => DBusProperty.qml} | 48 +++++--
plasmoid/declarativeplugin/qml/PluginChecker.qml | 7 +-
plasmoid/declarativeplugin/qmldir | 1 +
plasmoid/package/contents/ui/Battery.qml | 5 +-
plasmoid/package/contents/ui/DeviceDelegate.qml | 12 +-
plasmoid/package/contents/ui/FindMyPhone.qml | 5 +-
plasmoid/package/contents/ui/Sftp.qml | 5 +-
plasmoid/package/metadata.desktop | 8 ++
plugins/battery/kdeconnect_battery.json | 8 +-
plugins/clipboard/kdeconnect_clipboard.json | 8 +-
plugins/findmyphone/kdeconnect_findmyphone.json | 10 +-
plugins/kdeconnect.notifyrc | 74 +++++++++-
plugins/kdeconnect_plugin.desktop | 4 +
plugins/lockdevice/kdeconnect_lockdevice.json | 7 +-
plugins/mousepad/kdeconnect_mousepad.json | 9 +-
plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 8 +-
plugins/mpriscontrol/mpriscontrolplugin.cpp | 26 ++++
plugins/mprisremote/kdeconnect_mprisremote.json | 6 +-
.../notifications/kdeconnect_notifications.json | 10 +-
plugins/pausemusic/kdeconnect_pausemusic.json | 8 +-
.../kdeconnect_pausemusic_config.desktop | 4 +
plugins/ping/kdeconnect_ping.json | 6 +-
.../remotecommands/kdeconnect_remotecommands.json | 7 +-
.../remotecontrol/kdeconnect_remotecontrol.json | 7 +-
plugins/runcommand/kdeconnect_runcommand.json | 8 +-
.../kdeconnect_runcommand_config.desktop | 9 +-
.../kdeconnect_screensaver_inhibit.json | 8 +-
.../kdeconnect_sendnotifications.json | 12 +-
.../kdeconnect_sendnotifications_config.desktop | 7 +-
.../sendnotifications/notificationslistener.cpp | 115 +++++++++++++---
plugins/sendnotifications/notificationslistener.h | 12 ++
plugins/sftp/kdeconnect_sftp.json | 12 +-
plugins/share/kdeconnect_share.json | 8 +-
plugins/share/kdeconnect_share_config.desktop | 4 +
plugins/telephony/kdeconnect_telephony.json | 5 +-
tests/testnotificationlistener.cpp | 152 ++++++++++++++++++++-
61 files changed, 812 insertions(+), 242 deletions(-)
diff --cc plugins/battery/kdeconnect_battery.json
index bf934ef,0d51c4c..de77cbb
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@@@ -12,8 -14,9 +14,9 @@@
"Description[ca at valencia]": "Mostra la bateria del telèfon al costat de la bateria de l'ordinador",
"Description[ca]": "Mostra la bateria del telèfon al costat de la bateria de l'ordinador",
"Description[cs]": "Zobrazit baterii vedle baterie počítače",
- "Description[da]": "Vis din telefons batteri ved siden af dit computerbatteri",
+ "Description[da]": "Vis dit telefonbatteri ved siden af dit computerbatteri",
"Description[de]": "Zeigt den Akku Ihres Telefons neben dem Akku des Rechners",
+ "Description[el]": "Εμφάνιση μπαταρίας συσκευής δίπλα στη μπαταρία του υπολογιστή",
"Description[es]": "Mostrar la batería del teléfono junto a la batería del equipo",
"Description[et]": "Telefoniaku näitamine otse arvutiaku kõrval",
"Description[fi]": "Näytä puhelimesi akku tietokoneen akun rinnalla",
@@@ -74,4 -80,4 +80,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.battery"
]
--}
++}
diff --cc plugins/clipboard/kdeconnect_clipboard.json
index ac65181,b461953..9a0529d
--- a/plugins/clipboard/kdeconnect_clipboard.json
+++ b/plugins/clipboard/kdeconnect_clipboard.json
@@@ -74,4 -80,4 +80,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.clipboard"
]
--}
++}
diff --cc plugins/findmyphone/kdeconnect_findmyphone.json
index 5eca207,b56dec6..eb02796
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@@@ -61,4 -69,4 +69,4 @@@
"X-KdeConnect-OutgoingPackageType": [
"kdeconnect.findmyphone.request"
]
--}
++}
diff --cc plugins/lockdevice/kdeconnect_lockdevice.json
index f4debec,2476500..d64631c
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@@ -73,4 -78,4 +78,4 @@@
"kdeconnect.lock.request",
"kdeconnect.lock"
]
--}
++}
diff --cc plugins/mousepad/kdeconnect_mousepad.json
index 9c06d39,fccf61d..39d6810
--- a/plugins/mousepad/kdeconnect_mousepad.json
+++ b/plugins/mousepad/kdeconnect_mousepad.json
@@@ -71,4 -78,4 +78,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.mousepad.request"
]
--}
++}
diff --cc plugins/mpriscontrol/kdeconnect_mpriscontrol.json
index 8016311,192918d..deade58
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@@@ -41,8 -46,9 +46,9 @@@
"Name[ca at valencia]": "Receptor del comandament multimèdia",
"Name[ca]": "Receptor del comandament multimèdia",
"Name[cs]": "Dálkový ovladač multimédií",
- "Name[da]": "Modtager til multimediekontrol",
+ "Name[da]": "Multimediekontrol-modtager",
"Name[de]": "Steuerung für Multimedia-Empfänger",
+ "Name[el]": "Δέκτης ελέγχου πολυμέσων",
"Name[es]": "Receptor de control multimedia",
"Name[et]": "Multimeedia juhtimine",
"Name[fi]": "Multimediakauko-ohjain",
@@@ -74,4 -80,4 +80,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.mpris.request"
]
--}
++}
diff --cc plugins/mprisremote/kdeconnect_mprisremote.json
index 9088076,4121dba..88616f3
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@@ -58,4 -62,4 +62,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.mpris"
]
--}
++}
diff --cc plugins/notifications/kdeconnect_notifications.json
index 433be86,927071c..c2e0340
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@@ -58,4 -66,4 +66,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.notification"
]
--}
++}
diff --cc plugins/pausemusic/kdeconnect_pausemusic.json
index a00359c,c17e397..5d8335f
--- a/plugins/pausemusic/kdeconnect_pausemusic.json
+++ b/plugins/pausemusic/kdeconnect_pausemusic.json
@@@ -12,8 -14,9 +14,9 @@@
"Description[ca at valencia]": "Pausa la música/vídeos durant una trucada telefònica",
"Description[ca]": "Pausa la música/vídeos durant una trucada telefònica",
"Description[cs]": "Pozastavit hudbu/video během telefonátu",
- "Description[da]": "Sæt musik/videoer på pause under opkald",
+ "Description[da]": "Sæt musik/video på pause under telefonsamtaler",
"Description[de]": "Hält Musik oder Videos währen eines Anrufs an",
+ "Description[el]": "Παύση μουσικής/βίντεο κατά τη διάρκεια κλήσης",
"Description[es]": "Pausar música/video durante las llamadas telefónicas",
"Description[et]": "Muusika või video peatamine telefonikõne ajal",
"Description[fi]": "Keskeytä musiikki ja videot puhelun aikana",
@@@ -71,4 -77,4 +77,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.telephony"
]
--}
++}
diff --cc plugins/ping/kdeconnect_ping.json
index a28197c,244928e..7d1bbbd
--- a/plugins/ping/kdeconnect_ping.json
+++ b/plugins/ping/kdeconnect_ping.json
@@@ -57,4 -61,4 +61,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.ping"
]
--}
++}
diff --cc plugins/remotecommands/kdeconnect_remotecommands.json
index 4d94bfb,0e0644d..8a23d68
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@@ -28,7 -31,9 +31,9 @@@
"Icon": "system-run",
"Id": "kdeconnect_remotecommands",
"License": "GPL",
- "Name": "Execute remote commands",
+ "Name": "Host remote commands",
+ "Name[ar]": "نفّذ أوامر بعيدة",
+ "Name[ast]": "Execución de comandos remotos",
"Name[ca at valencia]": "Executa ordes remotes",
"Name[ca]": "Executa ordres remotes",
"Name[cs]": "Spouštět příkazy vzdáleně",
diff --cc plugins/remotecontrol/kdeconnect_remotecontrol.json
index 670fa71,fbfab40..4ddabf5
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@@ -12,8 -14,9 +14,9 @@@
"Description[ca at valencia]": "Sistemes de control remot",
"Description[ca]": "Sistemes de control remot",
"Description[cs]": "Ovládejte vzdálené systémy",
- "Description[da]": "Kontrollér eksterne systemer",
+ "Description[da]": "Fjernbetjen systemer",
"Description[de]": "Entfernte Systeme steuern",
+ "Description[el]": "Έλεγχος ανταπόκρισης απομακρυσμένων συστημάτων",
"Description[es]": "Controlar sistemas remotos",
"Description[et]": "Kaugjuhtimissüsteemid",
"Description[fi]": "Ohjaa järjestelmiä etänä",
@@@ -69,4 -74,4 +74,4 @@@
"kdeconnect.mousepad.request"
],
"X-KdeConnect-SupportedPackageType": []
--}
++}
diff --cc plugins/runcommand/kdeconnect_runcommand.json
index ec3c7ab,e39e8a3..abd24ec
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@@@ -69,4 -81,4 +75,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.runcommand.request"
]
--}
++}
diff --cc plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
index 9a0d55c,7c7cf15..68ab3fa
--- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
+++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
@@@ -12,8 -14,9 +14,9 @@@
"Description[ca at valencia]": "Inhibeix l'estalvi de pantalla quan es connecta el dispositiu",
"Description[ca]": "Inhibeix l'estalvi de pantalla quan es connecta el dispositiu",
"Description[cs]": "Potlačit spořič pokud je zařízení připojeno",
- "Description[da]": "Tilbagehold pauseskærmen når enheden er tilsluttet",
+ "Description[da]": "Forhindr pauseskærm når enheden er forbundet",
"Description[de]": "Bildschirmschoner unterbinden wenn ein Gerät angeschlossen ist",
+ "Description[el]": "Απαγόρευση προστασίας οθόνης όταν η συσκευή είναι σε σύνδεση",
"Description[es]": "Inhibir el salvapantallas cuando el dispositivo está conectado",
"Description[et]": "Ekraanisäästja keelamine, kui seade on ühendatud",
"Description[fi]": "Estä näytönsäästäjän käynnistyminen, kun laite on yhteydessä",
@@@ -41,8 -46,9 +46,9 @@@
"Name[ca at valencia]": "Inhibeix l'estalvi de pantalla",
"Name[ca]": "Inhibeix l'estalvi de pantalla",
"Name[cs]": "Potlačit spořič obrazovky",
- "Name[da]": "Tilbagehold pauseskærm",
+ "Name[da]": "Forhindr pauseskærm",
"Name[de]": "Bildschirmschoner unterbinden",
+ "Name[el]": "Απαγόρευση προστασίας οθόνης",
"Name[es]": "Inhibir salvapantallas",
"Name[et]": "Ekraanisäästja keelamine",
"Name[fi]": "Estä näytönsäästäjän käynnistyminen",
@@@ -68,4 -74,4 +74,4 @@@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
}
--}
++}
diff --cc plugins/sendnotifications/kdeconnect_sendnotifications.json
index ea82ab6,5da7b07..f1732b6
--- a/plugins/sendnotifications/kdeconnect_sendnotifications.json
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json
@@@ -5,9 -5,8 +5,6 @@@
{
"Email": "holger.k at elberer.de",
"Name": "Holger Kaelberer",
- "Name[da]": "Holger Freyther",
-- "Name[it]": "Holger Freyther",
-- "Name[x-test]": "xxHolger Kaelbererxx"
}
],
"Description": "Broadcast this computer's notifications, so they can be shown on other devices.",
@@@ -59,4 -65,4 +63,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.notification.request"
]
--}
++}
diff --cc plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index d3541c8,7d7b63c..3aedafc
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@@ -9,8 -11,9 +11,9 @@@ Name[ast]=Axustes del complementu de si
Name[ca]=Ajustament del connector Sincronitza les notificacions
Name[ca at valencia]=Ajustament del connector Sincronitza les notificacions
Name[cs]=Nastavení modulu synchronizace upozornění
-Name[da]=Indstilling af plugin til bekendtgørelsessynkronisering
+Name[da]=Indstilling af plugin til synkronisering af bekendtgørelser
Name[de]=Einstellungen für Benachrichtigungsabgleich-Modul
+ Name[el]=Ρυθμίσεις πρόσθετου συγχρονισμού ειδοποιήσεων
Name[en_GB]=Notification synchronisation plugin settings
Name[es]=Preferencias del complemento de sincronización de notificaciones
Name[et]=Märguande sünkroonimise plugina seaditused
diff --cc plugins/sftp/kdeconnect_sftp.json
index bff3a68,d3ec9ae..de34db2
--- a/plugins/sftp/kdeconnect_sftp.json
+++ b/plugins/sftp/kdeconnect_sftp.json
@@@ -13,8 -15,9 +15,9 @@@
"Description[ca at valencia]": "Navega pel sistema de fitxers del dispositiu remot emprant SFTP",
"Description[ca]": "Navega pel sistema de fitxers del dispositiu remot emprant SFTP",
"Description[cs]": "Prohlížejte souborový systém zařízení pomocí SFTP",
- "Description[da]": "Gennemse filsystemet på eksterne enheder med SFTP",
- "Description[da]": "Gennemse den eksterne enheds filsystem med SFTP",
++ "Description[da]": "Gennemse filsystemet på eksterne enheder med SFTP",
"Description[de]": "Browsen im Dateisystem des entfernten Geräts mit SFTP",
+ "Description[el]": "Περιήγηση του απομακρυσμένου συστήματος αρχείων με χρήση SFTP",
"Description[es]": "Navegar por el sistema de archivos del dispositivo remoto usando SFTP",
"Description[et]": "Oma seadme failisüsteemi sirvimine SFTP vahendusel",
"Description[fi]": "Selaa etälaitteiden tiedostojärjestelmiä SFTP:llä",
@@@ -42,8 -47,9 +47,9 @@@
"Name[ca at valencia]": "Navegador del sistema de fitxers remot",
"Name[ca]": "Navegador del sistema de fitxers remot",
"Name[cs]": "Vzdálený prohlížeč souborového systému",
- "Name[da]": "Browser til eksternt filsystem",
+ "Name[da]": "Filbrowser til eksternt filsystem",
"Name[de]": "Datei-Browser für entferne Systeme",
+ "Name[el]": "Περιηγητής απομακρυσμένου συστήματος αρχείων",
"Name[es]": "Navegador de sistema de archivos remoto",
"Name[et]": "Kaug-failisüsteemi sirvija",
"Name[fi]": "Etätiedostojärjestelmäselain",
@@@ -75,4 -81,4 +81,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.sftp"
]
--}
++}
diff --cc plugins/share/kdeconnect_share.json
index e14c50d,4c6ad08..c1f1d32
--- a/plugins/share/kdeconnect_share.json
+++ b/plugins/share/kdeconnect_share.json
@@@ -74,4 -80,4 +80,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.share.request"
]
--}
++}
diff --cc plugins/telephony/kdeconnect_telephony.json
index ee181ac,f8eff3f..2a5ff03
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@@ -27,8 -42,9 +29,9 @@@
"Name[ca at valencia]": "Integració amb la telefonia",
"Name[ca]": "Integració amb la telefonia",
"Name[cs]": "Integrace telefonu",
- "Name[da]": "Integration af telefoni",
+ "Name[da]": "Telefoniintegration",
"Name[de]": "Telefon-Integration",
+ "Name[el]": "Ενσωμάτωση τηλεφωνίας",
"Name[es]": "Integración con el teléfono",
"Name[et]": "Telefoniga lõimimine",
"Name[fi]": "Puhelinintegrointi",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list