From 9f3b817bdcb2677edea1a10d91ce2d4be29da3d1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 19 Mar 2020 05:51:04 +0100 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" --- kcmkwin/kwinoptions/kwinactions.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 3ac1eaa624..163a54c207 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -32,7 +32,7 @@ Name[pl]=Zachowanie okien Name[pt]=Acções das Janelas Name[pt_BR]=Ações da janela Name[ru]=Действия с окнами -Name[sk]=Akcie ok&na +Name[sk]=Akcie okna Name[sv]=Fönsteråtgärder Name[uk]=Дії з вікнами Name[x-test]=xxWindow Actionsxx