[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=3fd1eb4

The following commit has been merged in the master branch:
commit 3fd1eb4d2fd3203bab75bbab7d8482497a16788d
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Oct 28 10:17:04 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"
---
 org.kde.kdeconnect.nonplasma.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.kde.kdeconnect.nonplasma.desktop b/org.kde.kdeconnect.nonplasma.desktop
index 922e7bf..e57c61f 100755
--- a/org.kde.kdeconnect.nonplasma.desktop
+++ b/org.kde.kdeconnect.nonplasma.desktop
@@ -2,6 +2,7 @@
 Name=KDE Connect Monitor
 Name[ca]=Controlador del KDE Connect
 Name[cs]=Monitor KDE Connect
+Name[de]=KDE-Connect-Monitor
 Name[en_GB]=KDE Connect Monitor
 Name[es]=Monitor de KDE Connect
 Name[fi]=KDE Connect -valvonta
@@ -21,6 +22,7 @@ Name[zh_CN]=KDE Connect 监视器
 Comment=Display information about your devices
 Comment[ca]=Mostra la informació dels vostres dispositius
 Comment[cs]=Zobrazit informace o vašich zařízeních
+Comment[de]=Anzeige von Informationen über Ihre Geräte
 Comment[en_GB]=Display information about your devices
 Comment[es]=Mostrar información sobre sus dispositivos
 Comment[fi]=Näyttää tietoa laitteistasi

-- 
kdeconnect packaging