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

The following commit has been merged in the master branch:
commit d8b3d829e495311d2ae64d62843acf7daa35c9bc
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Jun 20 11:56:14 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     | 6 ++++++
 plugins/notifications/kdeconnect_notifications.json | 1 +
 5 files changed, 15 insertions(+)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 633295e..ecb5aa4 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -4,8 +4,10 @@ Name[ca]=Aplicació KDE Connect
 Name[fi]=KDE Connect -sovellus
 Name[gl]=Programa de KDE Connect
 Name[nl]=KDE Connect-toepassing
+Name[pl]=Program KDE Connect
 Name[pt]=Aplicação do KDE Connect
 Name[pt_BR]=Aplicativo KDE Connect
+Name[sk]=KDE Connect aplikácia
 Name[sv]=Programmet KDE-anslut
 Name[uk]=Програма KDE Connect
 Name[x-test]=xxKDE Connect Applicationxx
@@ -14,8 +16,10 @@ GenericName[ca]=Sincronització de dispositius
 GenericName[fi]=Laitteiden synkronointi
 GenericName[gl]=Sincronización de dispositivos
 GenericName[nl]=Synchronisatie van apparaat
+GenericName[pl]=Synchronizacja urządzenia
 GenericName[pt]=Sincronização de Dispositivos
 GenericName[pt_BR]=Sincronização de dispositivo
+GenericName[sk]=Synchronizácia zariadení
 GenericName[sv]=Enhetssynkronisering
 GenericName[uk]=Синхронізація із пристроями
 GenericName[x-test]=xxDevice Synchronizationxx
@@ -24,8 +28,10 @@ Comment[ca]=Fa que tots els vostres dispositius siguin un
 Comment[fi]=Yhdistä kaikki laitteesi toisiinsa
 Comment[gl]=Unifique os seus dispositivos.
 Comment[nl]=Al uw apparaten een maken
+Comment[pl]=Uczyń wszystkie swoje urządzenia jednym
 Comment[pt]=Unifique todos os seus dispositivos
 Comment[pt_BR]=Torne todos os seus dispositivos em um
+Comment[sk]=Urobiť z vašich zariadení jedno
 Comment[sv]=Gör alla enheter till en
 Comment[uk]=Поєднайте усі ваші пристрої
 Comment[x-test]=xxMake all your devices onexx
diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index 21fb4f1..97aab99 100755
--- a/kcm/kcm_kdeconnect.desktop
+++ b/kcm/kcm_kdeconnect.desktop
@@ -49,6 +49,7 @@ Comment[nl]=Uw apparaten verbinden en synchroniseren
 Comment[pl]=Podłącz i zsynchronizuj swoje urządzenia
 Comment[pt]=Ligue e sincronize os seus dispositivos
 Comment[pt_BR]=Conecta e sincroniza seus dispositivos
+Comment[sk]=Pripojiť a synchronizovať vaše zariadenia
 Comment[sv]=Anslut och synkronisera dina apparater
 Comment[uk]=З’єднання і синхронізація ваших пристроїв
 Comment[x-test]=xxConnect and sync your devicesxx
diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop
index 82413fb..f336109 100755
--- a/kcm/kdeconnect.desktop
+++ b/kcm/kdeconnect.desktop
@@ -41,6 +41,7 @@ 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[uk]=З’єднання і синхронізація ваших пристроїв
 GenericName[x-test]=xxConnect and sync your devicesxx
diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index b06e3b4..55182ae 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -11,7 +11,10 @@
         "Description[ca]": "Serveis de control del MPRIS", 
         "Description[gl]": "Controle servizos de MPRIS.", 
         "Description[nl]": "MPRIS-services besturen", 
+        "Description[pl]": "Sterowanie usługami MPRIS", 
         "Description[pt]": "Controlar os serviços MPRIS", 
+        "Description[pt_BR]": "Controle dos serviços MPRIS", 
+        "Description[sk]": "Ovládať MPRIS služby", 
         "Description[sv]": "Styr MPRIS-tjänster", 
         "Description[uk]": "Керування службами MPRIS", 
         "Description[x-test]": "xxControl MPRIS servicesxx", 
@@ -23,7 +26,10 @@
         "Name[ca]": "MprisRemote", 
         "Name[gl]": "MprisRemote", 
         "Name[nl]": "MprisRemote", 
+        "Name[pl]": "PilotMPRIS", 
         "Name[pt]": "Comando MPRIS", 
+        "Name[pt_BR]": "MprisRemote", 
+        "Name[sk]": "MprisRemote", 
         "Name[sv]": "MPRIS-fjärrkontroll", 
         "Name[uk]": "MprisRemote", 
         "Name[x-test]": "xxMprisRemotexx", 
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index 95002a5..de76ea5 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -18,6 +18,7 @@
         "Description[pl]": "Pokaż powiadomienia telefonu na swoim komputerze i synchronizuj je", 
         "Description[pt]": "Mostrar as notificações do telefone no seu computador e mantê-las sincronizadas", 
         "Description[pt_BR]": "Mostra as notificações do celular no seu computador e as mantém sincronizadas", 
+        "Description[sk]": "Zobraziť oznámenia telefónu na vašom počítači a udržať ich synchronizované", 
         "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", 

-- 
kdeconnect packaging