From b8e44cae1f8a65ee0a7b599962423ec37d7ae5a0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 7 Jan 2023 02:07:46 +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" --- shell/metadata.json | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/metadata.json b/shell/metadata.json index 2a49ad1f..bf8b1e63 100644 --- a/shell/metadata.json +++ b/shell/metadata.json @@ -50,6 +50,7 @@ "Name[eu]": "Plasma Mugikorra", "Name[ka]": "Plasma Mobile", "Name[nl]": "Plasma Mobile", + "Name[nn]": "Plasma Mobile", "Name[pt]": "Plasma Mobile", "Name[sl]": "Plasma Mobile", "Name[tr]": "Plasma Mobile",