From 12180f8d998db29ef72762935ab2e84b57fc07c1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Jun 2022 01:51:58 +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" --- plugins/virtualmonitor/kdeconnect_virtualmonitor.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json index 5ce296022..f91bb0731 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -12,6 +12,7 @@ "Name[fr]": "Aleix Pol i Gonzalez", "Name[it]": "Aleix Pol i Gonzalez", "Name[nl]": "Aleix Pol i Gonzalez", + "Name[nn]": "Aleix Pol i Gonzalez", "Name[pl]": "Aleix Pol i Gonzalez", "Name[pt]": "Aleix Pol i Gonzalez", "Name[ro]": "Aleix Pol i Gonzalez",