From 0c13326ab10035da98f849d271348887221cf7e6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 15 May 2021 01:20:25 +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 c1c65a11..85d93cc3 100644
--- a/org.kde.kasts.desktop
+++ b/org.kde.kasts.desktop
@@ -5,6 +5,7 @@ Name[ca@valencia]=Kasts
 Name[cs]=Kasts
 Name[de]=Kasts
 Name[es]=Kasts
+Name[fr]=Kasts
 Name[nl]=Kasts
 Name[pl]=Kasts
 Name[pt]=Kasts
@@ -17,6 +18,7 @@ Comment[ca]=Aplicació mòbil per a podcast
 Comment[ca@valencia]=Aplicació mòbil per a podcast
 Comment[de]= Podcast-Anwendung für Mobilgeräte
 Comment[es]=Aplicación de pódcast para móviles
+Comment[fr]=Application mobile pour podcasts
 Comment[nl]=Podcastprogramma voor mobiel
 Comment[pl]=Przenośna aplikacja do podkastów
 Comment[pt]=Aplicação Móvel de 'Podcasts'
@@ -29,6 +31,7 @@ GenericName[ca]=Aplicació de podcast
 GenericName[ca@valencia]=Aplicació de podcast
 GenericName[de]=Podcast-Anwendung
 GenericName[es]=Aplicación de pódcast
+GenericName[fr]=Application pour podcasts
 GenericName[nl]=Podcastprogramma
 GenericName[pl]=Aplikacja do podkastów
 GenericName[pt]=Aplicação de 'Podcasts'