From a94d566295f01eacfc882cae0f6b1fc3a5031363 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Apr 2022 01:48:35 +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 83fc4886..92d552f9 100644 --- a/org.kde.kasts.desktop +++ b/org.kde.kasts.desktop @@ -79,6 +79,7 @@ Keywords[en_GB]=podcast Keywords[es]=pódcast Keywords[fr]=podcast Keywords[it]=podcast +Keywords[ko]=팟캐스트 Keywords[nl]=podcast Keywords[pl]=podkast Keywords[sl]=podcast