From 68368a129f0dff9d44c673e02e9f68a7f09e1078 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 12 Jan 2021 06:51:41 +0100
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 602b77a8..d8fae067 100755
--- a/org.kde.alligator.desktop
+++ b/org.kde.alligator.desktop
@@ -7,6 +7,7 @@ Name[en_GB]=Alligator
 Name[es]=Alligator
 Name[et]=Alligator
 Name[eu]=Alligator
+Name[fi]=Alligator
 Name[fr]=Alligator
 Name[hi]=एल्लिगेटर (Alligator)
 Name[hu]=Alligator
@@ -31,6 +32,7 @@ Comment[en_GB]=Mobile Feed Reader
 Comment[es]=Lector móvil de emisiones web
 Comment[et]=Mobiili uudistelugeja
 Comment[eu]=Mugikorrerako web-jario irakurlea
+Comment[fi]=Mobiilisyötelukija
 Comment[fr]=Lecteur nomade de fils d'actualité
 Comment[hi]=मोबाइल फ़ीड रीडर
 Comment[hu]=Mobil hírolvasó
@@ -54,6 +56,7 @@ GenericName[en_GB]=Feed Reader
 GenericName[es]=Lector de emisiones web
 GenericName[et]=Uudistelugeja
 GenericName[eu]=Web-jario irakurlea
+GenericName[fi]=Syötteenlukija
 GenericName[fr]=Lecteur de fils d'actualité
 GenericName[hi]=फ़ीड रीडर
 GenericName[hu]=Hírolvasó