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

The following commit has been merged in the master branch:
commit ce766fb7ffbad8ac17ca69d6f3c1f79c4991f293
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Nov 19 12:12:59 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/org.kde.kdeconnect.kcm.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kcm/org.kde.kdeconnect.kcm.desktop b/kcm/org.kde.kdeconnect.kcm.desktop
index ef5ba4f..fb52a20 100755
--- a/kcm/org.kde.kdeconnect.kcm.desktop
+++ b/kcm/org.kde.kdeconnect.kcm.desktop
@@ -29,7 +29,7 @@ Name[uk]=Параметри KDE Connect
 Name[x-test]=xxKDE Connect Settingsxx
 Name[zh_CN]=KDE Connect 设置
 GenericName=Connect and sync your devices
-GenericName[ast]=Coneuta y sincroniza los to preseos
+GenericName[ast]=Coneuta y sincroniza los tos preseos
 GenericName[ca]=Connecta i sincronitza els vostres dispositius
 GenericName[ca at valencia]=Connecta i sincronitza els vostres dispositius
 GenericName[cs]=Připojte a synchronizujte svá zařízení

-- 
kdeconnect packaging