[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=ba818c7

The following commit has been merged in the master branch:
commit ba818c743cf6178a91a60df3e0b7d347b19c6da2
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Sep 29 12:23:45 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"
---
 kcm/org.kde.kdeconnect.kcm.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kcm/org.kde.kdeconnect.kcm.desktop b/kcm/org.kde.kdeconnect.kcm.desktop
index 0a3a32f..2940179 100755
--- a/kcm/org.kde.kdeconnect.kcm.desktop
+++ b/kcm/org.kde.kdeconnect.kcm.desktop
@@ -6,6 +6,7 @@ Exec=kcmshell5 kcm_kdeconnect
 Name=KDE Connect Settings
 Name[ca]=Arranjament del KDE Connect
 Name[cs]=Nastavení KDE Connect
+Name[de]=KDE-Connect-Einstellungen
 Name[en_GB]=KDE Connect Settings
 Name[es]=Ajustes de KDE Connect
 Name[fi]=KDE Connectin asetukset

-- 
kdeconnect packaging