From 0f3d60b678e55307bde51fb801e70aa2e011c61d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 Jun 2022 01:42:04 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json index c0727305c..4108dae4f 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -11,6 +11,7 @@ "Name[es]": "Aleix Pol i Gonzalez", "Name[it]": "Aleix Pol i Gonzalez", "Name[nl]": "Aleix Pol i Gonzalez", + "Name[ro]": "Aleix Pol i Gonzalez", "Name[sl]": "Aleix Pol i Gonzalez", "Name[sv]": "Aleix Pol i Gonzalez", "Name[tr]": "Aleix Pol i Gonzalez", @@ -26,6 +27,7 @@ "Description[es]": "Usar sus dispositivos como monitores virtuales", "Description[it]": "Usa i tuoi dispositivi come schermi virtuali", "Description[nl]": "Uw apparaten als virtuele monitoren gebruiken", + "Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale", "Description[sl]": "Uporabi vaše naprave kot navidezne monitorje", "Description[sv]": "Använd apparater som virtuella bildskärmar", "Description[tr]": "Aygıtlarınızı sanal ekranlar olarak kullanın", @@ -43,6 +45,7 @@ "Name[es]": "Monitor virtual", "Name[it]": "Schermo virtuale", "Name[nl]": "Virtuele monitor", + "Name[ro]": "Monitor virtual", "Name[sl]": "Navidezni monitor", "Name[sv]": "Virtuell bildskärm", "Name[tr]": "Sanal Ekran",