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

The following commit has been merged in the master branch:
commit f92534583d62e27bff61e5b490c2e8e9ef5aca02
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Nov 13 10:40:06 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 +++
 daemon/kdeconnectd.desktop.cmake   | 1 +
 kcm/org.kde.kdeconnect.kcm.desktop | 1 +
 plugins/kdeconnect.notifyrc        | 7 +++++++
 4 files changed, 12 insertions(+)

diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop
index cc36216..bb16ba6 100644
--- a/app/org.kde.kdeconnect.app.desktop
+++ b/app/org.kde.kdeconnect.app.desktop
@@ -3,6 +3,7 @@ Name=KDE Connect Application
 Name[ca]=Aplicació KDE Connect
 Name[ca at valencia]=Aplicació KDE Connect
 Name[cs]=Aplikace KDE Connect
+Name[da]=Programmet KDE Connect
 Name[de]=KDE-Connect-Anwendung
 Name[en_GB]=KDE Connect Application
 Name[es]=Aplicación KDE Connect
@@ -28,6 +29,7 @@ GenericName=Device Synchronization
 GenericName[ca]=Sincronització de dispositius
 GenericName[ca at valencia]=Sincronització de dispositius
 GenericName[cs]=Synchronizace zařízení
+GenericName[da]=Enhedssynkronisering
 GenericName[de]=Geräteabgleich
 GenericName[en_GB]=Device Synchronisation
 GenericName[es]=Sincronización de dispositivos
@@ -54,6 +56,7 @@ Comment=Make all your devices one
 Comment[ca]=Fa que tots els vostres dispositius siguin un
 Comment[ca at valencia]=Fa que tots els vostres dispositius siguen un
 Comment[cs]=Sjednoťte svá zařízení
+Comment[da]=Gør alle dine enheder til en
 Comment[de]=Gleichen Sie alle Ihre Geräte ab
 Comment[en_GB]=Make all your devices one
 Comment[es]=Convertir todos sus dispositivos en uno
diff --git a/daemon/kdeconnectd.desktop.cmake b/daemon/kdeconnectd.desktop.cmake
index a0e812e..29d5d37 100644
--- a/daemon/kdeconnectd.desktop.cmake
+++ b/daemon/kdeconnectd.desktop.cmake
@@ -12,6 +12,7 @@ Name[bg]=Услуга KDE Connect
 Name[ca]=Dimoni del KDEConnect
 Name[ca at valencia]=Dimoni del KDEConnect
 Name[cs]=Démon KDE Connect
+Name[da]=KDEConnect-dæmon
 Name[de]=KDE-Connect-Dienst
 Name[en_GB]=KDEConnect daemon
 Name[es]=Demonio de KDE Connect
diff --git a/kcm/org.kde.kdeconnect.kcm.desktop b/kcm/org.kde.kdeconnect.kcm.desktop
index ef3228b..561063f 100755
--- a/kcm/org.kde.kdeconnect.kcm.desktop
+++ b/kcm/org.kde.kdeconnect.kcm.desktop
@@ -7,6 +7,7 @@ Name=KDE Connect Settings
 Name[ca]=Arranjament del KDE Connect
 Name[ca at valencia]=Arranjament del KDE Connect
 Name[cs]=Nastavení KDE Connect
+Name[da]=Indstilling af KDE Connect
 Name[de]=KDE-Connect-Einstellungen
 Name[en_GB]=KDE Connect Settings
 Name[es]=Ajustes de KDE Connect
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index cdc11b5..fb7728f 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -124,6 +124,7 @@ Name[bg]=Входящо обаждане
 Name[ca]=Trucada entrant
 Name[ca at valencia]=Trucada entrant
 Name[cs]=Příchozí hovor
+Name[da]=Indkommende opkald
 Name[de]=Eingehender Anruf
 Name[en_GB]=Incoming Call
 Name[es]=Llamada entrante
@@ -182,6 +183,7 @@ Name[bg]=Пропуснато обаждане
 Name[ca]=Trucada perduda
 Name[ca at valencia]=Trucada perduda
 Name[cs]=Zmeškaný hovor
+Name[da]=Ubesvaret opkald
 Name[de]=Verpasster Anruf
 Name[en_GB]=Missed Call
 Name[es]=Llamada perdida
@@ -240,6 +242,7 @@ Name[bg]=Получен SMS
 Name[ca]=S'ha rebut un SMS
 Name[ca at valencia]=S'ha rebut un SMS
 Name[cs]=SMS přijata
+Name[da]=SMS-modtaget
 Name[de]=SMS empfangen
 Name[en_GB]=SMS Received
 Name[es]=SMS recibido
@@ -298,6 +301,7 @@ Name[bg]=Изтощена батерия
 Name[ca]=Bateria baixa
 Name[ca at valencia]=Bateria baixa
 Name[cs]=Baterie je téměř vybitá
+Name[da]=Lavt batteri
 Name[de]=Akku-Ladestand niedrig
 Name[en_GB]=Battery Low
 Name[es]=Batería baja
@@ -356,6 +360,7 @@ Name[bg]=Пингът е приет
 Name[ca]=S'ha rebut un ping
 Name[ca at valencia]=S'ha rebut un ping
 Name[cs]=Ping přijat
+Name[da]=Ping modtaget
 Name[de]=Ping empfangen
 Name[en_GB]=Ping Received
 Name[es]=Ping recibido
@@ -472,6 +477,7 @@ Name[bg]=Прехвърляне на файл
 Name[ca]=Transferència de fitxers
 Name[ca at valencia]=Transferència de fitxers
 Name[cs]=Přenos souboru
+Name[da]=Filoverførsel
 Name[de]=Dateiübertragung
 Name[en_GB]=File Transfer
 Name[es]=Transferencia de archivo
@@ -498,6 +504,7 @@ Comment[bg]=Входящ файл
 Comment[ca]=Fitxer entrant
 Comment[ca at valencia]=Fitxer entrant
 Comment[cs]=Příchozí soubor
+Comment[da]=Indkommende fil
 Comment[de]=Eingehende Datei
 Comment[en_GB]=Incoming file
 Comment[es]=Archivo entrante

-- 
kdeconnect packaging