[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=2e5b8ae

The following commit has been merged in the master branch:
commit 2e5b8ae26565f54b79010c822f7fc34d077b6bf4
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Jun 10 10:43:22 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/kcm_kdeconnect.desktop                          | 8 ++++++++
 kcm/kdeconnect.desktop                              | 8 ++++++++
 plugins/notifications/kdeconnect_notifications.json | 8 ++++++++
 3 files changed, 24 insertions(+)

diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index 430a505..9e1a44e 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -39,6 +39,14 @@ Name[x-test]=xxKDE Connectxx
 Name[zh_CN]=KDE Connect
 
 Comment=Connect and sync your devices
+Comment[ca]=Connecta i sincronitza els vostres dispositius
+Comment[de]=Verbinden und Abgleichen Ihrer Geräte
+Comment[gl]=Conecte e sincronice os seus dispositivos.
+Comment[nl]=Uw apparaten verbinden en synchroniseren
+Comment[pt_BR]=Conecta e sincroniza seus dispositivos
+Comment[sv]=Anslut och synkronisera dina apparater
+Comment[uk]=З’єднання і синхронізація ваших пристроїв
+Comment[x-test]=xxConnect and sync your devicesxx
 
 X-KDE-Keywords=Network,Android,Devices
 X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства
diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop
index c69c4f9..e2b4ed2 100755
--- a/kcm/kdeconnect.desktop
+++ b/kcm/kdeconnect.desktop
@@ -31,5 +31,13 @@ Name[uk]=З’єднання KDE
 Name[x-test]=xxKDE Connectxx
 Name[zh_CN]=KDE Connect
 GenericName=Connect and sync your devices
+GenericName[ca]=Connecta i sincronitza els vostres dispositius
+GenericName[de]=Verbinden und Abgleichen Ihrer Geräte
+GenericName[gl]=Conecte e sincronice os seus dispositivos
+GenericName[nl]=Uw apparaten verbinden en synchroniseren
+GenericName[pt_BR]=Conecta e sincroniza seus dispositivos
+GenericName[sv]=Anslut och synkronisera dina apparater
+GenericName[uk]=З’єднання і синхронізація ваших пристроїв
+GenericName[x-test]=xxConnect and sync your devicesxx
 Categories=Qt;KDE;Settings;HardwareSettings;
 NotShowIn=KDE;
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index d89b9e8..7bc843d 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -8,6 +8,14 @@
             }
         ], 
         "Description": "Show phone notifications on your computer and keep them in sync", 
+        "Description[ca]": "Mostra les notificacions del telèfon a l'ordinador i les manté sincronitzades", 
+        "Description[de]": "Benachrichtigungen auf Ihren Rechner anzeigen und abgleichen", 
+        "Description[gl]": "Mostre notificacións dun teléfono móbil no computador e deixe que as notificacións se sincronicen co teléfono.", 
+        "Description[nl]": "Telefoonmeldingen op uw computer tonen en ze gesynchroniseerd houden", 
+        "Description[pt_BR]": "Mostra as notificações do celular no seu computador e as mantém sincronizadas", 
+        "Description[sv]": "Visa telefonunderrättelser på datorn och håll dem synkroniserade", 
+        "Description[uk]": "Показ сповіщень з телефону на вашому комп’ютері та підтримання синхронізації даних сповіщень", 
+        "Description[x-test]": "xxShow phone notifications on your computer and keep them in syncxx", 
         "EnabledByDefault": true, 
         "Icon": "preferences-desktop-notification", 
         "Id": "kdeconnect_notifications", 

-- 
kdeconnect packaging