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/data/kmail2.notifyrc

@@ -447,7 +447,7 @@ Name[es]=Archivado de correos en carpeta terminado
 Name[et]=Kirjad on kausta arhiveeritud
 Name[fi]=Viestien arkistointi kansioihin valmis
 Name[fr]=Archivage des dossiers terminé
-Name[gl]=Rematou Arquivar o correo
+Name[gl]=Rematou «Arquivar o correo do cartafol»
 Name[hu]=A levelek archiválása a mappában befejeződött
 Name[ia]=Action de archivar posta in dossier terminate
 Name[it]=Operazione di archiviazione della posta per cartelle completata