From 280c0fb27f0401482aee833dbe88682f4ed9886f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 14 Jul 2022 01:49:45 +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 bed20363a..43933eb0b 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -15,6 +15,7 @@ "Name[fi]": "Aleix Pol i Gonzalez", "Name[fr]": "Aleix Pol i Gonzalez", "Name[it]": "Aleix Pol i Gonzalez", + "Name[ko]": "Aleix Pol i Gonzalez", "Name[nl]": "Aleix Pol i Gonzalez", "Name[nn]": "Aleix Pol i Gonzalez", "Name[pl]": "Aleix Pol i Gonzalez", @@ -39,6 +40,7 @@ "Description[fr]": "Utilisez vos périphériques comme des écrans virtuels", "Description[id]": "Gunakan perangkatmu sebagai monitor virtual", "Description[it]": "Usa i tuoi dispositivi come schermi virtuali", + "Description[ko]": "내 장치를 가상 모니터로 사용", "Description[nl]": "Uw apparaten als virtuele monitoren gebruiken", "Description[nn]": "Bruk einingane som virtuelle avlyttarar", "Description[pl]": "Użyj swojego urządzenia jako wyświetlacza wirtualnego", @@ -65,6 +67,7 @@ "Name[fr]": "Écran virtuel", "Name[id]": "Monitor Virtual", "Name[it]": "Schermo virtuale", + "Name[ko]": "가상 모니터", "Name[nl]": "Virtuele monitor", "Name[nn]": "Virtuell avlyttar", "Name[pl]": "Wyświetlacz wirtualny",