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

The following commit has been merged in the master branch:
commit c1a9ffd30524a3217055d3e02108e78b6b3ad5d8
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Jun 21 10:17:25 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/mprisremote/kdeconnect_mprisremote.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index 55182ae..2e1a4bf 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -9,6 +9,7 @@
         ], 
         "Description": "Control MPRIS services", 
         "Description[ca]": "Serveis de control del MPRIS", 
+        "Description[fi]": "Ohjaa MPRIS-palveluita", 
         "Description[gl]": "Controle servizos de MPRIS.", 
         "Description[nl]": "MPRIS-services besturen", 
         "Description[pl]": "Sterowanie usługami MPRIS", 
@@ -24,6 +25,7 @@
         "License": "GPL", 
         "Name": "MprisRemote", 
         "Name[ca]": "MprisRemote", 
+        "Name[fi]": "MPRIS-kaukosäädin", 
         "Name[gl]": "MprisRemote", 
         "Name[nl]": "MprisRemote", 
         "Name[pl]": "PilotMPRIS", 

-- 
kdeconnect packaging