From 6a4c6011d1a5002cdd39356e312d1e2b0bae5de2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 5 Jul 2021 01:18:52 +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 d7423765..8374b5d5 100644
--- a/org.kde.kasts.desktop
+++ b/org.kde.kasts.desktop
@@ -6,6 +6,7 @@ Name[ca]=Kasts
 Name[ca@valencia]=Kasts
 Name[cs]=Kasts
 Name[de]=Kasts
+Name[en_GB]=Kasts
 Name[es]=Kasts
 Name[fr]=Kasts
 Name[ko]=Kasts
@@ -23,6 +24,7 @@ Comment=Mobile Podcast Application
 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[en_GB]=Mobile Podcast Application
 Comment[es]=Aplicación de pódcast para móviles
 Comment[fr]=Application mobile pour podcasts
 Comment[ko]=모바일 팟캐스트 프로그램
@@ -40,6 +42,7 @@ GenericName=Podcast Application
 GenericName[ca]=Aplicació de podcast
 GenericName[ca@valencia]=Aplicació de podcast
 GenericName[de]=Podcast-Anwendung
+GenericName[en_GB]=Podcast Application
 GenericName[es]=Aplicación de pódcast
 GenericName[fr]=Application pour podcasts
 GenericName[ko]=팟캐스트 프로그램