From 29d9cec5ce101cc9e10f121d6bfc0e97f0a2977c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 28 Sep 2020 06:13:07 +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 68ee3545..5f9ba1b9 100755
--- a/org.kde.alligator.desktop
+++ b/org.kde.alligator.desktop
@@ -3,6 +3,7 @@ Name=Alligator
 Name[ca]=Alligator
 Name[ca@valencia]=Alligator
 Name[cs]=Alligator
+Name[en_GB]=Alligator
 Name[es]=Alligator
 Name[et]=Alligator
 Name[eu]=Alligator
@@ -25,6 +26,7 @@ Comment=Mobile Feed Reader
 Comment[ca]=Lector de fonts per al mòbil
 Comment[ca@valencia]=Lector de fonts per al mòbil
 Comment[cs]=Mobilní čtečka kanálů
+Comment[en_GB]=Mobile Feed Reader
 Comment[es]=Lector móvil de emisiones web
 Comment[et]=Mobiili uudistelugeja
 Comment[eu]=Mugikorrerako web-jario irakurlea
@@ -46,6 +48,7 @@ GenericName=Feed Reader
 GenericName[ca]=Lector de fonts
 GenericName[ca@valencia]=Lector de fonts
 GenericName[cs]=Čtečka kanálů
+GenericName[en_GB]=Feed Reader
 GenericName[es]=Lector de emisiones web
 GenericName[et]=Uudistelugeja
 GenericName[eu]=Web-jario irakurlea