From 26eb57c53e45b741bd1cb42081b5f7e27e8d982c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Apr 2020 06:27:52 +0200 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" --- .../plasma-containmentactions-test.desktop | 2 +- .../python/plasma-scriptengine-dataengine-python.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop index 00310121e..30cbf23c4 100644 --- a/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop +++ b/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop @@ -66,7 +66,7 @@ Comment[hu]=Üres bővítmény tesztelésre Comment[ia]=Un plugin vacue pro essayar Comment[id]=Sebuah plugin dumi untuk pengujian Comment[it]=Un'estensione finta di prova -Comment[ko]=테스트를 위한 뼈대 플러그인 +Comment[ko]=테스트용 뼈대 플러그인 Comment[lt]=Netikras papildinys testavimui Comment[mr]=चाचणीसाठी नकली प्लगइन Comment[nb]=Et attrapp-programtillegg for testing diff --git a/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop b/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop index 442a7f5d7..9afeb5a15 100644 --- a/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop +++ b/src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop @@ -62,7 +62,7 @@ Comment[hu]=Plazma adatmotor támogatás Pythonhoz Comment[ia]=Supporto de moptor de datos de Plasma per Python Comment[id]=Dukungan mesin data Plasma untuk Python Comment[it]=Supporto per Python del motore di dati di Plasma -Comment[ko]=파이썬을 위한 Plasma 데이터 엔진 지원 +Comment[ko]=Python용 Plasma 데이터 엔진 지원 Comment[lt]=Plasma duomenų variklio palaikymas Python kalbai Comment[lv]=Plasma datu dzinēja atbalsts priekš Python Comment[nb]=Plasma datamotor-støtte for Python