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"

appmenu/appmenu.desktop

@@ -15,7 +15,7 @@ Name[et]=Rakenduste menüü deemon
 Name[eu]=Aplikazio-menuen daimona
 Name[fi]=Sovellusvalikkopalvelu
 Name[fr]=Démon de menus des applications
-Name[gl]=Daemon de menús do aplicativo
+Name[gl]=Servizo de menús do aplicativo
 Name[he]=תהליך רקע של תפריט היישומים
 Name[hu]=Alkalmazás menük démon
 Name[ia]=Demone de menus de application