[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=6dc0c04

The following commit has been merged in the master branch:
commit 6dc0c048e2561975619e84c16fd204dafad62c0a
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Aug 6 10:23:02 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 471a3c1..e1c95df 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -17,6 +17,7 @@
         "Description[pl]": "Zablokuj swoje systemy", 
         "Description[pt]": "Bloqueia os seus sistemas", 
         "Description[pt_BR]": "Bloqueia seus sistemas", 
+        "Description[sk]": "Zamkne vaše systémy", 
         "Description[sv]": "Låser dina system", 
         "Description[uk]": "Блокує вашу систему", 
         "Description[x-test]": "xxLocks your systemsxx", 
@@ -34,6 +35,7 @@
         "Name[pl]": "ZablokujUrządzenie", 
         "Name[pt]": "Bloqueio de Dispositivo", 
         "Name[pt_BR]": "Bloqueio de dispositivo", 
+        "Name[sk]": "Zamknúť zariadenie", 
         "Name[sv]": "Lås enhet", 
         "Name[uk]": "LockDevice", 
         "Name[x-test]": "xxLockDevicexx", 
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index 3510ae2..93b4447 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -16,6 +16,7 @@
         "Description[pl]": "Sterowanie zdalnymi systemami", 
         "Description[pt]": "Comandar sistemas à distância", 
         "Description[pt_BR]": "Controle remoto de sistemas", 
+        "Description[sk]": "Ovládať vzdialené systémy", 
         "Description[sv]": "Styr fjärrsystem", 
         "Description[uk]": "Системи віддаленого керування", 
         "Description[x-test]": "xxControl Remote systemsxx", 
@@ -32,6 +33,7 @@
         "Name[pl]": "ZdalneSterowanie", 
         "Name[pt]": "Comando à Distância", 
         "Name[pt_BR]": "Controle remoto", 
+        "Name[sk]": "Diaľkové ovládanie", 
         "Name[sv]": "Fjärrkontroll", 
         "Name[uk]": "RemoteControl", 
         "Name[x-test]": "xxRemoteControlxx", 

-- 
kdeconnect packaging