From 065a23e3860d2647c3a9617e5c73b45b44524a2a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 10 Jun 2024 01:17:37 +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 4d2728f4b..b33acd08b 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -58,6 +58,7 @@ "Name[cs]": "Fabian Arndt", "Name[en_GB]": "Fabian Arndt", "Name[eo]": "Fabian Arndt", + "Name[es]": "Fabian Arndt", "Name[fr]": "Fabian Arndt", "Name[he]": "פביאן ארנדט", "Name[hu]": "Fabian Arndt",