From 220e609d47a8286a78d88bb406fd33f017c30791 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 24 Aug 2019 05:01:51 +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" --- src/scripts/runaction/actions/w3.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index 2e0d343c0..b5874d54f 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -10,7 +10,7 @@ Name[es]=Validar página Name[fi]=Tarkista sivu Name[fr]=Valider la page Name[gl]=Validar a páxina -Name[id]=Validasi halaman +Name[id]=Absahkan halaman Name[it]=Convalida la pagina Name[ko]=페이지 검사 Name[lt]=Patikrinti puslapį