Localizations updated.
Merge branch 'dev' into japanese-translation