From 91a6cc652e5b566779b4d84cb8ec756c82b3e138 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 8 Sep 2021 01:29:28 +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 685f2ca0..226252e7 100644
--- a/org.kde.kasts.desktop
+++ b/org.kde.kasts.desktop
@@ -21,6 +21,7 @@ Name[sl]=Kasts
 Name[sv]=Kasts
 Name[uk]=Kasts
 Name[x-test]=xxKastsxx
+Name[zh_CN]=Kasts
 Comment=Mobile Podcast Application
 Comment[ca]=Aplicació mòbil per a podcast
 Comment[ca@valencia]=Aplicació mòbil per a podcast
@@ -40,6 +41,7 @@ Comment[sl]=Aplikacija mobilnih podcastov
 Comment[sv]=Mobilt poddradioprogram
 Comment[uk]=Мобільна програма для подкастів
 Comment[x-test]=xxMobile Podcast Applicationxx
+Comment[zh_CN]=移动播客应用程序
 GenericName=Podcast Application
 GenericName[ca]=Aplicació de podcast
 GenericName[ca@valencia]=Aplicació de podcast
@@ -59,6 +61,7 @@ GenericName[sl]=Aplikacija podcastov
 GenericName[sv]=Poddradioprogram
 GenericName[uk]=Програма для подкастів
 GenericName[x-test]=xxPodcast Applicationxx
+GenericName[zh_CN]=播客应用程序
 Icon=kasts
 Exec=kasts
 Type=Application