From 2be7d7be1028fd2e4357f5dfad3c771037aa3698 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 13 Jun 2021 01:20:15 +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 8cb787d6..10b38b48 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -5,6 +5,7 @@ Name[ca]=Altai Name[cs]=Altai Name[de]=Altai Name[el]=Altai +Name[en_GB]=Altai Name[es]=Altai Name[fr]=Altai Name[ia]=Altai