From 5d8865a8f19824625847b14c1fd49c45df5b34f6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 18 Jun 2020 05:46:40 +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.alligator.desktop | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/org.kde.alligator.desktop b/org.kde.alligator.desktop
index 8f9bdd22..efa2c1fe 100755
--- a/org.kde.alligator.desktop
+++ b/org.kde.alligator.desktop
@@ -16,6 +16,7 @@ Name[sk]=Alligator
 Name[sl]=Alligator
 Name[sv]=Alligator
 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
@@ -31,6 +32,7 @@ Comment[ru]=Чтение лент новостей для мобильных у
 Comment[sl]=Mobilni bralnik novic
 Comment[sv]=Mobil kanalläsare
 Comment[uk]=Програма для читання подач на мобільному
+Comment[x-test]=xxMobile Feed Readerxx
 GenericName=Feed Reader
 GenericName[ca]=Lector de fonts
 GenericName[ca@valencia]=Lector de fonts
@@ -47,6 +49,7 @@ GenericName[sk]=Čítačka RSS kanálov
 GenericName[sl]=Bralnik novic
 GenericName[sv]=Kanalläsare
 GenericName[uk]=Читання подач
+GenericName[x-test]=xxFeed Readerxx
 Encoding=UTF-8
 Icon=alligator
 Exec=alligator