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

The following commit has been merged in the master branch:
commit e55be85cf54c027eadf3d95682ae134d2a1cbff2
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Jun 13 10:44:25 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                                           | 1 +
 plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 9c42400..ef1600c 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -103,6 +103,7 @@ Comment[ast]=Solicitú d'empareyamientu recibida d'un preséu
 Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[ca at valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[cs]=Požadavek na párování přijat ze zařízení
+Comment[da]=Parringsanmodning modtaget fra en enhed
 Comment[de]=Verbindungsanfrage von einem Gerät erhalten
 Comment[el]=Λήφθηκε αίτημα σύζευξης από μια συσκευή
 Comment[en_GB]=Pairing request received from a device
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index 51d937a..f26efdf 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -11,6 +11,7 @@ Name[ast]=Axustes del complementu de sincronización d'avisos
 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[da]=Indstilling af plugin til bekendtgørelsessynkronisering
 Name[de]=Einstellungen für Benachrichtigungsabgleich-Modul
 Name[el]=Ρυθμίσεις πρόσθετου συγχρονισμού ειδοποιήσεων
 Name[en_GB]=Notification synchronisation plugin settings

-- 
kdeconnect packaging