From 3977aa7e411b2364acce8e7420c0278381e132a8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 25 Apr 2020 06:22:35 +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"
---
 org.kde.mobile.alligator.desktop | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/org.kde.mobile.alligator.desktop b/org.kde.mobile.alligator.desktop
index 7123559d..5577a220 100755
--- a/org.kde.mobile.alligator.desktop
+++ b/org.kde.mobile.alligator.desktop
@@ -2,6 +2,7 @@
 Name=Alligator
 Name[ca]=Alligator
 Name[et]=Alligator
+Name[ko]=Alligator
 Name[nl]=Alligator
 Name[pt]=Alligator
 Name[uk]=Alligator
@@ -9,6 +10,7 @@ Name[x-test]=xxAlligatorxx
 Comment=Mobile Feed Reader
 Comment[ca]=Lector de fonts per a mòbil
 Comment[et]=Mobiili uudistelugeja
+Comment[ko]=모바일 피드 리더
 Comment[nl]=Mobiele feedlezer
 Comment[pt]=Leitor Móvel de Fontes
 Comment[uk]=Програма для читання подач на мобільному
@@ -16,6 +18,7 @@ Comment[x-test]=xxMobile Feed Readerxx
 GenericName=Feed Reader
 GenericName[ca]=Lector de fonts
 GenericName[et]=Uudistelugeja
+GenericName[ko]=피드 리더
 GenericName[nl]=Feedlezer
 GenericName[pt]=Leitor de Fontes
 GenericName[uk]=Читання подач