[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=2058cbc

The following commit has been merged in the master branch:
commit 2058cbc1afb81d630897ffcef3157afe3b565296
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Aug 8 11:56:08 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/kdeconnect.notifyrc                                           | 1 +
 plugins/runcommand/kdeconnect_runcommand_config.desktop               | 1 +
 plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop | 1 +
 3 files changed, 3 insertions(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index cdbdb93..de1bb65 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -93,6 +93,7 @@ Name[x-test]=xxPairing Requestxx
 Name[zh_CN]=配对请求
 Comment=Pairing request received from a device
 Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
+Comment[ca at valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[en_GB]=Pairing request received from a device
 Comment[it]=Richiesta di associazione ricevuta da un dispositivo
 Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat
diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index 54b54be..7fc9c0c 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -7,6 +7,7 @@ X-KDE-ParentComponents=kdeconnect_runcommand
 
 Name=Run Command plugin settings
 Name[ca]=Ajustaments del connector Executa ordres
+Name[ca at valencia]=Ajustaments del connector Executa ordes
 Name[en_GB]=Run Command plugin settings
 Name[fi]=Suorita komento -liitännäisen asetukset
 Name[it]=Impostazioni estensione Esegui comando
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index 3b1c447..ab6873e 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -7,6 +7,7 @@ X-KDE-ParentComponents=kdeconnect_sendnotifications
 
 Name=Notification synchronization plugin settings
 Name[ca]=Ajustament del connector Sincronitza les notificacions
+Name[ca at valencia]=Ajustament del connector Sincronitza les notificacions
 Name[en_GB]=Notification synchronisation plugin settings
 Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
 Name[nl]=Instellingen voor meldingen van synchronisatie plug-in

-- 
kdeconnect packaging