[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 18:27:07 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=1ace12c
The following commit has been merged in the master branch:
commit 1ace12ce5734c9279cf467f01d4459e12e544fdf
Author: l10n daemon script <scripty at kde.org>
Date: Sat Oct 15 09:58:56 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/remotecommands/kdeconnect_remotecommands.json | 1 +
plugins/telephony/kdeconnect_telephony.json | 1 +
2 files changed, 2 insertions(+)
diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index 1942ab1..ad2dbe5 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -35,6 +35,7 @@
"Name": "Host remote commands",
"Name[ca at valencia]": "Allotja ordes remotes",
"Name[ca]": "Allotja ordres remotes",
+ "Name[da]": "Vært for eksterne kommandoer",
"Name[es]": "Órdenes en servidor remoto",
"Name[it]": "Comandi remoti host",
"Name[nl]": "Host voor commando's op afstand",
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index 1919141..e2f252f 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -11,6 +11,7 @@
"Description": "Show notifications for calls and SMS",
"Description[ca at valencia]": "Mostra les notificacions de les trucades i els SMS",
"Description[ca]": "Mostra les notificacions de les trucades i els SMS",
+ "Description[da]": "Vis bekendtgørelser for opkald og sms",
"Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
"Description[es]": "Mostrar notificaciones de llamadas y SMS",
"Description[it]": "Mostra notifiche per le chiamate e per gli SMS",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list