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 · a22bccc6d7
parent 3fa447f564
commit a22bccc6d7
1 changed files with 1 additions and 0 deletions
--- a/login-sessions/plasmax11.desktop.cmake
+++ b/login-sessions/plasmax11.desktop.cmake
@ -20,6 +20,7 @@ Name[nn]=Plasma (X11)
 Name[pa]=ਪਲਾਜ਼ਮਾ (X11)
 Name[pl]=Plazma (X11)
 Name[pt]=Plasma (X11)
+Name[pt_BR]=Plasma (X11)
 Name[ru]=Plasma (X11)
 Name[sk]=Plasma (X11)
 Name[sl]=Plasma (X11)