From 3ed6f04ad253b0e889da098d07aa19fbfcf58c9e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 5 Apr 2020 06:14:04 +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"
---
 klipper/klipperrc.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop
index 42726a596..4725c8906 100644
--- a/klipper/klipperrc.desktop
+++ b/klipper/klipperrc.desktop
@@ -145,7 +145,7 @@ Description[ja]=Gwenview を起動(&G)
 Description[kk]=&Gwenview-ді жегу
 Description[km]=បើក​ដំណើរការ Gwenview
 Description[kn]=ಗ್ವೆನ್ ವ್ಯೂ &ವನ್ನು ಪ್ರಕ್ಷೇಪಿಸು
-Description[ko]=Gwenview 실행(&V)
+Description[ko]=Gwenview 실행(&G)
 Description[ku]=Dest bi &Gwenview bike
 Description[lt]=Paleisti &Gwenview
 Description[lv]=Palaist &Gwenview