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

The following commit has been merged in the master branch:
commit c95f769aadd167dbee0fedde35d2a6df63491f4f
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Dec 17 07:40:02 2016 +0100

    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 d69c705..9348abf 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -37,6 +37,7 @@
         "Name[cs]": "Přijímat vzdálené příkazy", 
         "Name[da]": "Vært for eksterne kommandoer", 
         "Name[es]": "Órdenes en servidor remoto", 
+        "Name[et]": "Kaugkäsud", 
         "Name[fi]": "Etäkomennot", 
         "Name[it]": "Comandi remoti host", 
         "Name[nl]": "Commando's op afstand hosten", 
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index d6e16bc..bb3e63b 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -15,6 +15,7 @@
         "Description[da]": "Vis bekendtgørelser for opkald og SMS'er", 
         "Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen", 
         "Description[es]": "Mostrar notificaciones de llamadas y SMS", 
+        "Description[et]": "Kõnede ja SMS-ide märguannete näitamine", 
         "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset", 
         "Description[it]": "Mostra notifiche per le chiamate e per gli SMS", 
         "Description[nl]": "Meldingen tonen van oproepen en SMSjes", 

-- 
kdeconnect packaging