From 59f8f64230ee752cc308ed98dfeefc73973632f9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 Jul 2022 01:52: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 | 1 + 1 file changed, 1 insertion(+) diff --git a/org.kde.kasts.desktop b/org.kde.kasts.desktop index 44fc1b5e..2f294d79 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -77,6 +77,7 @@ Keywords[cs]=podcast Keywords[de]=Podcast Keywords[en_GB]=podcast Keywords[es]=pódcast +Keywords[fi]=podcast Keywords[fr]=podcast Keywords[it]=podcast Keywords[ko]=팟캐스트