From 9c506c5338b3dc38a9fff8d93e75982600960b42 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 28 Apr 2020 06:40:55 +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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.kde.mobile.alligator.desktop b/org.kde.mobile.alligator.desktop
index f2361bd4..95cf39e8 100755
--- a/org.kde.mobile.alligator.desktop
+++ b/org.kde.mobile.alligator.desktop
@@ -5,6 +5,7 @@ Name[et]=Alligator
 Name[ko]=Alligator
 Name[nl]=Alligator
 Name[pt]=Alligator
+Name[sk]=Alligator
 Name[sv]=Alligator
 Name[uk]=Alligator
 Name[x-test]=xxAlligatorxx
@@ -23,6 +24,7 @@ GenericName[et]=Uudistelugeja
 GenericName[ko]=피드 리더
 GenericName[nl]=Feedlezer
 GenericName[pt]=Leitor de Fontes
+GenericName[sk]=Čítačka RSS kanálov
 GenericName[sv]=Kanalläsare
 GenericName[uk]=Читання подач
 GenericName[x-test]=xxFeed Readerxx