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/plugins/TestPlugin/metadata.desktop

@@ -8,7 +8,7 @@ Name[de]=Beispielmodul
 Name[en_GB]=Example Plugin
 Name[es]=Complemento de ejemplo
 Name[fi]=Esimerkkiliitännäinen
-Name[fr]=Module externe d'exemple
+Name[fr]=Exemple de module externe
 Name[gl]=Complemento de exemplo
 Name[id]=Example Plugin
 Name[it]=Estensione di esempio

src/scripts/helloqml/metadata.desktop

@@ -3,6 +3,7 @@ Name=Hello Qml
 Name[ca]=Hola Qml
 Name[ca@valencia]=Hola Qml
 Name[es]=Hola Qml
+Name[fr]=Bonjour Qml
 Name[id]=Hello Qml
 Name[nl]=Hello Qml
 Name[pt]=Olá em QML
@@ -13,6 +14,7 @@ Comment=Sample Qml Plugin
 Comment[ca]=Connector Qml d'exemple
 Comment[ca@valencia]=Connector Qml d'exemple
 Comment[es]=Complemento de ejemplo de Qml
+Comment[fr]=Exemple de module externe Qml
 Comment[id]=Contoh Plugin Qml
 Comment[nl]=Voorbeeld Qml-plug-in
 Comment[pt]='Plugin' de Exemplo em QML