From 2aa1252abfbb6e4b99c1b3f443b4838c3d27fba8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 2 Jun 2020 05:22:31 +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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/org.kde.mobile.alligator.desktop b/org.kde.mobile.alligator.desktop
index f2e4bb82..39935392 100755
--- a/org.kde.mobile.alligator.desktop
+++ b/org.kde.mobile.alligator.desktop
@@ -2,11 +2,13 @@
 Name=Alligator
 Name[ca]=Alligator
 Name[ca@valencia]=Alligator
+Name[cs]=Alligator
 Name[et]=Alligator
 Name[fr]=Alligator
 Name[it]=Alligator
 Name[ko]=Alligator
 Name[nl]=Alligator
+Name[nn]=Alligator
 Name[pt]=Alligator
 Name[ru]=Alligator
 Name[sk]=Alligator
@@ -16,11 +18,13 @@ Name[x-test]=xxAlligatorxx
 Comment=Mobile Feed Reader
 Comment[ca]=Lector de fonts per a mòbil
 Comment[ca@valencia]=Lector de fonts per a mòbil
+Comment[cs]=Mobilní čtečka kanálů
 Comment[et]=Mobiili uudistelugeja
 Comment[fr]=Lecteur nomade de fils d'actualité
 Comment[it]=Lettore di fonti mobile
 Comment[ko]=모바일 피드 리더
 Comment[nl]=Mobiele feedlezer
+Comment[nn]=Mobil kjeldelesar
 Comment[pt]=Leitor Móvel de Fontes
 Comment[ru]=Чтение лент новостей для мобильных устройств
 Comment[sv]=Mobil kanalläsare
@@ -29,11 +33,13 @@ Comment[x-test]=xxMobile Feed Readerxx
 GenericName=Feed Reader
 GenericName[ca]=Lector de fonts
 GenericName[ca@valencia]=Lector de fonts
+GenericName[cs]=Čtečka kanálů
 GenericName[et]=Uudistelugeja
 GenericName[fr]=Lecteur de fils d'actualité
 GenericName[it]=Lettore di fonti
 GenericName[ko]=피드 리더
 GenericName[nl]=Feedlezer
+GenericName[nn]=Kjeldelesar
 GenericName[pt]=Leitor de Fontes
 GenericName[ru]=Чтение лент новостей
 GenericName[sk]=Čítačka RSS kanálov