[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=121b6ee

The following commit has been merged in the master branch:
commit 121b6ee64ac7146dc70f12e2413623c4328788a5
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Jul 25 11:30:20 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 6b52471..a9ed6e1 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -11,6 +11,7 @@
         "Description[ca]": "Bloqueja els vostres sistemes", 
         "Description[gl]": "Bloquea os seus sistemas.", 
         "Description[nl]": "Vergrendeld uw systemen", 
+        "Description[pl]": "Zablokuj swoje systemy", 
         "Description[pt]": "Bloqueia os seus sistemas", 
         "Description[pt_BR]": "Bloqueia seus sistemas", 
         "Description[sv]": "Låser dina system", 
@@ -24,6 +25,7 @@
         "Name[ca]": "Bloqueja el dispositiu", 
         "Name[gl]": "Bloqueo do dispositivo", 
         "Name[nl]": "Apparaat vergrendelen", 
+        "Name[pl]": "ZablokujUrządzenie", 
         "Name[pt]": "Bloqueio de Dispositivo", 
         "Name[pt_BR]": "Bloqueio de dispositivo", 
         "Name[sv]": "Lås enhet", 
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index 134a73e..4600a86 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -11,6 +11,7 @@
         "Description[ca]": "Sistemes de control remot", 
         "Description[gl]": "Controla sistemas remotos.", 
         "Description[nl]": "Systemen op afstand bedienen", 
+        "Description[pl]": "Sterowanie zdalnymi systemami", 
         "Description[pt]": "Comandar sistemas à distância", 
         "Description[pt_BR]": "Controle remoto de sistemas", 
         "Description[sv]": "Styr fjärrsystem", 
@@ -24,6 +25,7 @@
         "Name[ca]": "Control remot", 
         "Name[gl]": "Mando a distancia", 
         "Name[nl]": "Afstandsbediening", 
+        "Name[pl]": "ZdalneSterowanie", 
         "Name[pt]": "Comando à Distância", 
         "Name[pt_BR]": "Controle remoto", 
         "Name[sv]": "Fjärrkontroll", 

-- 
kdeconnect packaging