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"
2018-09-07 06:02:56 +02:00 · 2018-09-07 06:02:56 +02:00 · 62d659b90f
parent ce2705d71f
commit 62d659b90f
1 changed files with 1 additions and 0 deletions
--- a/effects/scale/scale_config.desktop
+++ b/effects/scale/scale_config.desktop
@ -20,6 +20,7 @@ Name[nl]=Schalen
 Name[nn]=Skalering
 Name[pl]=Skala
 Name[pt]=Escala
+Name[pt_BR]=Escala
 Name[sv]=Skala
 Name[uk]=Масштабування
 Name[x-test]=xxScalexx