From 9297e0efe4af4441722edc0225886bd566b32ca7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 9 Jun 2021 01:17:08 +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 5e18781b..ca2ffc8a 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -13,6 +13,7 @@ Name[nl]=Altai Name[pl]=Altai Name[pt]=Altai Name[pt_BR]=Altai +Name[ru]=Алтай Name[sk]=Altai Name[sl]=Altaj Name[sv]=Altai