[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:15 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=c4a499c
The following commit has been merged in the master branch:
commit c4a499ca0123a649a6eb896f8ba8f6c3ad1b48bb
Author: l10n daemon script <scripty at kde.org>
Date: Mon Oct 12 10:38:12 2015 +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/runcommand/kdeconnect_runcommand.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json
index c6269ed..c6f82c1 100644
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@@ -43,6 +43,7 @@
"Name[pt]": "Executar comandos",
"Name[pt_BR]": "Executar comandos",
"Name[ru]": "Выполнение команд",
+ "Name[sk]": "Spustiť príkazy",
"Name[sv]": "Kör kommandon",
"Name[tr]": "Komut çalıştır",
"Name[uk]": "Виконання команд",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list