From 772d284e83d3f76302312ef6166eada209dd468f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 23 Apr 2020 06:34:57 +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 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/org.kde.mobile.alligator.desktop b/org.kde.mobile.alligator.desktop
index ffd7b5e8..dc34a2e4 100755
--- a/org.kde.mobile.alligator.desktop
+++ b/org.kde.mobile.alligator.desktop
@@ -1,7 +1,22 @@
 [Desktop Entry]
 Name=Alligator
+Name[ca]=Alligator
+Name[et]=Alligator
+Name[nl]=Alligator
+Name[uk]=Alligator
+Name[x-test]=xxAlligatorxx
 Comment=Mobile Feed Reader
+Comment[ca]=Lector de fonts per a mòbil
+Comment[et]=Mobiili uudistelugeja
+Comment[nl]=Mobiele feedlezer
+Comment[uk]=Програма для читання подач на мобільному
+Comment[x-test]=xxMobile Feed Readerxx
 GenericName=Feed Reader
+GenericName[ca]=Lector de fonts
+GenericName[et]=Uudistelugeja
+GenericName[nl]=Feedlezer
+GenericName[uk]=Читання подач
+GenericName[x-test]=xxFeed Readerxx
 Encoding=UTF-8
 Icon=alligator
 Exec=alligator