From e7e33ff36497c7f446dd3ebf3ce6cbca4c52056d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 20 Mar 2021 06:33:53 +0100 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" --- kcms/desktoptheme/plasma-themes.knsrc | 1 + 1 file changed, 1 insertion(+) diff --git a/kcms/desktoptheme/plasma-themes.knsrc b/kcms/desktoptheme/plasma-themes.knsrc index 752abc2de..40f51468e 100644 --- a/kcms/desktoptheme/plasma-themes.knsrc +++ b/kcms/desktoptheme/plasma-themes.knsrc @@ -9,6 +9,7 @@ Name[it]=Temi di Plasma Name[nl]=Plasma-thema's Name[nn]=Plasma-tema Name[pt]=Temas do Plasma +Name[pt_BR]=Temas do Plasma Name[sl]=Teme Plasme Name[sv]=Plasmateman Name[uk]=Теми Плазми