[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=e8be42c

The following commit has been merged in the master branch:
commit e8be42cf39daf986fe010a5d7784570375a0a607
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Oct 4 10:22:12 2016 +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/remotecommands/kdeconnect_remotecommands.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index bb2dacc..c24ac53 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -32,6 +32,7 @@
         "Id": "kdeconnect_remotecommands", 
         "License": "GPL", 
         "Name": "Host remote commands", 
+        "Name[ca at valencia]": "Allotja ordes remotes", 
         "Name[ca]": "Allotja ordres remotes", 
         "Name[nl]": "Host voor commando's op afstand", 
         "Name[pl]": "Wykonuj polecenia zdalne", 

-- 
kdeconnect packaging