From a2a9bb83018a587f096f14626b54a46a47c833a0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Apr 2020 06:23:31 +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" --- src/plugins/dummy/pmdummybackendplugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json index 50ecd22..5c5e5b4 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -54,7 +54,7 @@ "Description[gl]": "Unha infraestrutura de probas para o xestor de particións de KDE.", "Description[id]": "Sebuah backend dumi Pengelola Partisi KDE untuk tujuan pengujian.", "Description[it]": "Un motore fittizio del gestore delle partizioni di KDE per scopi di prova.", - "Description[ko]": "테스트를 위한 KDE 파티션 관리자 더미 백엔드입니다.", + "Description[ko]": "테스트용 KDE 파티션 관리자 더미 백엔드입니다.", "Description[lt]": "KDE skaidinių tvarkyklės netikra galinė sąsaja skirta testavimui.", "Description[nl]": "Dummy backend van KDE-partitiebeheerder voor testdoeleinden", "Description[nn]": "Ein eksempelbakgrunnsmotor for KDE-partisjonshandtering, for testformål.",