From 58cc20958225b35469e069bd2a76bcf97b8228c8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Jul 2022 01:55:31 +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 7b0402c31..bb0633933 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -9,6 +9,7 @@ "Name[bg]": "Aleix Pol i Gonzalez", "Name[ca@valencia]": "Aleix Pol i Gonzalez", "Name[ca]": "Aleix Pol i Gonzalez", + "Name[de]": "Aleix Pol i Gonzalez", "Name[es]": "Aleix Pol i Gonzalez", "Name[fr]": "Aleix Pol i Gonzalez", "Name[it]": "Aleix Pol i Gonzalez",