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"
5 years ago · e7e33ff364
parent 83078eb33e
commit e7e33ff364
1 changed files with 1 additions and 0 deletions
--- 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]=Теми Плазми