[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=f86c5e4

The following commit has been merged in the master branch:
commit f86c5e4a4caff8ec858a9a94fbc62ff5aae6bddf
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Jul 3 10:06:32 2015 +0000

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 app/org.kde.kdeconnect.app.desktop              | 1 +
 kdeconnect-non-plasma.desktop                   | 1 +
 plugins/mprisremote/kdeconnect_mprisremote.json | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 5de31f4..838f8ff 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -36,6 +36,7 @@ GenericName[x-test]=xxDevice Synchronizationxx
 Comment=Make all your devices one
 Comment[ca]=Fa que tots els vostres dispositius siguin un
 Comment[cs]=Sjednoťte svá zařízení
+Comment[de]=Gleichen Sie alle Ihre Geräte ab
 Comment[es]=Convertir todos sus dispositivos en uno
 Comment[fi]=Yhdistä kaikki laitteesi toisiinsa
 Comment[gl]=Unifique os seus dispositivos.
diff --git a/kdeconnect-non-plasma.desktop b/kdeconnect-non-plasma.desktop
index 00847ae..888608c 100755
--- a/kdeconnect-non-plasma.desktop
+++ b/kdeconnect-non-plasma.desktop
@@ -30,6 +30,7 @@ Comment=Reach out to your devices
 Comment[bg]=Достигане до устройствата ви
 Comment[ca]=Connecteu amb els vostres dispositius
 Comment[cs]=Dosáhněte na svá zařízení
+Comment[de]=Zugriff auf Ihre Geräte
 Comment[en_GB]=Reach out to your devices
 Comment[es]=Contactar con sus dispositivos
 Comment[fi]=Tavoitettavuutta laitteillesi
diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index b42501a..8904c14 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -10,6 +10,7 @@
         "Description": "Control MPRIS services", 
         "Description[ca]": "Serveis de control del MPRIS", 
         "Description[cs]": "Ovládejte služby MPRIS", 
+        "Description[de]": "Steuerung von MPRIS-Diensten", 
         "Description[es]": "Controlar los servicios MPRIS", 
         "Description[fi]": "Ohjaa MPRIS-palveluita", 
         "Description[gl]": "Controle servizos de MPRIS.", 
@@ -30,6 +31,7 @@
         "Name": "MprisRemote", 
         "Name[ca]": "MprisRemote", 
         "Name[cs]": "MprisRemote", 
+        "Name[de]": "MprisRemote", 
         "Name[es]": "MprisRemote", 
         "Name[fi]": "MPRIS-kaukosäädin", 
         "Name[gl]": "MprisRemote", 

-- 
kdeconnect packaging