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

@@ -1,8 +1,12 @@
 [Desktop Entry]
 Name=Hello Python
+Name[pt]=Olá em Python
+Name[sv]=Hej Python
 Name[uk]=Привіт, Python
 Name[x-test]=xxHello Pythonxx
 Comment=Example Python extension
+Comment[pt]=Extensão de exemplo em Python
+Comment[sv]=Exempel på Python-utökning
 Comment[uk]=Приклад розширення мовою Python
 Comment[x-test]=xxExample Python extensionxx