[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=2285daa

The following commit has been merged in the master branch:
commit 2285daac50305b5c58cfd5196d31134a97c1cb52
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Oct 5 09:24:30 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 +
 plugins/telephony/kdeconnect_telephony.json           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index c24ac53..7677a1e 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -34,6 +34,7 @@
         "Name": "Host remote commands", 
         "Name[ca at valencia]": "Allotja ordes remotes", 
         "Name[ca]": "Allotja ordres remotes", 
+        "Name[es]": "Órdenes en servidor remoto", 
         "Name[nl]": "Host voor commando's op afstand", 
         "Name[pl]": "Wykonuj polecenia zdalne", 
         "Name[pt]": "Alojar os comandos remotos", 
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index a3c19be..32eafd4 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -12,6 +12,7 @@
         "Description[ca at valencia]": "Mostra les notificacions de les trucades i els SMS", 
         "Description[ca]": "Mostra les notificacions de les trucades i els SMS", 
         "Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen", 
+        "Description[es]": "Mostrar notificaciones de llamadas y SMS", 
         "Description[nl]": "Meldingen tonen van oproepen en SMSjes", 
         "Description[pl]": "Powiadamiaj o dzwonieniu i esemesach", 
         "Description[pt]": "Mostrar notificações para as chamadas e SMS", 

-- 
kdeconnect packaging