From e6f8a391c967c8fad27e6b9267ea45693aee81b3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Jul 2019 05:32:47 +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" --- plugins/presenter/kdeconnect_presenter.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/presenter/kdeconnect_presenter.json b/plugins/presenter/kdeconnect_presenter.json index 34df83511..a90c3d1c9 100644 --- a/plugins/presenter/kdeconnect_presenter.json +++ b/plugins/presenter/kdeconnect_presenter.json @@ -51,6 +51,7 @@ "Name[es]": "Presentador", "Name[gl]": "Presentador", "Name[it]": "Presentatore", + "Name[ko]": "프레젠터", "Name[lt]": "Pristatytojas", "Name[nl]": "Presentator", "Name[nn]": "Presentatør",