From a8a9a5d7e59d93c9272146ddad075185f8f6bd4e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 16 Jun 2022 01:51:51 +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" --- src/scripts/runaction/actions/translate.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index f1295f0b6..c539cf395 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -2,7 +2,7 @@ Name=Translate page Name[az]=Səhifənin tərcümə etmək Name[ca]=Tradueix la pàgina -Name[ca@valencia]=Tradueix la pàgina +Name[ca@valencia]=Traduïx la pàgina Name[cs]=Přeložit stránku Name[da]=Oversæt side Name[de]=Seite übersetzen