From 09996ea7f5d989d087579ee97cbf0af291fabb5a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 8 Oct 2019 08:56:49 +0200 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" --- kcms/translations/kcm_translations.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcms/translations/kcm_translations.desktop b/kcms/translations/kcm_translations.desktop index 3e65efa0a..c967bd02e 100644 --- a/kcms/translations/kcm_translations.desktop +++ b/kcms/translations/kcm_translations.desktop @@ -57,7 +57,7 @@ Comment[nn]=Endra språk for arbeidsflate og program Comment[pl]=Zmień język przestrzeni pracy i aplikacji Comment[pt]=Mudar as línguas da área de trabalho e da aplicação Comment[pt_BR]=Altera os idiomas do espaço de trabalho e aplicativos -Comment[ru]=Изменение языка интерфейса окружения рабочего стола и приложений +Comment[ru]=Изменение языка приложений и рабочего среды Comment[sk]=Zmeniť jazyky pracovného priestoru a aplikácií Comment[sv]=Ändra arbetsområde och programspråk Comment[uk]=Зміна мови перекладу робочого простору і програм