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"

xembed-sni-proxy/xembedsniproxy.desktop

@@ -9,9 +9,11 @@ Name[fi]=XembedSniProxy
 Name[ko]=XembedSniProxy
 Name[nl]=XembedSniProxy
 Name[nn]=XembedSniProxy
+Name[pl]=XembedSniProxy
 Name[pt]=XembedSniProxy
 Name[pt_BR]=XembedSniProxy
 Name[sk]=XembedSniProxy
+Name[sl]=XembedSniProxy
 Name[sv]=XembedSniProxy
 Name[uk]=XembedSniProxy
 Name[x-test]=xxXembedSniProxyxx