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 · 7570394acb
parent 67d81af459
commit 7570394acb
1 changed files with 1 additions and 0 deletions
--- a/kcms/desktoptheme/plasma-themes.knsrc
+++ b/kcms/desktoptheme/plasma-themes.knsrc
@ -5,6 +5,7 @@ Name[ca]=Temes del Plasma
 Name[es]=Temas de Plasma
 Name[fr]=Thèmes Plasma
 Name[nl]=Plasma-thema's
+Name[nn]=Plasma-tema
 Name[sl]=Teme Plasme
 Name[sv]=Plasmateman
 Name[uk]=Теми Плазми