[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 18:27:10 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=6124e52
The following commit has been merged in the master branch:
commit 6124e5273f16ed7eace4bf32bdef9043e001ff0b
Merge: 6aa058bfd4c92a5122072cdc279896326195b471 f845b33392c502ff8fef097e9bb4b1f2e912ebff
Author: Albert Vaca <albertvaka at gmail.com>
Date: Wed Nov 23 17:29:26 2016 +0100
Merge branch 'master' (early part) into 1.x
# Conflicts:
# plugins/kdeconnect.notifyrc
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
# plugins/telephony/kdeconnect_telephony.json
app/org.kde.kdeconnect.app.desktop | 12 ++++
core/backends/lan/lanlinkprovider.cpp | 27 +++++++-
core/device.cpp | 6 +-
daemon/kdeconnect.desktop | 8 +++
daemon/kdeconnectd.desktop.cmake | 4 ++
fileitemactionplugin/kdeconnectsendfile.desktop | 8 +++
kcm/kcm_kdeconnect.desktop | 12 ++++
kcm/org.kde.kdeconnect.kcm.desktop | 8 +++
org.kde.kdeconnect.kcm.appdata.xml | 14 ++++-
org.kde.kdeconnect.nonplasma.desktop | 8 +++
plasmoid/package/metadata.desktop | 8 +++
plugins/battery/kdeconnect_battery.json | 6 ++
plugins/clipboard/kdeconnect_clipboard.json | 6 ++
plugins/findmyphone/kdeconnect_findmyphone.json | 7 +++
plugins/kdeconnect.notifyrc | 72 ++++++++++++++++++++++
plugins/kdeconnect_plugin.desktop | 4 ++
plugins/lockdevice/kdeconnect_lockdevice.json | 5 ++
plugins/mousepad/kdeconnect_mousepad.json | 7 +++
plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 6 ++
plugins/mprisremote/kdeconnect_mprisremote.json | 4 ++
.../notifications/kdeconnect_notifications.json | 6 ++
plugins/pausemusic/kdeconnect_pausemusic.json | 6 ++
.../kdeconnect_pausemusic_config.desktop | 4 ++
plugins/ping/kdeconnect_ping.json | 4 ++
.../remotecommands/kdeconnect_remotecommands.json | 12 ++--
.../remotecontrol/kdeconnect_remotecontrol.json | 5 ++
plugins/runcommand/kdeconnect_runcommand.json | 6 ++
.../kdeconnect_runcommand_config.desktop | 6 ++
.../kdeconnect_screensaver_inhibit.json | 6 ++
.../kdeconnect_sendnotifications_config.desktop | 7 ++-
plugins/sftp/kdeconnect_sftp.json | 10 ++-
plugins/share/kdeconnect_share.json | 6 ++
plugins/share/kdeconnect_share_config.desktop | 4 ++
plugins/telephony/kdeconnect_telephony.json | 6 +-
34 files changed, 307 insertions(+), 13 deletions(-)
diff --cc plugins/battery/kdeconnect_battery.json
index 18ce8c4,64bcfdc..7b769e3
--- 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",
diff --cc plugins/kdeconnect.notifyrc
index b3e8a6d,c5c866f..989c8b5
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@@ -104,8 -119,10 +119,10 @@@ Comment[en_GB]=Pairing request receive
Comment[es]=Petición de vinculación recibida desde un dispositivo
Comment[et]=Seadmelt saadi paardumissoov
Comment[fi]=Saatiin paripyyntö laitteelta
+ Comment[gl]=Recibiuse unha solicitude de emparellamento dun dispositivo.
+ Comment[he]=התקבלה בקשת התאמה מהתקן
Comment[it]=Richiesta di associazione ricevuta da un dispositivo
-Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten
+Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat
Comment[nn]=Fekk parringsførespurnad frå eining
Comment[pl]=Otrzymano żądanie parowania z urządzenia
Comment[pt]=Pedido de emparelhamento recebido de um dispositivo
diff --cc plugins/mpriscontrol/kdeconnect_mpriscontrol.json
index 0695c2c,81bdbff..58a5d52
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@@@ -42,8 -47,9 +47,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",
diff --cc plugins/pausemusic/kdeconnect_pausemusic.json
index 23cf0a9,1d73a9a..bdd32b3
--- 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",
diff --cc plugins/remotecontrol/kdeconnect_remotecontrol.json
index f034d8b,38b044b..bda912f
--- 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ä",
diff --cc plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
index 79d5615,d4a57b4..e710741
--- 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ä",
@@@ -42,8 -47,9 +47,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",
diff --cc plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index 6a126a5,decf188..3609fcc
--- 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 02be1c9,235c774..bc45d65
--- a/plugins/sftp/kdeconnect_sftp.json
+++ b/plugins/sftp/kdeconnect_sftp.json
@@@ -43,8 -48,9 +48,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",
diff --cc plugins/telephony/kdeconnect_telephony.json
index 5968045,2a4d2aa..7dbbe5b
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@@ -12,8 -13,9 +13,9 @@@
"Description[ca at valencia]": "Mostra les notificacions de les trucades i els SMS",
"Description[ca]": "Mostra les notificacions de les trucades i els SMS",
"Description[cs]": "Zobrazit upozornění pro telefonáty a SMS",
- "Description[da]": "Vis bekendtgørelser for opkald og sms",
+ "Description[da]": "Vis bekendtgørelser for opkald og SMS'er",
"Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
+ "Description[el]": "Εμφάνιση ειδοποιήσεων για κλήσεις και SMS",
"Description[es]": "Mostrar notificaciones de llamadas y SMS",
"Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset",
"Description[it]": "Mostra notifiche per le chiamate e per gli SMS",
@@@ -34,8 -37,9 +37,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