[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=700eff4

The following commit has been merged in the master branch:
commit 700eff446ef68b3fb1096ccbba135e51b8ab5627
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Jun 18 11:49:24 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"
---
 app/org.kde.kdeconnect.app.desktop                  |  3 +++
 kcm/kcm_kdeconnect.desktop                          |  1 +
 kcm/kdeconnect.desktop                              |  1 +
 plugins/mprisremote/kdeconnect_mprisremote.json     | 14 +++++++-------
 plugins/notifications/kdeconnect_notifications.json |  1 +
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index ec4c0b7..c8d43c7 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KDE Connect Application
 Name[ca]=Aplicació KDE Connect
+Name[gl]=Programa de KDE Connect
 Name[nl]=KDE Connect-toepassing
 Name[pt]=Aplicação do KDE Connect
 Name[pt_BR]=Aplicativo KDE Connect
@@ -9,6 +10,7 @@ Name[uk]=Програма KDE Connect
 Name[x-test]=xxKDE Connect Applicationxx
 GenericName=Device Synchronization
 GenericName[ca]=Sincronització de dispositius
+GenericName[gl]=Sincronización de dispositivos
 GenericName[nl]=Synchronisatie van apparaat
 GenericName[pt]=Sincronização de Dispositivos
 GenericName[pt_BR]=Sincronização de dispositivo
@@ -17,6 +19,7 @@ GenericName[uk]=Синхронізація із пристроями
 GenericName[x-test]=xxDevice Synchronizationxx
 Comment=Make all your devices one
 Comment[ca]=Fa que tots els vostres dispositius siguin un
+Comment[gl]=Unifique os seus dispositivos.
 Comment[nl]=Al uw apparaten een maken
 Comment[pt]=Unifique todos os seus dispositivos
 Comment[pt_BR]=Torne todos os seus dispositivos em um
diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index c93364e..21fb4f1 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -41,6 +41,7 @@ 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[es]=Conectar y sincronizar sus dispositivos
 Comment[fi]=Yhdistä ja synkronoi laitteitasi
 Comment[gl]=Conecte e sincronice os seus dispositivos.
 Comment[it]=Connetti e sincronizza i tuoi dispositivi
diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop
index 4de0584..82413fb 100755
--- a/kcm/kdeconnect.desktop
+++ b/kcm/kdeconnect.desktop
@@ -33,6 +33,7 @@ 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[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
diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index 32c150c..caf088c 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -3,16 +3,16 @@
     "KPlugin": {
         "Authors": [
             {
-                "Email": "aleixpol at kde.org",
+                "Email": "aleixpol at kde.org", 
                 "Name": "Aleix Pol"
             }
         ], 
-        "Description": "Control MPRIS services",
+        "Description": "Control MPRIS services", 
         "EnabledByDefault": true, 
-        "Icon": "applications-multimedia",
-        "Id": "kdeconnect_mprisremote",
-        "License": "GPL",
-        "Name": "MprisRemote",
+        "Icon": "applications-multimedia", 
+        "Id": "kdeconnect_mprisremote", 
+        "License": "GPL", 
+        "Name": "MprisRemote", 
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ], 
@@ -25,4 +25,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.mpris"
     ]
-}
+}
\ No newline at end of file
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index c5c8645..95002a5 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -10,6 +10,7 @@
         "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[es]": "Mostrar notificaciones del teléfono en su equipo y mantenerlas en sincronía", 
         "Description[fi]": "Näytä puhelimen ilmoitukset tietokoneellasi ja pidä ne ajan tasalla", 
         "Description[gl]": "Mostre notificacións dun teléfono móbil no computador e deixe que as notificacións se sincronicen co teléfono.", 
         "Description[it]": "Mostra le notifiche del telefono sul tuo computer e tienile sincronizzate", 

-- 
kdeconnect packaging