update general_tools.po  JA translation
Merge branch 'manual_en_v1.8' of https://github.com/qgis/QGIS-Documentation into manual_en_v1.8
Merge branch 'manual_en_v1.8' of https://github.com/qgis/QGIS-Documentation into manual_en_v1.8
update general_tools.po
Merge pull request #92 from dassau/manual_en_v1.8

Manual en v1.8
Merge branch 'manual_en_v1.8' of https://github.com/qgis/QGIS-Documentation into manual_en_v1.8
Merge branch 'manual_en_v1.8' of https://github.com/qgis/QGIS-Documentation into manual_en_v1.8
Merge branch 'manual_en_v1.8' of https://github.com/qgis/QGIS-Documentation into manual_en_v1.8
update general_tools.po ja translation
Merge pull request #22 from MarieSilvestre/manual_en_v1.8

fr: some manual updates from transifex
worked on actions tab
Merge pull request #4 from junek/manual_en_v1.8

worked on actions tab
Merge pull request #23 from dassau/manual_en_v1.8

Manual en v1.8
Merge branch 'manual_en_v1.8' of https://github.com/qgis/QGIS-Documentation into manual_en_v1.8

Conflicts:
	i18n/ja/LC_MESSAGES/docs/user_manual/introduction/general_tools.po
	modified:   i18n/ja/LC_MESSAGES/docs/documentation_guidelines/README.po
	modified:   i18n/ja/LC_MESSAGES/docs/documentation_guidelines/substitutions.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/00_preamble.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/01_introducing_gis.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/02_vector_data.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/03_vector_attribute_data.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/04_data_capture.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/05_raster_data.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/06_topology.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/07_coordinate_reference_systems.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/08_map_production.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/09_vector_spatial_analysis_buffers.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/10_spatial_analysis_interpolation.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/11_authors_and_contributors.po
	modified:   i18n/ja/LC_MESSAGES/docs/gentle_gis_introduction/12_gnu_free_documentation_license.po
	modified:   i18n/ja/LC_MESSAGES/docs/index.po
	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/02_raster.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/03_vector.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/04_geometry.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/05_crs.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/06_canvas.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/07_composer.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/08_expressions.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/09_measure.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/pyqgis_developer_cookbook/12_network_analysis.po
	modified:   i18n/ja/LC_MESSAGES/docs/pyqgis_developer_cookbook/13_plugins.po
	modified:   i18n/ja/LC_MESSAGES/docs/qgis_governance/developer_meetings/lyon_finances_report.po
	modified:   i18n/ja/LC_MESSAGES/docs/qgis_governance/developer_meetings/reimbursements.po
	modified:   i18n/ja/LC_MESSAGES/docs/qgis_governance/organisation/psc.po
	modified:   i18n/ja/LC_MESSAGES/docs/qgis_governance/sponsorship/gold-sponsors.po
	modified:   i18n/ja/LC_MESSAGES/docs/qgis_governance/sponsorship/sponsor-list.po
	modified:   i18n/ja/LC_MESSAGES/docs/qgis_governance/sponsorship/sponsorship.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/appendices/appendices.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/grass_integration/grass_integration.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/introduction/general_tools.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/introduction/getting_started.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/introduction/qgis_configuration.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/introduction/qgis_gui.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/literature_web/literature_and_web_references.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/osm/openstreetmap.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/core_plugins.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_coordinate_capture.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_db_manager.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_delimited_text.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_dxf2shape_converter.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_evis.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_ftools.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_gdaltools.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_georeferencer.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_heatmap.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_index.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_interpolation.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_mapserver_export.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_offline_editing.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_oracle_raster.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_raster_terrain.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_road_graph.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_spatial_query.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_spit.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_sql_anywhere.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/plugins/plugins_zonal_statistics.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/preamble/conventions.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/preamble/features.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/qgis_browser/qgis_browser.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/sextante/3rdParty.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/sextante/batch.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/sextante/console.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/sextante/history.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/sextante/intro.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/sextante/modeler.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_gps/plugins_gps.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_projections/working_with_projections.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_raster/raster_analysis.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
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_vector/editing_geometry_attributes.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_vector/field_calculator.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_vector/query_builder.po
	modified:   i18n/ja/LC_MESSAGES/docs/user_manual/working_with_vector/vector_properties.po
	modified:   i18n/ja/LC_MESSAGES/website/community/index.po
	modified:   i18n/ja/LC_MESSAGES/website/download.po
Merge pull request #24 from MarieSilvestre/manual_en_v1.8

Manual en v1.8
Merge pull request #25 from MarieSilvestre/manual_en_v1.8

fr: some transifex updates
corrected sentences
Merge pull request #5 from junek/manual_en_v1.8

corrected sentences
Merge pull request #26 from dassau/manual_en_v1.8

Manual en v1.8