From dd6a89903b97ae025264bf372e2a73ead9231e9b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 3 Jun 2021 01:25:55 +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" --- wallpapers/Next/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index ef221ac2..ff70febf 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -10,6 +10,7 @@ Name[ko]=알타이 Name[nl]=Altai Name[pl]=Altai Name[pt]=Altai +Name[pt_BR]=Altai Name[sk]=Altai Name[sl]=Altaj Name[sv]=Altai