From 4289170c0cee2d6b4762cd24d976c6e296eb5988 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 4 May 2020 06:04:09 +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 3a5a7f3b..ac16d390 100755
--- a/org.kde.mobile.alligator.desktop
+++ b/org.kde.mobile.alligator.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Alligator
 Name[ca]=Alligator
+Name[ca@valencia]=Alligator
 Name[et]=Alligator
 Name[ko]=Alligator
 Name[nl]=Alligator
@@ -12,6 +13,7 @@ Name[uk]=Alligator
 Name[x-test]=xxAlligatorxx
 Comment=Mobile Feed Reader
 Comment[ca]=Lector de fonts per a mòbil
+Comment[ca@valencia]=Lector de fonts per a mòbil
 Comment[et]=Mobiili uudistelugeja
 Comment[ko]=모바일 피드 리더
 Comment[nl]=Mobiele feedlezer
@@ -22,6 +24,7 @@ Comment[uk]=Програма для читання подач на мобіль
 Comment[x-test]=xxMobile Feed Readerxx
 GenericName=Feed Reader
 GenericName[ca]=Lector de fonts
+GenericName[ca@valencia]=Lector de fonts
 GenericName[et]=Uudistelugeja
 GenericName[ko]=피드 리더
 GenericName[nl]=Feedlezer