[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 18:27:06 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=cee1f7f
The following commit has been merged in the master branch:
commit cee1f7f144150c8a9bbd7f5a07ec9f506c2073ec
Author: l10n daemon script <scripty at kde.org>
Date: Wed Oct 5 11:58:34 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 45bb586..1157ba3 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -31,6 +31,7 @@
"Name": "Host remote commands",
"Name[ca at valencia]": "Ordes a la màquina remota",
"Name[ca]": "Ordres a la màquina remota",
+ "Name[es]": "Órdenes en servidor remoto",
"Name[nl]": "Commando's op afstand hosten",
"Name[pl]": "Wykonuj polecenia zdalne",
"Name[pt]": "Alojar os comandos remotos",
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index ade1bae..866255e 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -13,6 +13,7 @@
"Description[ca]": "Mostra les notificacions de les trucades i els SMS",
"Description[da]": "Vis bekendtgørelser for opkald og SMS'er",
"Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
+ "Description[es]": "Mostrar notificaciones de llamadas y SMS",
"Description[nl]": "Meldingen tonen van oproepen en SMSjes",
"Description[pl]": "Powiadamiaj o dzwonieniu i esemesach",
"Description[pt]": "Mostrar notificações para as chamadas e SMS",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list