[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=43161b3

The following commit has been merged in the master branch:
commit 43161b3932b6dc2bf89b85761b9862b3f7eddecd
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Aug 1 10:37:53 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/mpriscontrol/kdeconnect_mpriscontrol.json   | 4 ++--
 plugins/mprisremote/kdeconnect_mprisremote.json     | 2 +-
 plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index 80013cd..471a3c1 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -11,6 +11,7 @@
         "Description[ca]": "Bloqueja els vostres sistemes", 
         "Description[de]": "Sperrt Ihre Systeme", 
         "Description[es]": "Bloquear sus sistemas", 
+        "Description[fi]": "Lukitsee järjestelmäsi", 
         "Description[gl]": "Bloquea os seus sistemas.", 
         "Description[nl]": "Vergrendeld uw systemen", 
         "Description[pl]": "Zablokuj swoje systemy", 
@@ -27,6 +28,7 @@
         "Name[ca]": "Bloqueja el dispositiu", 
         "Name[de]": "Gerätesperrung", 
         "Name[es]": "Bloquear dispositivo", 
+        "Name[fi]": "Lukitse laite", 
         "Name[gl]": "Bloqueo do dispositivo", 
         "Name[nl]": "Apparaat vergrendelen", 
         "Name[pl]": "ZablokujUrządzenie", 
diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
index 5c1fdae..acd9a26 100644
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@@ -13,7 +13,7 @@
         "Description[de]": "Fernbedienung für Musik und Videos", 
         "Description[en_GB]": "Remote control your music and videos", 
         "Description[es]": "Controlar remotamente vídeos y música", 
-        "Description[fi]": "Kaukosäädin musiikkiisi ja videoihisi", 
+        "Description[fi]": "Kauko-ohjain musiikkiisi ja videoihisi", 
         "Description[gl]": "Use o teléfono móbil como mando a distancia para música e vídeos.", 
         "Description[hu]": "A zene- és videolejátszás irányítása távolról", 
         "Description[it]": "Controlla da remoto la tua musica e i video", 
@@ -37,7 +37,7 @@
         "Name[de]": "Steuerung für Multimedia-Empfänger", 
         "Name[en_GB]": "Multimedia control receiver", 
         "Name[es]": "Receptor de control multimedia", 
-        "Name[fi]": "Multimediakaukosäädin", 
+        "Name[fi]": "Multimediakauko-ohjain", 
         "Name[gl]": "Receptor de controis multimedia", 
         "Name[hu]": "Multimédiavezérlő", 
         "Name[it]": "Ricevitore di controllo multimediale", 
diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index 8904c14..a6b4c15 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -33,7 +33,7 @@
         "Name[cs]": "MprisRemote", 
         "Name[de]": "MprisRemote", 
         "Name[es]": "MprisRemote", 
-        "Name[fi]": "MPRIS-kaukosäädin", 
+        "Name[fi]": "MPRIS-kauko-ohjain", 
         "Name[gl]": "MprisRemote", 
         "Name[it]": "MprisRemote", 
         "Name[nl]": "MprisRemote", 
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index 53f3ecf..3510ae2 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -10,6 +10,7 @@
         "Description": "Control Remote systems", 
         "Description[ca]": "Sistemes de control remot", 
         "Description[es]": "Controlar sistemas remotos", 
+        "Description[fi]": "Ohjaa järjestelmiä etänä", 
         "Description[gl]": "Controla sistemas remotos.", 
         "Description[nl]": "Systemen op afstand bedienen", 
         "Description[pl]": "Sterowanie zdalnymi systemami", 
@@ -25,6 +26,7 @@
         "Name": "RemoteControl", 
         "Name[ca]": "Control remot", 
         "Name[es]": "Control remoto", 
+        "Name[fi]": "Kauko-ohjain", 
         "Name[gl]": "Mando a distancia", 
         "Name[nl]": "Afstandsbediening", 
         "Name[pl]": "ZdalneSterowanie", 

-- 
kdeconnect packaging