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

@@ -12,6 +12,7 @@ Name[gl]=Ola Qml
 Name[id]=Hello Qml
 Name[it]=Hello Qml
 Name[nl]=Hello Qml
+Name[nn]=Hei, QML
 Name[pl]=Hello QML
 Name[pt]=Olá em QML
 Name[pt_BR]=Olá Qml
@@ -34,6 +35,7 @@ Comment[gl]=Complemento de exemplo de Qml
 Comment[id]=Contoh Plugin Qml
 Comment[it]=Estensione di esempio in Qml
 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