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

The following commit has been merged in the master branch:
commit 7d514bdd296047e797f3b02e8e20ef7b3d6dbcba
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Jun 30 13:47: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"
---
 app/org.kde.kdeconnect.app.desktop                  | 6 ++++++
 kcm/kcm_kdeconnect.desktop                          | 1 +
 kcm/kdeconnect.desktop                              | 1 +
 plugins/mprisremote/kdeconnect_mprisremote.json     | 4 ++++
 plugins/notifications/kdeconnect_notifications.json | 1 +
 5 files changed, 13 insertions(+)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index af31305..5de31f4 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Name=KDE Connect Application
 Name[ca]=Aplicació KDE Connect
+Name[cs]=Aplikace KDE Connect
 Name[de]=KDE-Connect-Anwendung
+Name[es]=Aplicación KDE Connect
 Name[fi]=KDE Connect -sovellus
 Name[gl]=Programa de KDE Connect
 Name[it]=Applicazione KDE Connect
@@ -16,7 +18,9 @@ Name[uk]=Програма KDE Connect
 Name[x-test]=xxKDE Connect Applicationxx
 GenericName=Device Synchronization
 GenericName[ca]=Sincronització de dispositius
+GenericName[cs]=Synchronizace zařízení
 GenericName[de]=Geräteabgleich
+GenericName[es]=Sincronización de dispositivos
 GenericName[fi]=Laitteiden synkronointi
 GenericName[gl]=Sincronización de dispositivos
 GenericName[it]=Sincronizzazione dispositivo
@@ -31,6 +35,8 @@ GenericName[uk]=Синхронізація із пристроями
 GenericName[x-test]=xxDevice Synchronizationxx
 Comment=Make all your devices one
 Comment[ca]=Fa que tots els vostres dispositius siguin un
+Comment[cs]=Sjednoťte svá zařízení
+Comment[es]=Convertir todos sus dispositivos en uno
 Comment[fi]=Yhdistä kaikki laitteesi toisiinsa
 Comment[gl]=Unifique os seus dispositivos.
 Comment[it]=Fai di tutti i tuoi dispositivi un solo dispositivo
diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index 51cdc3b..09d519a 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -40,6 +40,7 @@ Name[zh_CN]=KDE Connect
 
 Comment=Connect and sync your devices
 Comment[ca]=Connecta i sincronitza els vostres dispositius
+Comment[cs]=Připojte a synchronizujte svá zařízení
 Comment[de]=Verbinden und Abgleichen Ihrer Geräte
 Comment[es]=Conectar y sincronizar sus dispositivos
 Comment[fi]=Yhdistä ja synkronoi laitteitasi
diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop
index 367f339..a35f2d4 100755
--- a/kcm/kdeconnect.desktop
+++ b/kcm/kdeconnect.desktop
@@ -32,6 +32,7 @@ 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[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
diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index 5de03b7..b42501a 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -9,6 +9,8 @@
         ], 
         "Description": "Control MPRIS services", 
         "Description[ca]": "Serveis de control del MPRIS", 
+        "Description[cs]": "Ovládejte služby MPRIS", 
+        "Description[es]": "Controlar los servicios MPRIS", 
         "Description[fi]": "Ohjaa MPRIS-palveluita", 
         "Description[gl]": "Controle servizos de MPRIS.", 
         "Description[it]": "Servizi di controllo MPRIS", 
@@ -27,6 +29,8 @@
         "License": "GPL", 
         "Name": "MprisRemote", 
         "Name[ca]": "MprisRemote", 
+        "Name[cs]": "MprisRemote", 
+        "Name[es]": "MprisRemote", 
         "Name[fi]": "MPRIS-kaukosäädin", 
         "Name[gl]": "MprisRemote", 
         "Name[it]": "MprisRemote", 
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index 8a7975d..f36afad 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -9,6 +9,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[cs]": "Zobrazit upozornění telefonu v počítači a udržovat je synchronizovaná", 
         "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", 

-- 
kdeconnect packaging