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

The following commit has been merged in the master branch:
commit f3411bb8dda355eecaae5dc62ee08beca3407d49
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Aug 10 10:15:07 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/lockdevice/kdeconnect_lockdevice.json       | 2 ++
 plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index e1c95df..579a7cc 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -13,6 +13,7 @@
         "Description[es]": "Bloquear sus sistemas", 
         "Description[fi]": "Lukitsee järjestelmäsi", 
         "Description[gl]": "Bloquea os seus sistemas.", 
+        "Description[it]": "Blocca i tuoi sistemi", 
         "Description[nl]": "Vergrendeld uw systemen", 
         "Description[pl]": "Zablokuj swoje systemy", 
         "Description[pt]": "Bloqueia os seus sistemas", 
@@ -31,6 +32,7 @@
         "Name[es]": "Bloquear dispositivo", 
         "Name[fi]": "Lukitse laite", 
         "Name[gl]": "Bloqueo do dispositivo", 
+        "Name[it]": "Blocco dispositivo", 
         "Name[nl]": "Apparaat vergrendelen", 
         "Name[pl]": "ZablokujUrządzenie", 
         "Name[pt]": "Bloqueio de Dispositivo", 
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index 93b4447..ddccd5e 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -12,6 +12,7 @@
         "Description[es]": "Controlar sistemas remotos", 
         "Description[fi]": "Ohjaa järjestelmiä etänä", 
         "Description[gl]": "Controla sistemas remotos.", 
+        "Description[it]": "Controlla i sistemi remoti", 
         "Description[nl]": "Systemen op afstand bedienen", 
         "Description[pl]": "Sterowanie zdalnymi systemami", 
         "Description[pt]": "Comandar sistemas à distância", 
@@ -29,6 +30,7 @@
         "Name[es]": "Control remoto", 
         "Name[fi]": "Kauko-ohjain", 
         "Name[gl]": "Mando a distancia", 
+        "Name[it]": "Telecomando", 
         "Name[nl]": "Afstandsbediening", 
         "Name[pl]": "ZdalneSterowanie", 
         "Name[pt]": "Comando à Distância", 

-- 
kdeconnect packaging