fr: qgis_gui updates
Merge pull request #37 from MarieSilvestre/master

fr: qgis_gui updates
commented atlas - will be part of next version
corrected little mistakes
Merge pull request #3 from qgis/master

update 10 Janv 2013
FR: general translation update
Merge pull request #38 from MarieSilvestre/master

fr: general manual translation update
minor fixes
little changes and updates
little updates and mistakes
preamble translate JA
JA translation conventions.po
translate  convention.po JA
	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
features.po translat JA
	modified:   docs/user_manual/appendices/appendices.po
	modified:   docs/user_manual/grass_integration/grass_integration.po
	modified:   docs/user_manual/introduction/general_tools.po
	modified:   docs/user_manual/introduction/getting_started.po
	modified:   docs/user_manual/introduction/qgis_configuration.po
	modified:   docs/user_manual/introduction/qgis_gui.po
	modified:   docs/user_manual/literature_web/literature_and_web_references.po
	modified:   docs/user_manual/osm/openstreetmap.po
	modified:   docs/user_manual/plugins/core_plugins.po
	modified:   docs/user_manual/plugins/plugins.po
	modified:   docs/user_manual/plugins/plugins_coordinate_capture.po
	modified:   docs/user_manual/plugins/plugins_db_manager.po
	modified:   docs/user_manual/plugins/plugins_delimited_text.po
	new file:   docs/user_manual/plugins/plugins_diagram_overlay.po
	modified:   docs/user_manual/plugins/plugins_dxf2shape_converter.po
	modified:   docs/user_manual/plugins/plugins_evis.po
	modified:   docs/user_manual/plugins/plugins_ftools.po
	modified:   docs/user_manual/plugins/plugins_gdaltools.po
	modified:   docs/user_manual/plugins/plugins_georeferencer.po
	modified:   docs/user_manual/plugins/plugins_heatmap.po
	modified:   docs/user_manual/plugins/plugins_index.po
	modified:   docs/user_manual/plugins/plugins_interpolation.po
	modified:   docs/user_manual/plugins/plugins_mapserver_export.po
	modified:   docs/user_manual/plugins/plugins_offline_editing.po
	modified:   docs/user_manual/plugins/plugins_oracle_raster.po
	modified:   docs/user_manual/plugins/plugins_raster_terrain.po
	modified:   docs/user_manual/plugins/plugins_road_graph.po
	modified:   docs/user_manual/plugins/plugins_spatial_query.po
	modified:   docs/user_manual/plugins/plugins_spit.po
	modified:   docs/user_manual/plugins/plugins_sql_anywhere.po
	modified:   docs/user_manual/plugins/plugins_zonal_statistics.po
	modified:   docs/user_manual/print_composer/print_composer.po
	modified:   docs/user_manual/qgis_browser/qgis_browser.po
	modified:   docs/user_manual/sextante/3rdParty.po
	modified:   docs/user_manual/sextante/batch.po
	modified:   docs/user_manual/sextante/console.po
	modified:   docs/user_manual/sextante/history.po
	modified:   docs/user_manual/sextante/index.po
	modified:   docs/user_manual/sextante/intro.po
	modified:   docs/user_manual/sextante/modeler.po
	modified:   docs/user_manual/sextante/toolbox.po
	modified:   docs/user_manual/working_with_gps/index.po
	modified:   docs/user_manual/working_with_gps/live_GPS_tracking.po
	modified:   docs/user_manual/working_with_gps/plugins_gps.po
	modified:   docs/user_manual/working_with_ogc/index.po
	modified:   docs/user_manual/working_with_ogc/ogc_client_support.po
	modified:   docs/user_manual/working_with_ogc/ogc_server_support.po
	modified:   docs/user_manual/working_with_projections/working_with_projections.po
	modified:   docs/user_manual/working_with_raster/index.po
	modified:   docs/user_manual/working_with_raster/raster_calculator.po
	modified:   docs/user_manual/working_with_raster/raster_properties.po
	modified:   docs/user_manual/working_with_raster/supported_data.po
	modified:   docs/user_manual/working_with_vector/editing_geometry_attributes.po
	modified:   docs/user_manual/working_with_vector/field_calculator.po
	modified:   docs/user_manual/working_with_vector/index.po
	modified:   docs/user_manual/working_with_vector/query_builder.po
	modified:   docs/user_manual/working_with_vector/supported_data.po
	modified:   docs/user_manual/working_with_vector/vector_properties.po
	modified:   docs/pyqgis_developer_cookbook/00_intro.po
	modified:   docs/pyqgis_developer_cookbook/01_loadlayer.po
	modified:   docs/pyqgis_developer_cookbook/03_vector.po
	modified:   docs/pyqgis_developer_cookbook/08_expressions.po
	modified:   docs/pyqgis_developer_cookbook/10_settings.po
	modified:   docs/pyqgis_developer_cookbook/11_pluginlayer.po
	modified:   docs/qgis_governance/organisation/psc.po
	modified:   docs/qgis_governance/release_checklists/release-2.0.po
	modified:   docs/user_manual/index.po
	modified:   docs/user_manual/preamble/foreword.po
	modified:   docs/user_manual/preamble/help_and_support.po
Merge branch 'master' of github.com:yoichigmf/QGIS-Documentation
translation features.po JA
features translation  JA