From c4a499ca0123a649a6eb896f8ba8f6c3ad1b48bb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 12 Oct 2015 10:38:12 +0000 Subject: [PATCH] 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 c6269edf5..c6f82c135 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]": "Виконання команд",