^ updated for ver.3.2.0
Merge branch 'master' of github.com:joomlajp/Joomla-in-Japanese

Conflicts:
	installation/language/ja-JP/ja-JP.ini