[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=8859aa7

The following commit has been merged in the master branch:
commit 8859aa7dc320de56cd651755587f8bb096b924d0
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Sep 7 09:52:48 2015 +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"
---
 kcm/kdeconnect.desktop | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop
index 48cbfa5..158209f 100755
--- a/kcm/kdeconnect.desktop
+++ b/kcm/kdeconnect.desktop
@@ -5,5 +5,22 @@ Terminal=false
 Exec=kcmshell5 kcm_kdeconnect
 Name=KDE Connect Settings
 GenericName=Connect and sync your devices
+GenericName[ca]=Connecta i sincronitza els vostres dispositius
+GenericName[cs]=Připojte a synchronizujte svá zařízení
+GenericName[de]=Verbinden und Abgleichen Ihrer Geräte
+GenericName[es]=Conectar y sincronizar sus dispositivos
+GenericName[fi]=Yhdistä ja synkronoi laitteitasi
+GenericName[gl]=Conecte e sincronice os seus dispositivos
+GenericName[it]=Connetti e sincronizza i tuoi dispositivi
+GenericName[nl]=Uw apparaten verbinden en synchroniseren
+GenericName[pl]=Podłącz i zsynchronizuj swoje urządzenia
+GenericName[pt]=Ligue e sincronize os seus dispositivos
+GenericName[pt_BR]=Conecta e sincroniza seus dispositivos
+GenericName[sk]=Pripojiť a synchronizovať vaše zariadenia
+GenericName[sv]=Anslut och synkronisera dina apparater
+GenericName[tr]=Aygıtlarınıza bağlanın ve eşitleyin
+GenericName[uk]=З’єднання і синхронізація ваших пристроїв
+GenericName[x-test]=xxConnect and sync your devicesxx
+GenericName[zh_CN]=连接并同步您的设备
 Categories=Qt;KDE;Settings;HardwareSettings;
 NotShowIn=KDE;

-- 
kdeconnect packaging