modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/00_intro.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/01_loadlayer.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/03_vector.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/08_expressions.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/10_settings.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/11_pluginlayer.po
	modified:   i18n/ja/LC_MESSAGES/docs/qgis_governance/organisation/psc.po
	modified:   i18n/ja/LC_MESSAGES/docs/qgis_governance/release_checklists/release-2.0.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/grass_integration/grass_integration.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/index.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/introduction/getting_started.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/preamble/foreword.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/preamble/help_and_support.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/preamble/preamble.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/print_composer/print_composer.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/sextante/toolbox.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_gps/live_GPS_tracking.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_ogc/ogc_client_support.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_ogc/ogc_server_support.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_raster/raster_calculator.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_raster/raster_properties.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_raster/supported_data.po
update getting_started.po ja
Merge branch 'master' of https://github.com/qgis/QGIS-Documentation
update index.po ja
update index.po ja
update getting_started.po  ja translation
Merge branch 'master' of https://github.com/qgis/QGIS-Documentation
	modified:   getting_started.po
Merge branch 'master' of github.com:yoichigmf/QGIS-Documentation

Conflicts:
	i18n/ja/LC_MESSAGES/docs/user_manual/introduction/getting_started.po
Revert "new icon AddImage, corrected little mistakes"

This reverts commit 9502795e09bec8ac78b8953a8b362647a849d1b6.
	modified:   ../grass_integration/grass_integration.po
	modified:   getting_started.po
	modified:   ../print_composer/print_composer.po
modified:   ../working_with_gps/live_GPS_tracking.po
updaye getting_started.po ja
update getting_started.po ja
update getting_started.po ja
update getting_started.po ja