[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=22358ef
The following commit has been merged in the master branch:
commit 22358ef3eb1f7b9864749dbbd883c6d553384cf8
Author: l10n daemon script <scripty at kde.org>
Date: Sun Oct 2 12:01:19 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 +
1 file changed, 1 insertion(+)
diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index 93ec8c2..1be08bf 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -32,6 +32,7 @@
"Name[ca]": "Ordres a la màquina remota",
"Name[nl]": "Commando's op afstand hosten",
"Name[pl]": "Wykonuj polecenia zdalne",
+ "Name[pt]": "Alojar os comandos remotos",
"Name[sk]": "Vzdialené príkazy hostiteľa",
"Name[sv]": "Fjärrkommandon för värddator",
"Name[uk]": "Віддалені команди вузлу",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list