better i18n
Merge commit 'ffdddac14ba236fbd257c488fc2a1c6c14ed356d' into feature/i18n-improvements

Conflicts:
	locales/cs.js
	locales/da.js
	locales/de.js
	locales/en.js
	locales/es.js
	locales/fr.js
	locales/it.js
	locales/ja.js
	locales/ko.js
	locales/nl.js
	locales/pl.js
	locales/pt.js
	locales/ru.js
	locales/sv.js
	locales/zh.js