From 81a9b824cf28af76bfc0fd0e1f27c026cfda0d91 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 9 Sep 2020 06:33:22 +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" --- effects/presentwindows/presentwindows_config.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/presentwindows/presentwindows_config.desktop b/effects/presentwindows/presentwindows_config.desktop index 4569d0c42e..a332492973 100644 --- a/effects/presentwindows/presentwindows_config.desktop +++ b/effects/presentwindows/presentwindows_config.desktop @@ -62,7 +62,7 @@ Name[pa]=ਮੌਜੂਦਾ ਵਿੰਡੋਜ਼ Name[pl]=Prezentacja okien Name[pt]=Apresentar as Janelas Name[pt_BR]=Apresentar janelas -Name[ro]=Ferestre prezente +Name[ro]=Prezintă ferestrele Name[ru]=Все окна Name[se]=Presentere lásiid Name[si]=පවතින කවුළුව