[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=9788f8f

The following commit has been merged in the master branch:
commit 9788f8f96bcc9aba9806699476ce041f74203b52
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Aug 5 11:37:14 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                                          | 5 +++++
 plugins/runcommand/kdeconnect_runcommand_config.desktop              | 1 +
 .../sendnotifications/kdeconnect_sendnotifications_config.desktop    | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index fd166b4..61c9d2d 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -92,6 +92,11 @@ Name[uk]=Запит щодо пов’язування
 Name[x-test]=xxPairing Requestxx
 Name[zh_CN]=配对请求
 Comment=Pairing request received from a device
+Comment[it]=Richiesta di associazione ricevuta da un dispositivo
+Comment[pt]=Pedido de emparelhamento recebido de um dispositivo
+Comment[sv]=Begäran om ihopparning mottagen från en apparat
+Comment[uk]=Від пристрою отримано запит щодо пов’язування
+Comment[x-test]=xxPairing request received from a devicexx
 Action=Popup
 
 [Event/callReceived]
diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index bf14f6f..33b82af 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -18,5 +18,6 @@ Name[sk]=Nastavenia pluginu spustenia príkazu
 Name[sv]=Inställningar av insticksprogram för kör kommando
 Name[tr]=Komut Çalıştır eklenti ayarları
 Name[uk]=Параметри додатка запуску команд
+Name[x-test]=xxRun Command plugin settingsxx
 
 Categories=Qt;KDE;X-KDE-settings-kdeconnect;
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index cb4602a..4b6d313 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -6,5 +6,10 @@ X-KDE-Library=kdeconnect_sendnotifications_config
 X-KDE-ParentComponents=kdeconnect_sendnotifications
 
 Name=Notification synchronization plugin settings
+Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
+Name[pt]=Configuração do 'plugin' de sincronização das notificações
+Name[sv]=Inställningar av insticksprogram för underrättelsesynkronisering
+Name[uk]=Параметри додатка синхронізації сповіщень
+Name[x-test]=xxNotification synchronization plugin settingsxx
 
 Categories=Qt;KDE;X-KDE-settings-kdeconnect;

-- 
kdeconnect packaging