[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 18:27:05 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=7734ac2
The following commit has been merged in the master branch:
commit 7734ac25d220fb5937bc0d857ac617cb98c8178f
Author: l10n daemon script <scripty at kde.org>
Date: Fri Sep 30 12:08:02 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 | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index a806e84..1f0171d 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -29,6 +29,11 @@
"Id": "kdeconnect_remotecommands",
"License": "GPL",
"Name": "Host remote commands",
+ "Name[ca]": "Ordres a la màquina remota",
+ "Name[nl]": "Commando's op afstand hosten",
+ "Name[sv]": "Fjärrkommandon för värddator",
+ "Name[uk]": "Віддалені команди вузлу",
+ "Name[x-test]": "xxHost remote commandsxx",
"ServiceTypes": [
"KdeConnect/Plugin"
],
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list