From add3c78df2487294bb4065c7152e2082ec670452 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Mar 2024 01:14:57 +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 200a8cf0..a97835dd 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -57,7 +57,7 @@ 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[sl]=Program za spremljanje spletnih oddaj Comment[sv]=Mobilt poddradioprogram Comment[tr]=Taşınabilir Pod Yayını Uygulaması Comment[uk]=Мобільна програма для подкастів @@ -88,7 +88,7 @@ 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[sl]=Program za spletne oddaje GenericName[sv]=Poddradioprogram GenericName[tr]=Pod Yayını Uygulaması GenericName[uk]=Програма для подкастів @@ -117,7 +117,7 @@ Keywords[pl]=podkast Keywords[pt]=podcast Keywords[ru]=подкаст Keywords[sk]=podcast -Keywords[sl]=podcast +Keywords[sl]=podcast;podkast;spletna oddaja;oddaja;spletnaoddaja Keywords[sv]=poddsändning Keywords[tr]=pod yayını Keywords[uk]=трансляція