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"

src/scripts/helloqml/metadata.desktop

@@ -56,7 +56,7 @@ Comment[nl]=Voorbeeld Qml-plug-in
 Comment[nn]=Eksempel på QML-tillegg
 Comment[pl]=Przykładowa wtyczka QML
 Comment[pt]='Plugin' de Exemplo em QML
-Comment[pt_BR]=Plug-in QML de exemplo
+Comment[pt_BR]=Plugin QML de exemplo
 Comment[ru]=Пример подключаемого модуля QML
 Comment[sk]=Ukážkový QML plugin
 Comment[sl]=Primer vtičnika za Qml