a semicolon missing?
some translations added, and some locales changed
Merge remote-tracking branch 'origin/lang_fixes'

Conflicts:
	config/locales/en.yml
	config/locales/pl.yml