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

The following commit has been merged in the master branch:
commit fa1233b0516b3aa7082d29f367c1d347a47e0b7f
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Aug 6 12:40:34 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                                           | 4 ++++
 plugins/runcommand/kdeconnect_runcommand_config.desktop               | 1 +
 plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 61c9d2d..cdbdb93 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -92,7 +92,11 @@ 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[en_GB]=Pairing request received from a device
 Comment[it]=Richiesta di associazione ricevuta da un dispositivo
+Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat
+Comment[pl]=Otrzymano żądanie parowania z urządzenia
 Comment[pt]=Pedido de emparelhamento recebido de um dispositivo
 Comment[sv]=Begäran om ihopparning mottagen från en apparat
 Comment[uk]=Від пристрою отримано запит щодо пов’язування
diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index 33b82af..54b54be 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -6,6 +6,7 @@ X-KDE-Library=kdeconnect_runcommand_config
 X-KDE-ParentComponents=kdeconnect_runcommand
 
 Name=Run Command plugin settings
+Name[ca]=Ajustaments del connector Executa ordres
 Name[en_GB]=Run Command plugin settings
 Name[fi]=Suorita komento -liitännäisen asetukset
 Name[it]=Impostazioni estensione Esegui comando
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index 4b6d313..3b1c447 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -6,7 +6,11 @@ X-KDE-Library=kdeconnect_sendnotifications_config
 X-KDE-ParentComponents=kdeconnect_sendnotifications
 
 Name=Notification synchronization plugin settings
+Name[ca]=Ajustament del connector Sincronitza les notificacions
+Name[en_GB]=Notification synchronisation plugin settings
 Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
+Name[nl]=Instellingen voor meldingen van synchronisatie plug-in
+Name[pl]=Ustawienia wtyczki synchronizującej powiadomienia
 Name[pt]=Configuração do 'plugin' de sincronização das notificações
 Name[sv]=Inställningar av insticksprogram för underrättelsesynkronisering
 Name[uk]=Параметри додатка синхронізації сповіщень

-- 
kdeconnect packaging