From 85a58ad4ea9973b13e83545a4df6e4e632594bc6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 10 Feb 2023 03:31:16 +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.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wallpapers/Next/metadata.json b/wallpapers/Next/metadata.json index b4ca935d..24846c51 100644 --- a/wallpapers/Next/metadata.json +++ b/wallpapers/Next/metadata.json @@ -14,6 +14,7 @@ "Name[it]": "Andy Betts", "Name[ka]": "ენდი ბეთსი", "Name[nl]": "Andy Betts", + "Name[nn]": "Andy Betts", "Name[pl]": "Andy Betts", "Name[pt_BR]": "Andy Betts", "Name[sl]": "Andy Betts", @@ -36,6 +37,7 @@ "Name[it]": "Montagna", "Name[ka]": "მთა", "Name[nl]": "Berg", + "Name[nn]": "Fjell", "Name[pl]": "Góra", "Name[pt_BR]": "Montanha", "Name[sl]": "Gora",