modified:   doc/TRANSLATORS
Merge branch 'ja_ts_20' of https://github.com/yoichigmf/Quantum-GIS into ja_ts_20

Conflicts:
	doc/TRANSLATORS
	.git/MERGE_HEAD
	modified:   i18n/qgis_ja.ts
	modified:   src/core/qgscontexthelp_texts.cpp