[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=49e74ea

The following commit has been merged in the master branch:
commit 49e74ea38862716dde07b52ee18c546d9a789824
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Dec 24 09:01:18 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 12e06b6..333e664 100644
--- a/plugins/notifications/kdeconnect_notifications_config.desktop
+++ b/plugins/notifications/kdeconnect_notifications_config.desktop
@@ -12,6 +12,7 @@ Name[en_GB]=Notification synchronisation plugin settings
 Name[es]=Preferencias del complemento de sincronización de notificaciones
 Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset
 Name[gl]=Configuración do complemento de sincronización de notificacións
+Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
 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

-- 
kdeconnect packaging