From 311bef5725ca5161be605c8b057fb90f610a2df8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 18 Dec 2023 02:29:51 +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 b14da5f7..04daa948 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -31,6 +31,7 @@ Name[tr]=Kastlar Name[uk]=Kasts Name[x-test]=xxKastsxx Name[zh_CN]=Kasts +Name[zh_TW]=Kasts Comment=Mobile Podcast Application Comment[ar]=تطبيق مدونات صوتية للهاتف Comment[ca]=Aplicació mòbil per a pòdcast @@ -60,6 +61,7 @@ Comment[tr]=Taşınabilir Pod Yayını Uygulaması Comment[uk]=Мобільна програма для подкастів Comment[x-test]=xxMobile Podcast Applicationxx Comment[zh_CN]=移动设备播客应用程序 +Comment[zh_TW]=行動版 Podcast 應用程式 GenericName=Podcast Application GenericName[ar]=تطبيق مدونات صوتية GenericName[ca]=Aplicació de pòdcast @@ -89,6 +91,7 @@ GenericName[tr]=Pod Yayını Uygulaması GenericName[uk]=Програма для подкастів GenericName[x-test]=xxPodcast Applicationxx GenericName[zh_CN]=播客应用程序 +GenericName[zh_TW]=Podcast 應用程式 Keywords=podcast Keywords[ar]=مدونة صوتية Keywords[ca]=pòdcast @@ -116,6 +119,7 @@ Keywords[tr]=pod yayını Keywords[uk]=трансляція Keywords[x-test]=xxpodcastxx Keywords[zh_CN]=podcast;播客;boke +Keywords[zh_TW]=podcast Icon=kasts Exec=kasts Type=Application