[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a8834dcbc3382b06b54de7a5522d5d614f068b8b
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Sep 21 11:54:11 2016 +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"
---
 plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index 7bfab0e..45463b7 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -9,6 +9,7 @@ Name=Notification synchronization plugin settings
 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[de]=Einstellungen für Benachrichtigungsabgleich-Modul
 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

-- 
kdeconnect packaging