dummy commit in master branch
Solving untranslatable string problem
updating the pot files
Spanish translation 100% done
French translation 62% done
Japanese translation 28% done
German translation 21% done
Adding links for translations.
Merge branch 'doc-merge' which contains all the translation updates for v2.0
updating VERSION file to master.
We seem to have had a tag change from v2.0.0 to pgrouting-2.0.0, this affects docs and tests.
Fixed a typo in README.md
Merge branch 'develop' of https://github.com/pgRouting/pgrouting into develop

Conflicts:
	VERSION
	doc/i18n/de/LC_MESSAGES/doc/index.po
	doc/i18n/de/LC_MESSAGES/doc/index_man.po
	doc/i18n/de/LC_MESSAGES/doc/src/changelog/1_x.po
	doc/i18n/de/LC_MESSAGES/doc/src/changelog/2_0.po
	doc/i18n/de/LC_MESSAGES/doc/src/changelog/index.po
	doc/i18n/de/LC_MESSAGES/doc/src/installation/build.po
	doc/i18n/de/LC_MESSAGES/doc/src/introduction/index.po
	doc/i18n/de/LC_MESSAGES/doc/src/tutorial/analytics.po
	doc/i18n/de/LC_MESSAGES/doc/src/tutorial/index.po
	doc/i18n/de/LC_MESSAGES/doc/src/tutorial/topology.po
	doc/i18n/de/LC_MESSAGES/src/apsp_johnson/doc/index.po
	doc/i18n/de/LC_MESSAGES/src/apsp_warshall/doc/index.po
	doc/i18n/de/LC_MESSAGES/src/astar/doc/index.po
	doc/i18n/de/LC_MESSAGES/src/bd_astar/doc/index.po
	doc/i18n/de/LC_MESSAGES/src/bd_dijkstra/doc/index.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/functions/analyze_graph.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/functions/analyze_oneway.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/functions/create_topology.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/functions/create_vert_table.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/functions/index.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/functions/node_network.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/index.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/legacy.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/types/cost_result.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/types/geom_result.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/types/index.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/end_point.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/get_column_name.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/get_table_name.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/index.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/is_column_in_table.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/is_column_indexed.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/point_to_id.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/quote_ident.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/start_point.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/version.po
	doc/i18n/de/LC_MESSAGES/src/common/doc/utilities/versionless.po
	doc/i18n/de/LC_MESSAGES/src/dijkstra/doc/index.po
	doc/i18n/de/LC_MESSAGES/src/driving_distance/doc/dd_alphashape.po
	doc/i18n/de/LC_MESSAGES/src/driving_distance/doc/dd_driving_distance.po
	doc/i18n/de/LC_MESSAGES/src/driving_distance/doc/dd_points_as_polygon.po
	doc/i18n/de/LC_MESSAGES/src/index.po
	doc/i18n/de/LC_MESSAGES/src/kdijkstra/doc/index.po
	doc/i18n/de/LC_MESSAGES/src/ksp/doc/index.po
	doc/i18n/de/LC_MESSAGES/src/trsp/doc/index.po
	doc/i18n/de/LC_MESSAGES/src/tsp/doc/index.po
	doc/i18n/es/LC_MESSAGES/doc/index.po
	doc/i18n/es/LC_MESSAGES/doc/index_man.po
	doc/i18n/es/LC_MESSAGES/doc/src/changelog/1_x.po
	doc/i18n/es/LC_MESSAGES/doc/src/changelog/2_0.po
	doc/i18n/es/LC_MESSAGES/doc/src/changelog/index.po
	doc/i18n/es/LC_MESSAGES/doc/src/developer/discontinued.po
	doc/i18n/es/LC_MESSAGES/doc/src/developer/index.po
	doc/i18n/es/LC_MESSAGES/doc/src/developer/sampledata.po
	doc/i18n/es/LC_MESSAGES/doc/src/installation/build.po
	doc/i18n/es/LC_MESSAGES/doc/src/installation/index.po
	doc/i18n/es/LC_MESSAGES/doc/src/introduction/index.po
	doc/i18n/es/LC_MESSAGES/doc/src/introduction/introduction.po
	doc/i18n/es/LC_MESSAGES/doc/src/introduction/support.po
	doc/i18n/es/LC_MESSAGES/doc/src/tutorial/analytics.po
	doc/i18n/es/LC_MESSAGES/doc/src/tutorial/custom_query.po
	doc/i18n/es/LC_MESSAGES/doc/src/tutorial/custom_wrapper.po
	doc/i18n/es/LC_MESSAGES/doc/src/tutorial/index.po
	doc/i18n/es/LC_MESSAGES/doc/src/tutorial/performance.po
	doc/i18n/es/LC_MESSAGES/doc/src/tutorial/recipes.po
	doc/i18n/es/LC_MESSAGES/doc/src/tutorial/topology.po
	doc/i18n/es/LC_MESSAGES/doc/src/tutorial/tutorial.po
	doc/i18n/es/LC_MESSAGES/src/apsp_johnson/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/apsp_warshall/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/astar/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/bd_astar/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/bd_dijkstra/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/functions/analyze_graph.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/functions/analyze_oneway.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/functions/create_topology.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/functions/create_vert_table.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/functions/index.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/functions/node_network.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/legacy.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/types/cost_result.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/types/geom_result.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/types/index.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/end_point.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/get_column_name.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/get_table_name.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/index.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/is_column_in_table.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/is_column_indexed.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/point_to_id.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/quote_ident.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/start_point.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/version.po
	doc/i18n/es/LC_MESSAGES/src/common/doc/utilities/versionless.po
	doc/i18n/es/LC_MESSAGES/src/dijkstra/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/driving_distance/doc/dd_alphashape.po
	doc/i18n/es/LC_MESSAGES/src/driving_distance/doc/dd_driving_distance.po
	doc/i18n/es/LC_MESSAGES/src/driving_distance/doc/dd_points_as_polygon.po
	doc/i18n/es/LC_MESSAGES/src/driving_distance/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/index.po
	doc/i18n/es/LC_MESSAGES/src/kdijkstra/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/ksp/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/trsp/doc/index.po
	doc/i18n/es/LC_MESSAGES/src/tsp/doc/index.po
	doc/i18n/fr/LC_MESSAGES/doc/index.po
	doc/i18n/fr/LC_MESSAGES/doc/index_man.po
	doc/i18n/fr/LC_MESSAGES/doc/src/changelog/1_x.po
	doc/i18n/fr/LC_MESSAGES/doc/src/changelog/2_0.po
	doc/i18n/fr/LC_MESSAGES/doc/src/developer/discontinued.po
	doc/i18n/fr/LC_MESSAGES/doc/src/developer/index.po
	doc/i18n/fr/LC_MESSAGES/doc/src/developer/sampledata.po
	doc/i18n/fr/LC_MESSAGES/doc/src/installation/build.po
	doc/i18n/fr/LC_MESSAGES/doc/src/installation/index.po
	doc/i18n/fr/LC_MESSAGES/doc/src/introduction/index.po
	doc/i18n/fr/LC_MESSAGES/doc/src/introduction/introduction.po
	doc/i18n/fr/LC_MESSAGES/doc/src/introduction/support.po
	doc/i18n/fr/LC_MESSAGES/doc/src/tutorial/analytics.po
	doc/i18n/fr/LC_MESSAGES/doc/src/tutorial/custom_query.po
	doc/i18n/fr/LC_MESSAGES/doc/src/tutorial/index.po
	doc/i18n/fr/LC_MESSAGES/doc/src/tutorial/performance.po
	doc/i18n/fr/LC_MESSAGES/doc/src/tutorial/topology.po
	doc/i18n/fr/LC_MESSAGES/doc/src/tutorial/tutorial.po
	doc/i18n/fr/LC_MESSAGES/src/apsp_johnson/doc/index.po
	doc/i18n/fr/LC_MESSAGES/src/apsp_warshall/doc/index.po
	doc/i18n/fr/LC_MESSAGES/src/astar/doc/index.po
	doc/i18n/fr/LC_MESSAGES/src/bd_astar/doc/index.po
	doc/i18n/fr/LC_MESSAGES/src/bd_dijkstra/doc/index.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/functions/analyze_graph.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/functions/analyze_oneway.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/functions/create_topology.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/functions/create_vert_table.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/functions/node_network.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/index.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/legacy.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/types/cost_result.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/types/geom_result.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/types/index.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/utilities/end_point.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/utilities/get_column_name.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/utilities/get_table_name.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/utilities/is_column_in_table.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/utilities/is_column_indexed.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/utilities/point_to_id.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/utilities/quote_ident.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/utilities/start_point.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/utilities/version.po
	doc/i18n/fr/LC_MESSAGES/src/common/doc/utilities/versionless.po
	doc/i18n/fr/LC_MESSAGES/src/dijkstra/doc/index.po
	doc/i18n/fr/LC_MESSAGES/src/driving_distance/doc/dd_alphashape.po
	doc/i18n/fr/LC_MESSAGES/src/driving_distance/doc/dd_driving_distance.po
	doc/i18n/fr/LC_MESSAGES/src/driving_distance/doc/dd_points_as_polygon.po
	doc/i18n/fr/LC_MESSAGES/src/kdijkstra/doc/index.po
	doc/i18n/fr/LC_MESSAGES/src/ksp/doc/index.po
	doc/i18n/fr/LC_MESSAGES/src/trsp/doc/index.po
	doc/i18n/fr/LC_MESSAGES/src/tsp/doc/index.po
	doc/i18n/ja/LC_MESSAGES/doc/index.po
	doc/i18n/ja/LC_MESSAGES/doc/index_man.po
	doc/i18n/ja/LC_MESSAGES/doc/src/developer/sampledata.po
	doc/i18n/ja/LC_MESSAGES/doc/src/installation/index.po
	doc/i18n/ja/LC_MESSAGES/doc/src/introduction/index.po
	doc/i18n/ja/LC_MESSAGES/doc/src/tutorial/analytics.po
	doc/i18n/ja/LC_MESSAGES/doc/src/tutorial/index.po
	doc/i18n/ja/LC_MESSAGES/doc/src/tutorial/topology.po
	doc/i18n/ja/LC_MESSAGES/src/apsp_johnson/doc/index.po
	doc/i18n/ja/LC_MESSAGES/src/apsp_warshall/doc/index.po
	doc/i18n/ja/LC_MESSAGES/src/astar/doc/index.po
	doc/i18n/ja/LC_MESSAGES/src/bd_astar/doc/index.po
	doc/i18n/ja/LC_MESSAGES/src/bd_dijkstra/doc/index.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/functions/analyze_graph.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/functions/analyze_oneway.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/functions/create_topology.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/functions/create_vert_table.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/functions/node_network.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/types/cost_result.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/types/geom_result.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/utilities/end_point.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/utilities/get_column_name.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/utilities/get_table_name.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/utilities/is_column_in_table.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/utilities/is_column_indexed.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/utilities/point_to_id.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/utilities/quote_ident.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/utilities/start_point.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/utilities/version.po
	doc/i18n/ja/LC_MESSAGES/src/common/doc/utilities/versionless.po
	doc/i18n/ja/LC_MESSAGES/src/dijkstra/doc/index.po
	doc/i18n/ja/LC_MESSAGES/src/driving_distance/doc/dd_alphashape.po
	doc/i18n/ja/LC_MESSAGES/src/driving_distance/doc/dd_driving_distance.po
	doc/i18n/ja/LC_MESSAGES/src/driving_distance/doc/dd_points_as_polygon.po
	doc/i18n/ja/LC_MESSAGES/src/kdijkstra/doc/index.po
	doc/i18n/ja/LC_MESSAGES/src/ksp/doc/index.po
	doc/i18n/ja/LC_MESSAGES/src/trsp/doc/index.po
	doc/i18n/ja/LC_MESSAGES/src/tsp/doc/index.po
	doc/i18n/pot/doc/index.pot
	doc/i18n/pot/doc/index_man.pot
	doc/i18n/pot/doc/src/changelog/1_x.pot
	doc/i18n/pot/doc/src/changelog/2_0.pot
	doc/i18n/pot/doc/src/changelog/index.pot
	doc/i18n/pot/doc/src/developer/discontinued.pot
	doc/i18n/pot/doc/src/developer/index.pot
	doc/i18n/pot/doc/src/developer/sampledata.pot
	doc/i18n/pot/doc/src/installation/build.pot
	doc/i18n/pot/doc/src/installation/index.pot
	doc/i18n/pot/doc/src/introduction/index.pot
	doc/i18n/pot/doc/src/introduction/introduction.pot
	doc/i18n/pot/doc/src/introduction/support.pot
	doc/i18n/pot/doc/src/tutorial/analytics.pot
	doc/i18n/pot/doc/src/tutorial/custom_query.pot
	doc/i18n/pot/doc/src/tutorial/custom_wrapper.pot
	doc/i18n/pot/doc/src/tutorial/index.pot
	doc/i18n/pot/doc/src/tutorial/performance.pot
	doc/i18n/pot/doc/src/tutorial/recipes.pot
	doc/i18n/pot/doc/src/tutorial/topology.pot
	doc/i18n/pot/doc/src/tutorial/tutorial.pot
	doc/i18n/pot/src/apsp_johnson/doc/index.pot
	doc/i18n/pot/src/apsp_warshall/doc/index.pot
	doc/i18n/pot/src/astar/doc/index.pot
	doc/i18n/pot/src/bd_astar/doc/index.pot
	doc/i18n/pot/src/bd_dijkstra/doc/index.pot
	doc/i18n/pot/src/common/doc/functions/analyze_graph.pot
	doc/i18n/pot/src/common/doc/functions/analyze_oneway.pot
	doc/i18n/pot/src/common/doc/functions/create_topology.pot
	doc/i18n/pot/src/common/doc/functions/create_vert_table.pot
	doc/i18n/pot/src/common/doc/functions/index.pot
	doc/i18n/pot/src/common/doc/functions/node_network.pot
	doc/i18n/pot/src/common/doc/index.pot
	doc/i18n/pot/src/common/doc/legacy.pot
	doc/i18n/pot/src/common/doc/types/cost_result.pot
	doc/i18n/pot/src/common/doc/types/geom_result.pot
	doc/i18n/pot/src/common/doc/types/index.pot
	doc/i18n/pot/src/common/doc/utilities/end_point.pot
	doc/i18n/pot/src/common/doc/utilities/get_column_name.pot
	doc/i18n/pot/src/common/doc/utilities/get_table_name.pot
	doc/i18n/pot/src/common/doc/utilities/index.pot
	doc/i18n/pot/src/common/doc/utilities/is_column_in_table.pot
	doc/i18n/pot/src/common/doc/utilities/is_column_indexed.pot
	doc/i18n/pot/src/common/doc/utilities/point_to_id.pot
	doc/i18n/pot/src/common/doc/utilities/quote_ident.pot
	doc/i18n/pot/src/common/doc/utilities/start_point.pot
	doc/i18n/pot/src/common/doc/utilities/version.pot
	doc/i18n/pot/src/common/doc/utilities/versionless.pot
	doc/i18n/pot/src/dijkstra/doc/index.pot
	doc/i18n/pot/src/driving_distance/doc/dd_alphashape.pot
	doc/i18n/pot/src/driving_distance/doc/dd_driving_distance.pot
	doc/i18n/pot/src/driving_distance/doc/dd_points_as_polygon.pot
	doc/i18n/pot/src/driving_distance/doc/index.pot
	doc/i18n/pot/src/index.pot
	doc/i18n/pot/src/kdijkstra/doc/index.pot
	doc/i18n/pot/src/ksp/doc/index.pot
	doc/i18n/pot/src/trsp/doc/index.pot
	doc/i18n/pot/src/tsp/doc/index.pot