[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=83eaf6a

The following commit has been merged in the master branch:
commit 83eaf6a9325a0e983d32a983466777470939d0fe
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Sep 27 10:24:42 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/telephony/kdeconnect_telephony.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index 8433392..c85c1b8 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -9,6 +9,7 @@
             }
         ], 
         "Description": "Show notifications for calls and SMS", 
+        "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[nl]": "Meldingen tonen van oproepen en SMSjes", 

-- 
kdeconnect packaging