update ja
Merge branch 'ja_ts_20' of https://github.com/qgis-jp/Quantum-GIS into ja_ts_20

Conflicts:
	i18n/qgis_ja.ts
update translation ja
Merge branch 'ja_ts_20' of https://github.com/qgis-jp/Quantum-GIS into ja_ts_20
update translation ja
Merge branch 'ja_ts_20' of https://github.com/qgis-jp/Quantum-GIS into ja_ts_20
update translation ja