From 06a640b49fe4faf470cb09757e3d7537479511db Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 16 Feb 2020 05:57:40 +0100
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"
---
 runners/services/plasma-runner-services.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runners/services/plasma-runner-services.desktop b/runners/services/plasma-runner-services.desktop
index 8d837b67a..179c611ff 100644
--- a/runners/services/plasma-runner-services.desktop
+++ b/runners/services/plasma-runner-services.desktop
@@ -46,7 +46,7 @@ Name[ka]=პროგრამები
 Name[kk]=Қолданбалар
 Name[km]=កម្មវិធី
 Name[kn]=ಅನ್ವಯಗಳು
-Name[ko]=응용 프로그램
+Name[ko]=프로그램
 Name[ku]=Sepan
 Name[lt]=Programos
 Name[lv]=Programmas