From f794ebd89970750f90583dd3985681335945d70b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 11 May 2021 01:18:58 +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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop
index 8f6f5389..cb948e89 100644
--- a/org.kde.kasts.desktop
+++ b/org.kde.kasts.desktop
@@ -7,6 +7,7 @@ Name[es]=Kasts
 Name[nl]=Kasts
 Name[pl]=Kasts
 Name[pt]=Kasts
+Name[sl]=Kasts
 Name[sv]=Kasts
 Name[uk]=Kasts
 Name[x-test]=xxKastsxx
@@ -18,6 +19,7 @@ Comment[es]=Aplicación de pódcast para móviles
 Comment[nl]=Podcastprogramma voor mobiel
 Comment[pl]=Przenośna aplikacja do podkastów
 Comment[pt]=Aplicação Móvel de 'Podcasts'
+Comment[sl]=Aplikacija mobilnih podcastov
 Comment[sv]=Mobilt poddradioprogram
 Comment[uk]=Мобільна програма для подкастів
 Comment[x-test]=xxMobile Podcast Applicationxx
@@ -29,6 +31,7 @@ GenericName[es]=Aplicación de pódcast
 GenericName[nl]=Podcastprogramma
 GenericName[pl]=Aplikacja do podkastów
 GenericName[pt]=Aplicação de 'Podcasts'
+GenericName[sl]=Aplikacija podcastov
 GenericName[sv]=Poddradioprogram
 GenericName[uk]=Програма для подкастів
 GenericName[x-test]=xxPodcast Applicationxx