From f0605b8168af98c3eee0403add0153fce945443e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 May 2023 04:37:25 +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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop index a019e0e6..590291df 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -47,7 +47,7 @@ Comment[ru]=Мобильное приложение для подкастов Comment[sk]=Mobilná aplikácia na podcasty Comment[sl]=Aplikacija mobilnih podcastov Comment[sv]=Mobilt poddradioprogram -Comment[tr]=Taşınabilir Podcast Uygulaması +Comment[tr]=Taşınabilir Pod Yayını Uygulaması Comment[uk]=Мобільна програма для подкастів Comment[x-test]=xxMobile Podcast Applicationxx Comment[zh_CN]=移动设备播客应用程序 @@ -72,7 +72,7 @@ GenericName[ru]=Приложение для подкастов GenericName[sk]=Aplikácia na podcasty GenericName[sl]=Aplikacija podcastov GenericName[sv]=Poddradioprogram -GenericName[tr]=Podcast Uygulaması +GenericName[tr]=Pod Yayını Uygulaması GenericName[uk]=Програма для подкастів GenericName[x-test]=xxPodcast Applicationxx GenericName[zh_CN]=播客应用程序 @@ -94,7 +94,7 @@ Keywords[pt]=podcast Keywords[ru]=podcast;подкаст Keywords[sl]=podcast Keywords[sv]=poddsändning -Keywords[tr]=podcast +Keywords[tr]=pod yayını Keywords[uk]=трансляція Keywords[x-test]=xxpodcastxx Keywords[zh_CN]=播客