From 464577491f2fb5f247bc7613488d5ad5ffcfea54 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 19 Nov 2024 01:24:36 +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 4dfeb349..87ffd755 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -123,6 +123,7 @@ Keywords[ko]=팟캐스트 Keywords[nl]=podcast Keywords[pl]=podkast Keywords[pt]=podcast +Keywords[pt_BR]=podcast Keywords[ru]=подкаст Keywords[sk]=podcast Keywords[sl]=podcast;podkast;spletna oddaja;oddaja;spletnaoddaja