From b8b71daed6b4680efecd99140355e72fd341ee35 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 22 Apr 2020 06:37:43 +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"
---
 effects/showpaint/showpaint_config.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/effects/showpaint/showpaint_config.desktop b/effects/showpaint/showpaint_config.desktop
index 2aa62f384e..55b28992b1 100644
--- a/effects/showpaint/showpaint_config.desktop
+++ b/effects/showpaint/showpaint_config.desktop
@@ -40,7 +40,7 @@ Name[ja]=描画領域を表示
 Name[kk]=Бояулау
 Name[km]=បង្ហាញគំនូរ
 Name[kn]=ಕೆಪೈಂಟ್ ತೋರಿಸು
-Name[ko]=그리기 영역 보이기
+Name[ko]=그리기 영역 표시
 Name[lt]=Piešimo rodymas
 Name[lv]=Rādīt zīmēto
 Name[mai]=पेंट देखाउ