[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 18:27:07 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=c847c99
The following commit has been merged in the master branch:
commit c847c99f5ab674812dd27503426b01b320307e00
Merge: f0923134e000b2ee0098bf03ddc0c8bb1b120156 5ad75b46f88860f10976f8e4a93c0b5991002669
Author: Albert Vaca <albertvaka at gmail.com>
Date: Tue Oct 18 13:14:22 2016 +0200
Merge branch 'master' into 1.x
# Conflicts:
# plugins/findmyphone/kdeconnect_findmyphone.json
# plugins/notifications/kdeconnect_notifications.json
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/runcommand/kdeconnect_runcommand.json
# plugins/runcommand/kdeconnect_runcommand_config.desktop
# plugins/sftp/kdeconnect_sftp.json
plugins/battery/kdeconnect_battery.json | 2 +-
plugins/findmyphone/kdeconnect_findmyphone.json | 3 ++-
plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 2 +-
plugins/notifications/kdeconnect_notifications.json | 4 +++-
plugins/pausemusic/kdeconnect_pausemusic.json | 2 +-
plugins/remotecommands/kdeconnect_remotecommands.json | 8 ++++----
plugins/remotecontrol/kdeconnect_remotecontrol.json | 4 ++--
plugins/runcommand/kdeconnect_runcommand.json | 8 +++++++-
plugins/runcommand/kdeconnect_runcommand_config.desktop | 1 +
.../screensaver-inhibit/kdeconnect_screensaver_inhibit.json | 4 ++--
plugins/sendnotifications/kdeconnect_sendnotifications.json | 13 ++++++++-----
.../kdeconnect_sendnotifications_config.desktop | 2 +-
plugins/sftp/kdeconnect_sftp.json | 4 ++--
plugins/telephony/kdeconnect_telephony.json | 4 ++--
14 files changed, 37 insertions(+), 24 deletions(-)
diff --cc plugins/battery/kdeconnect_battery.json
index 9ffa190,072796d..63fed81
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@@@ -12,8 -12,11 +12,8 @@@
"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 dit telefonbatteri ved siden af dit computerbatteri",
+ "Description[da]": "Vis din telefons batteri 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/findmyphone/kdeconnect_findmyphone.json
index fda0dfb,525a5cd..0073a8f
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@@@ -64,4 -72,4 +65,4 @@@
"X-KdeConnect-OutgoingPackageType": [
"kdeconnect.findmyphone.request"
]
--}
++}
diff --cc plugins/mpriscontrol/kdeconnect_mpriscontrol.json
index 5106b9f,a8fd7cd..5d0ade7
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@@@ -42,8 -45,11 +42,8 @@@
"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]": "Multimediekontrol-modtager",
+ "Name[da]": "Modtager til multimediekontrol",
"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/notifications/kdeconnect_notifications.json
index 6a5043f,c5cd5c2..a9f20ec
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@@ -62,4 -70,4 +64,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.notification"
]
--}
++}
diff --cc plugins/pausemusic/kdeconnect_pausemusic.json
index 23cf0a9,1d73a9a..15cac2a
--- a/plugins/pausemusic/kdeconnect_pausemusic.json
+++ b/plugins/pausemusic/kdeconnect_pausemusic.json
@@@ -12,8 -12,11 +12,8 @@@
"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/video på pause under telefonsamtaler",
+ "Description[da]": "Sæt musik/videoer på pause under opkald",
"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/remotecommands/kdeconnect_remotecommands.json
index be06519,b806d75..5962dbf
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@@ -37,10 -40,9 +37,10 @@@
"Name[es]": "Órdenes en servidor remoto",
"Name[fi]": "Etäkomennot",
"Name[it]": "Comandi remoti host",
- "Name[nl]": "Commando's op afstand hosten",
+ "Name[nl]": "Host voor commando's op afstand",
"Name[pl]": "Wykonuj polecenia zdalne",
"Name[pt]": "Alojar os comandos remotos",
+ "Name[sk]": "Vzdialené príkazy hostiteľa",
"Name[sv]": "Fjärrkommandon för värddator",
"Name[uk]": "Віддалені команди вузлу",
"Name[x-test]": "xxHost remote commandsxx",
@@@ -56,4 -58,4 +56,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.runcommand"
]
--}
++}
diff --cc plugins/remotecontrol/kdeconnect_remotecontrol.json
index f034d8b,38b044b..ec598dd
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@@ -12,8 -12,11 +12,8 @@@
"Description[ca at valencia]": "Sistemes de control remot",
"Description[ca]": "Sistemes de control remot",
"Description[cs]": "Ovládejte vzdálené systémy",
- "Description[da]": "Fjernbetjen systemer",
+ "Description[da]": "Kontrollér eksterne 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/runcommand/kdeconnect_runcommand.json
index 997669a,68317ea..43f195f
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@@@ -71,4 -83,4 +77,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.runcommand.request"
]
--}
++}
diff --cc plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
index 79d5615,d4a57b4..26f8381
--- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
+++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
@@@ -12,8 -12,11 +12,8 @@@
"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]": "Forhindr pauseskærm når enheden er forbundet",
+ "Description[da]": "Tilbagehold pauseskærmen når enheden er tilsluttet",
"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 -45,11 +42,8 @@@
"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]": "Forhindr pauseskærm",
+ "Name[da]": "Tilbagehold 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 0c75d81,326a542..b40c947
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@@ -9,8 -9,11 +9,8 @@@ Name=Notification synchronization plugi
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 synkronisering af bekendtgørelser
+ Name[da]=Indstilling af plugin til bekendtgørelsessynkronisering
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..07e51eb
--- a/plugins/sftp/kdeconnect_sftp.json
+++ b/plugins/sftp/kdeconnect_sftp.json
@@@ -43,8 -46,11 +43,8 @@@
"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]": "Filbrowser til eksternt filsystem",
+ "Name[da]": "Browser 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",
@@@ -77,4 -83,4 +77,4 @@@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.sftp"
]
--}
++}
diff --cc plugins/telephony/kdeconnect_telephony.json
index 7fce311,4a31d96..784573d
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@@ -32,8 -31,11 +32,8 @@@
"Name[ca at valencia]": "Integració amb la telefonia",
"Name[ca]": "Integració amb la telefonia",
"Name[cs]": "Integrace telefonu",
- "Name[da]": "Telefoniintegration",
+ "Name[da]": "Integration af telefoni",
"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