[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=4b57abd

The following commit has been merged in the master branch:
commit 4b57abd556a126417f06ce88263beaa0253b965f
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Feb 6 09:47:03 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/kdeconnect.notifyrc                                   | 8 ++++++++
 plugins/notifications/kdeconnect_notifications_config.desktop | 1 +
 2 files changed, 9 insertions(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index ecf35b2..df8df79 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -95,6 +95,14 @@ Name[uk]=Запит щодо пов’язування
 Name[x-test]=xxPairing Requestxx
 Name[zh_CN]=配对请求
 Comment=Pairing request received from a device
+Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
+Comment[de]=Verbindungsanfrage von einem Gerät erhalten
+Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten
+Comment[pl]=Otrzymano żądanie parowania z urządzenia
+Comment[pt]=Pedido de emparelhamento recebido de um dispositivo
+Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo
+Comment[uk]=Від пристрою отримано запит щодо пов’язування
+Comment[x-test]=xxPairing request received from a devicexx
 Action=Popup
 
 [Event/callReceived]
diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop
index fb2ba39..c9c8b39 100644
--- a/plugins/notifications/kdeconnect_notifications_config.desktop
+++ b/plugins/notifications/kdeconnect_notifications_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[el]=Ρυθμίσεις πρόσθετου συγχρονισμού ειδοποιήσεων
 Name[en_GB]=Notification synchronisation plugin settings
 Name[es]=Preferencias del complemento de sincronización de notificaciones

-- 
kdeconnect packaging