From b7ea4a358c351771a916a5cefada8182a1b3c163 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 22 Nov 2023 03:00:32 +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 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop
index 8795aea8..c13894ae 100644
--- a/org.kde.kasts.desktop
+++ b/org.kde.kasts.desktop
@@ -22,6 +22,7 @@ Name[pa]=ਕਾਸਟਸ
 Name[pl]=Kasts
 Name[pt]=Kasts
 Name[pt_BR]=Kasts
+Name[ru]=Kasts
 Name[sk]=Kasts
 Name[sl]=Kasts
 Name[sv]=Kasts
@@ -50,6 +51,7 @@ Comment[pa]=ਮੋਬਾਈਲ ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
 Comment[pl]=Przenośna aplikacja do podkastów
 Comment[pt]=Aplicação Móvel de 'Podcasts'
 Comment[pt_BR]=Aplicativo de podcast móvel
+Comment[ru]=Мобильное приложение для прослушивания подкастов
 Comment[sk]=Mobilná aplikácia na podcasty
 Comment[sl]=Aplikacija mobilnih podcastov
 Comment[sv]=Mobilt poddradioprogram
@@ -78,6 +80,7 @@ GenericName[pa]=ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
 GenericName[pl]=Aplikacja do podkastów
 GenericName[pt]=Aplicação de 'Podcasts'
 GenericName[pt_BR]=Aplicativo de podcast
+GenericName[ru]=Приложение для прослушивания подкастов
 GenericName[sk]=Aplikácia na podcasty
 GenericName[sl]=Aplikacija podcastov
 GenericName[sv]=Poddradioprogram
@@ -104,6 +107,7 @@ Keywords[ko]=팟캐스트
 Keywords[nl]=podcast
 Keywords[pl]=podkast
 Keywords[pt]=podcast
+Keywords[ru]=подкаст
 Keywords[sl]=podcast
 Keywords[sv]=poddsändning
 Keywords[tr]=pod yayını