[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=2c88a0a

The following commit has been merged in the master branch:
commit 2c88a0ab39ea8419e76c4ca82c4762640d5191d9
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Feb 27 09:28:44 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 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index d996197..1ca7f06 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -107,6 +107,7 @@ Comment[en_GB]=Pairing request received from a device
 Comment[es]=Petición de vinculación recibida desde un dispositivo
 Comment[fi]=Saatiin paripyyntö laitteelta
 Comment[gl]=Recibiuse unha solicitude de emparellamento dun dispositivo.
+Comment[it]=Richiesta di associazione ricevuta da un dispositivo
 Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten
 Comment[pl]=Otrzymano żądanie parowania z urządzenia
 Comment[pt]=Pedido de emparelhamento recebido de um dispositivo

-- 
kdeconnect packaging