Renamed "ja_JP" locale to "ja"

Better compat with transifex with generic locale
Merge branch 'refs/heads/3.1.0' into 3.1
Updated translations
Merge branch 'refs/heads/3.1.0' into 3.1

Conflicts:
	lang/ar.yml