From 508f353104946b5990ee17f727f401267d3091fb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 9 May 2021 01:21:36 +0000
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.kasts.desktop | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop
index 5c54b162..408bd2ed 100644
--- a/org.kde.kasts.desktop
+++ b/org.kde.kasts.desktop
@@ -4,22 +4,25 @@ Name[ca]=Kasts
 Name[de]=Kasts
 Name[es]=Kasts
 Name[nl]=Kasts
+Name[pt]=Kasts
 Name[sv]=Kasts
 Name[uk]=Kasts
 Name[x-test]=xxKastsxx
 Comment=Mobile Podcast Application
 Comment[ca]=Aplicació mòbil per a podcast
-Comment[de]= Podcast-App für Mobilgeräte
-Comment[es]=Aplicación de podcast para móviles
+Comment[de]= Podcast-Anwendung für Mobilgeräte
+Comment[es]=Aplicación de pódcast para móviles
 Comment[nl]=Podcastprogramma voor mobiel
+Comment[pt]=Aplicação Móvel de 'Podcasts'
 Comment[sv]=Mobilt poddradioprogram
 Comment[uk]=Мобільна програма для подкастів
 Comment[x-test]=xxMobile Podcast Applicationxx
 GenericName=Podcast Application
 GenericName[ca]=Aplicació de podcast
-GenericName[de]=Podcast-App
-GenericName[es]=Aplicación de podcast
+GenericName[de]=Podcast-Anwendung
+GenericName[es]=Aplicación de pódcast
 GenericName[nl]=Podcastprogramma
+GenericName[pt]=Aplicação de 'Podcasts'
 GenericName[sv]=Poddradioprogram
 GenericName[uk]=Програма для подкастів
 GenericName[x-test]=xxPodcast Applicationxx