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-10-07 08:03:19 +02:00 · 2018-10-07 08:03:19 +02:00 · dc707c5c4e
commit dc707c5c4e
parent 0b7778f964
1 changed files with 1 additions and 0 deletions
--- a/effects/scale/scale_config.desktop
+++ b/effects/scale/scale_config.desktop
@ -22,6 +22,7 @@ Name[nn]=Skalering
 Name[pl]=Skala
 Name[pt]=Escala
 Name[pt_BR]=Escala
+Name[ru]=Масштабирование
 Name[sk]=Škálovať
 Name[sv]=Skala
 Name[uk]=Масштабування