From 159688035a9ad1eb664831d074f6e2b65393f6a5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 22 Jun 2021 01:20:30 +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 93b14628..d7423765 100644
--- a/org.kde.kasts.desktop
+++ b/org.kde.kasts.desktop
@@ -10,6 +10,7 @@ Name[es]=Kasts
 Name[fr]=Kasts
 Name[ko]=Kasts
 Name[nl]=Kasts
+Name[pa]=ਕਾਸਟਸ
 Name[pl]=Kasts
 Name[pt]=Kasts
 Name[pt_BR]=Kasts
@@ -26,6 +27,7 @@ Comment[es]=Aplicación de pódcast para móviles
 Comment[fr]=Application mobile pour podcasts
 Comment[ko]=모바일 팟캐스트 프로그램
 Comment[nl]=Podcastprogramma voor mobiel
+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
@@ -42,6 +44,7 @@ GenericName[es]=Aplicación de pódcast
 GenericName[fr]=Application pour podcasts
 GenericName[ko]=팟캐스트 프로그램
 GenericName[nl]=Podcastprogramma
+GenericName[pa]=ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
 GenericName[pl]=Aplikacja do podkastów
 GenericName[pt]=Aplicação de 'Podcasts'
 GenericName[pt_BR]=Aplicativo de podcast