From 273d652aaa0ca72a1f87638fc6161acd4888d522 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 8 May 2020 06:22:34 +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.mobile.alligator.desktop | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/org.kde.mobile.alligator.desktop b/org.kde.mobile.alligator.desktop
index ac16d390..7a905c48 100755
--- a/org.kde.mobile.alligator.desktop
+++ b/org.kde.mobile.alligator.desktop
@@ -3,6 +3,7 @@ Name=Alligator
 Name[ca]=Alligator
 Name[ca@valencia]=Alligator
 Name[et]=Alligator
+Name[fr]=Alligator
 Name[ko]=Alligator
 Name[nl]=Alligator
 Name[pt]=Alligator
@@ -15,6 +16,7 @@ Comment=Mobile Feed Reader
 Comment[ca]=Lector de fonts per a mòbil
 Comment[ca@valencia]=Lector de fonts per a mòbil
 Comment[et]=Mobiili uudistelugeja
+Comment[fr]=Lecteur nomade de fils d'actualité
 Comment[ko]=모바일 피드 리더
 Comment[nl]=Mobiele feedlezer
 Comment[pt]=Leitor Móvel de Fontes
@@ -26,6 +28,7 @@ GenericName=Feed Reader
 GenericName[ca]=Lector de fonts
 GenericName[ca@valencia]=Lector de fonts
 GenericName[et]=Uudistelugeja
+GenericName[fr]=Lecteur de fils d'actualité
 GenericName[ko]=피드 리더
 GenericName[nl]=Feedlezer
 GenericName[pt]=Leitor de Fontes