From c24eef7fe5f6e6347c5cd69f3343e91edd628ca8 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 1 Feb 2021 06:46:21 +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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/org.kde.alligator.desktop b/org.kde.alligator.desktop
index efbd5a83..80ffc4ff 100755
--- a/org.kde.alligator.desktop
+++ b/org.kde.alligator.desktop
@@ -16,6 +16,8 @@ Name[it]=Alligator
 Name[ko]=Alligator
 Name[nl]=Alligator
 Name[nn]=Alligator
+Name[pa]=ਐਲੀਗੇਟਰ
+Name[pl]=Alligator
 Name[pt]=Alligator
 Name[pt_BR]=Alligator
 Name[ru]=Alligator
@@ -42,6 +44,8 @@ Comment[it]=Lettore di fonti mobile
 Comment[ko]=모바일 피드 리더
 Comment[nl]=Mobiele feedlezer
 Comment[nn]=Mobil kjeldelesar
+Comment[pa]=ਮੋਬਾਈਲ ਫੀਡ ਰੀਡਰ
+Comment[pl]=Przenośny czytnik kanałów
 Comment[pt]=Leitor Móvel de Fontes
 Comment[pt_BR]=Leitor de fonte de notícias móvel
 Comment[ru]=Чтение лент новостей для мобильных устройств
@@ -67,6 +71,8 @@ GenericName[it]=Lettore di fonti
 GenericName[ko]=피드 리더
 GenericName[nl]=Feedlezer
 GenericName[nn]=Kjeldelesar
+GenericName[pa]=ਫੀਡ ਰੀਡਰ
+GenericName[pl]=Czytnik kanałów
 GenericName[pt]=Leitor de Fontes
 GenericName[pt_BR]=Leitor de fontes de notícias
 GenericName[ru]=Чтение лент новостей