modified:   foreword.po
	modified:   help_and_support.po
	modified:   preamble.po
Merge branch 'master' of github.com:yoichigmf/QGIS-Documentation

Conflicts:
	i18n/ja/LC_MESSAGES/docs/user_manual/preamble/features.po

	modified:   conventions.po
	modified:   features.po
	modified:   ../../pyqgis_developer_cookbook/00_intro.po
	modified:   ../../pyqgis_developer_cookbook/01_loadlayer.po
	modified:   ../../pyqgis_developer_cookbook/03_vector.po
	modified:   ../../pyqgis_developer_cookbook/08_expressions.po
	modified:   ../../pyqgis_developer_cookbook/10_settings.po
	modified:   ../../pyqgis_developer_cookbook/11_pluginlayer.po
	modified:   ../../qgis_governance/organisation/psc.po
	modified:   ../../qgis_governance/release_checklists/release-2.0.po
	modified:   ../appendices/appendices.po
	modified:   ../grass_integration/grass_integration.po
	modified:   ../index.po