[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=446afc0

The following commit has been merged in the master branch:
commit 446afc06191283e4e107eb0f201183f41026c6ba
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Dec 21 09:59:24 2015 +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/notifications/kdeconnect_notifications_config.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop
index 26ac4c0..12e06b6 100644
--- a/plugins/notifications/kdeconnect_notifications_config.desktop
+++ b/plugins/notifications/kdeconnect_notifications_config.desktop
@@ -16,6 +16,7 @@ Name[nl]=Instellingen van plug-in voor synchronisatie van meldingen
 Name[pl]=Ustawienia wtyczki synchronizującej powiadomienia
 Name[pt]=Configuração do 'plugin' de sincronização das notificações
 Name[pt_BR]=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