[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=83c20da

The following commit has been merged in the master branch:
commit 83c20daf300f53b671feb80f05e0d5ea55d2abe5
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Aug 13 12:14:28 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 7d09b3e..1c44e25 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -101,6 +101,7 @@ 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[sk]=Požiadavka na spárovanie prijatá zo zariadenia
 Comment[sv]=Begäran om ihopparning mottagen från en apparat
 Comment[uk]=Від пристрою отримано запит щодо пов’язування
 Comment[x-test]=xxPairing request received from a devicexx
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index 9f3cc4e..e62f9ab 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -15,6 +15,7 @@ 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[sk]=Nastavenia pluginu notifikácií synchronizácie
 Name[sv]=Inställningar av insticksprogram för underrättelsesynkronisering
 Name[uk]=Параметри додатка синхронізації сповіщень
 Name[x-test]=xxNotification synchronization plugin settingsxx

-- 
kdeconnect packaging