Improved i18n-support, works with proxies

This should work now even with proxies. You can discard my other pull request.