[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=320779b

The following commit has been merged in the master branch:
commit 320779b719dc5c4c587b0d9b5ea2fb4b85741e3e
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Jun 25 10:38:53 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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 877cc9b..34ad764 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KDE Connect Application
 Name[ca]=Aplicació KDE Connect
+Name[de]=KDE-Connect-Anwendung
 Name[fi]=KDE Connect -sovellus
 Name[gl]=Programa de KDE Connect
 Name[nl]=KDE Connect-toepassing
@@ -14,6 +15,7 @@ Name[uk]=Програма KDE Connect
 Name[x-test]=xxKDE Connect Applicationxx
 GenericName=Device Synchronization
 GenericName[ca]=Sincronització de dispositius
+GenericName[de]=Geräteabgleich
 GenericName[fi]=Laitteiden synkronointi
 GenericName[gl]=Sincronización de dispositivos
 GenericName[nl]=Synchronisatie van apparaat

-- 
kdeconnect packaging