From c3b3a9505e1057b4a13503f20da97dc0d265cd90 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 1 Sep 2020 06:23:01 +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 bcf3a9ff..4f666f31 100755
--- a/org.kde.alligator.desktop
+++ b/org.kde.alligator.desktop
@@ -8,6 +8,7 @@ Name[et]=Alligator
 Name[eu]=Alligator
 Name[fr]=Alligator
 Name[hi]=एल्लिगेटर (Alligator)
+Name[ia]=Alligator
 Name[it]=Alligator
 Name[ko]=Alligator
 Name[nl]=Alligator
@@ -28,6 +29,7 @@ Comment[et]=Mobiili uudistelugeja
 Comment[eu]=Mugikorrerako web-jario irakurlea
 Comment[fr]=Lecteur nomade de fils d'actualité
 Comment[hi]=मोबाइल फ़ीड रीडर
+Comment[ia]=Lector de syndicationes Mobile
 Comment[it]=Lettore di fonti mobile
 Comment[ko]=모바일 피드 리더
 Comment[nl]=Mobiele feedlezer
@@ -47,6 +49,7 @@ GenericName[et]=Uudistelugeja
 GenericName[eu]=Web-jario irakurlea
 GenericName[fr]=Lecteur de fils d'actualité
 GenericName[hi]=फ़ीड रीडर
+GenericName[ia]=Lector de syndication
 GenericName[it]=Lettore di fonti
 GenericName[ko]=피드 리더
 GenericName[nl]=Feedlezer