From 92a0342cac8a3de89760aa60d42934a6f0ad4c7e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 12 Jun 2021 01:17:59 +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 ca2ffc8a..8cb787d6 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -7,6 +7,7 @@ Name[de]=Altai Name[el]=Altai Name[es]=Altai Name[fr]=Altai +Name[ia]=Altai Name[it]=Altai Name[ko]=알타이 Name[nl]=Altai