From 86327a98d8b82ad7eac1b0605e91440ae834fed7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 8 May 2021 01:18:40 +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 | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop
index a0fdf229..5c54b162 100644
--- a/org.kde.kasts.desktop
+++ b/org.kde.kasts.desktop
@@ -1,7 +1,28 @@
 [Desktop Entry]
 Name=Kasts
+Name[ca]=Kasts
+Name[de]=Kasts
+Name[es]=Kasts
+Name[nl]=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[nl]=Podcastprogramma voor mobiel
+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[nl]=Podcastprogramma
+GenericName[sv]=Poddradioprogram
+GenericName[uk]=Програма для подкастів
+GenericName[x-test]=xxPodcast Applicationxx
 Icon=kasts
 Exec=kasts
 Type=Application