From 2df87821427c554933ea6cf160486bec19a6df68 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 11 Jun 2024 01:18:34 +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 b33acd08b..a181a9715 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -66,6 +66,7 @@ "Name[it]": "Fabian Arndt", "Name[ka]": "Fabian Arndt", "Name[nl]": "Fabian Arndt", + "Name[ro]": "Fabian Arndt", "Name[sl]": "Fabian Arndt", "Name[tr]": "Fabian Arndt", "Name[uk]": "Fabian Arndt",