update GUI translatio ja
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into make_pull_req_from_ja

Conflicts:
	i18n/qgis_ja.ts
update GUI translation JA
Merge pull request #687 from qgis-jp/make_pull_req_from_ja

Make pull req from ja