From b1dc8060710a019dcb114f564461758801cda8ac Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 26 Nov 2023 03:49:33 +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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop
index c13894ae..989ca02c 100644
--- a/org.kde.kasts.desktop
+++ b/org.kde.kasts.desktop
@@ -113,7 +113,7 @@ Keywords[sv]=poddsändning
 Keywords[tr]=pod yayını
 Keywords[uk]=трансляція
 Keywords[x-test]=xxpodcastxx
-Keywords[zh_CN]=播客
+Keywords[zh_CN]=podcast;播客;boke
 Icon=kasts
 Exec=kasts
 Type=Application