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

The following commit has been merged in the master branch:
commit d4074b42fa1281c8bb695f3c8bf1a12795938fa5
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Jun 15 09:58:46 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                  | 15 +++++++++++++++
 kcm/kcm_kdeconnect.desktop                          |  1 +
 kcm/kdeconnect.desktop                              |  1 +
 plugins/notifications/kdeconnect_notifications.json |  1 +
 4 files changed, 18 insertions(+)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index 643076e..1e3d40c 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -1,7 +1,22 @@
 [Desktop Entry]
 Name=KDE Connect Application
+Name[ca]=Aplicació KDE Connect
+Name[nl]=KDE Connect-toepassing
+Name[sv]=Programmet KDE-anslut
+Name[uk]=Програма KDE Connect
+Name[x-test]=xxKDE Connect Applicationxx
 GenericName=Device Synchronization
+GenericName[ca]=Sincronització de dispositius
+GenericName[nl]=Synchronisatie van apparaat
+GenericName[sv]=Enhetssynkronisering
+GenericName[uk]=Синхронізація із пристроями
+GenericName[x-test]=xxDevice Synchronizationxx
 Comment=Make all your devices one
+Comment[ca]=Fa que tots els vostres dispositius siguin un
+Comment[nl]=Al uw apparaten een maken
+Comment[sv]=Gör alla enheter till en
+Comment[uk]=Поєднайте усі ваші пристрої
+Comment[x-test]=xxMake all your devices onexx
 Exec=kcapp
 Icon=kdeconnect
 Type=Application
diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop
index 4980337..d32859e 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[fi]=Yhdistä ja synkronoi laitteitasi
 Comment[gl]=Conecte e sincronice os seus dispositivos.
 Comment[nl]=Uw apparaten verbinden en synchroniseren
 Comment[pl]=Podłącz i zsynchronizuj swoje urządzenia
diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop
index 48cfc02..c5dd25d 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[fi]=Yhdistä ja synkronoi laitteitasi
 GenericName[gl]=Conecte e sincronice os seus dispositivos
 GenericName[nl]=Uw apparaten verbinden en synchroniseren
 GenericName[pl]=Podłącz i zsynchronizuj swoje urządzenia
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index 6e9492b..728628c 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[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[nl]": "Telefoonmeldingen op uw computer tonen en ze gesynchroniseerd houden", 
         "Description[pl]": "Pokaż powiadomienia telefonu na swoim komputerze i synchronizuj je", 

-- 
kdeconnect packaging