[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 18:27:03 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=0423d6e

The following commit has been merged in the master branch:
commit 0423d6e5f7870313ddcdbf64e25bae6a1572b839
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Sep 25 12:01:18 2016 +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"
---
 plugins/kdeconnect.notifyrc                                           | 1 +
 plugins/runcommand/kdeconnect_runcommand_config.desktop               | 1 +
 plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop | 1 +
 3 files changed, 3 insertions(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index e809946..5299b4d 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -95,6 +95,7 @@ Comment=Pairing request received from a device
 Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[ca at valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[cs]=Požadavek na párování přijat ze zařízení
+Comment[da]=Parringsanmodning modtaget fra en enhed
 Comment[de]=Verbindungsanfrage von einem Gerät erhalten
 Comment[en_GB]=Pairing request received from a device
 Comment[es]=Petición de vinculación recibida desde un dispositivo
diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index f278e2f..ff1cc2b 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -9,6 +9,7 @@ Name=Run Command plugin settings
 Name[ca]=Ajustaments del connector Executa ordres
 Name[ca at valencia]=Ajustaments del connector Executa ordes
 Name[cs]=Nastavení modulu Spustit příkaz
+Name[da]=Indstilling af kør kommando-plugin
 Name[de]=Modul-Einstellungen für Befehlsausführung
 Name[en_GB]=Run Command plugin settings
 Name[es]=Ejecutar preferencias del complemento Orden
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index 45463b7..19886ae 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -9,6 +9,7 @@ Name=Notification synchronization plugin settings
 Name[ca]=Ajustament del connector Sincronitza les notificacions
 Name[ca at valencia]=Ajustament del connector Sincronitza les notificacions
 Name[cs]=Nastavení modulu synchronizace upozornění
+Name[da]=Indstilling af plugin til synkronisering af bekendtgørelser
 Name[de]=Einstellungen für Benachrichtigungsabgleich-Modul
 Name[en_GB]=Notification synchronisation plugin settings
 Name[es]=Preferencias del complemento de sincronización de notificaciones

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list