From 6dc1ef11e2f1712f865ab8b1190aa367894ef633 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 30 Jul 2020 05:56:43 +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 64e5a969..a5477175 100755
--- a/org.kde.alligator.desktop
+++ b/org.kde.alligator.desktop
@@ -5,6 +5,7 @@ Name[ca@valencia]=Alligator
 Name[cs]=Alligator
 Name[es]=Alligator
 Name[et]=Alligator
+Name[eu]=Alligator
 Name[fr]=Alligator
 Name[it]=Alligator
 Name[ko]=Alligator
@@ -23,6 +24,7 @@ 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[et]=Mobiili uudistelugeja
+Comment[eu]=Mugikorrerako web-jario irakurlea
 Comment[fr]=Lecteur nomade de fils d'actualité
 Comment[it]=Lettore di fonti mobile
 Comment[ko]=모바일 피드 리더
@@ -40,6 +42,7 @@ GenericName[ca]=Lector de fonts
 GenericName[ca@valencia]=Lector de fonts
 GenericName[cs]=Čtečka kanálů
 GenericName[et]=Uudistelugeja
+GenericName[eu]=Web-jario irakurlea
 GenericName[fr]=Lecteur de fils d'actualité
 GenericName[it]=Lettore di fonti
 GenericName[ko]=피드 리더