internationalization fixes
Merge remote-tracking branch 'upstream/gh-pages' into i18n-fixes
Merge remote-tracking branch 'upstream/master' into i18n-fixes

Conflicts:
	locales/README.md
	locales/de/translation.json
Merge pull request #74 from SAPlayer/i18n-fixes

Internationalization fixes