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

The following commit has been merged in the master branch:
commit b8a351092df3b181ed756b4b4ef4ff80ae7b8e82
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Dec 8 10:05:27 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 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop
index 6535bc7..6362a21 100644
--- a/plugins/notifications/kdeconnect_notifications_config.desktop
+++ b/plugins/notifications/kdeconnect_notifications_config.desktop
@@ -6,5 +6,13 @@ X-KDE-Library=kdeconnect_notifications_config
 X-KDE-ParentComponents=kdeconnect_notifications
 
 Name=Notification synchronization plugin settings
+Name[ca]=Ajustament del connector per a la sincronització de les notificacions
+Name[ca at valencia]=Ajustament del connector per a la sincronització de les notificacions
+Name[nl]=Instellingen van plug-in voor synchronisatie van meldingen
+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[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