From ee303f76b1a1812bcdb9d0032382b1f0679e3eff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 18 Jun 2024 01:20:08 +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 a84cd2032..3821f60fa 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -68,6 +68,7 @@ "Name[nl]": "Fabian Arndt", "Name[ro]": "Fabian Arndt", "Name[sl]": "Fabian Arndt", + "Name[sv]": "Fabian Arndt", "Name[tr]": "Fabian Arndt", "Name[uk]": "Fabian Arndt", "Name[x-test]": "xxFabian Arndtxx",