[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=4c06c63

The following commit has been merged in the master branch:
commit 4c06c63d39cc48d13cc1483a313e1b75ac90b584
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Dec 9 09:05:00 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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop
index 6362a21..639543f 100644
--- a/plugins/notifications/kdeconnect_notifications_config.desktop
+++ b/plugins/notifications/kdeconnect_notifications_config.desktop
@@ -8,6 +8,9 @@ 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[en_GB]=Notification synchronisation plugin settings
+Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset
+Name[gl]=Configuración do complemento de sincronización de notificacións
 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

-- 
kdeconnect packaging