These should be the same as those generated by Rachel G.
Changes resulting from doing the translation step
GitIgnore

Added .project to the list (no-one else needs this information)
Merge branch 'master' of https://github.com/jmhutchison/QGIS-Training-Manual

Conflicts:
	i18n/af/LC_MESSAGES/README.po
	i18n/af/LC_MESSAGES/answers.po
	i18n/af/LC_MESSAGES/appendix.po
	i18n/af/LC_MESSAGES/assessment.po
	i18n/af/LC_MESSAGES/basic_map.po
	i18n/af/LC_MESSAGES/complete_analysis.po
	i18n/af/LC_MESSAGES/create_vector_data.po
	i18n/af/LC_MESSAGES/foreword.po
	i18n/af/LC_MESSAGES/grass.po
	i18n/af/LC_MESSAGES/index.po
	i18n/af/LC_MESSAGES/introduction.po
	i18n/af/LC_MESSAGES/map_composer.po
	i18n/af/LC_MESSAGES/online_resources.po
	i18n/af/LC_MESSAGES/postgis.po
	i18n/af/LC_MESSAGES/postgres.po
	i18n/af/LC_MESSAGES/python.po
	i18n/af/LC_MESSAGES/qgis_plugins.po
	i18n/af/LC_MESSAGES/rasters.po
	i18n/af/LC_MESSAGES/vector_analysis.po
	i18n/af/LC_MESSAGES/vector_classification.po
	i18n/de/LC_MESSAGES/README.po
	i18n/de/LC_MESSAGES/answers.po
	i18n/de/LC_MESSAGES/appendix.po
	i18n/de/LC_MESSAGES/assessment.po
	i18n/de/LC_MESSAGES/basic_map.po
	i18n/de/LC_MESSAGES/complete_analysis.po
	i18n/de/LC_MESSAGES/create_vector_data.po
	i18n/de/LC_MESSAGES/foreword.po
	i18n/de/LC_MESSAGES/grass.po
	i18n/de/LC_MESSAGES/index.po
	i18n/de/LC_MESSAGES/introduction.po
	i18n/de/LC_MESSAGES/map_composer.po
	i18n/de/LC_MESSAGES/online_resources.po
	i18n/de/LC_MESSAGES/postgis.po
	i18n/de/LC_MESSAGES/postgres.po
	i18n/de/LC_MESSAGES/python.po
	i18n/de/LC_MESSAGES/qgis_plugins.po
	i18n/de/LC_MESSAGES/rasters.po
	i18n/de/LC_MESSAGES/vector_analysis.po
	i18n/de/LC_MESSAGES/vector_classification.po
	i18n/id/LC_MESSAGES/README.po
	i18n/id/LC_MESSAGES/answers.po
	i18n/id/LC_MESSAGES/appendix.po
	i18n/id/LC_MESSAGES/assessment.po
	i18n/id/LC_MESSAGES/basic_map.po
	i18n/id/LC_MESSAGES/complete_analysis.po
	i18n/id/LC_MESSAGES/create_vector_data.po
	i18n/id/LC_MESSAGES/foreword.po
	i18n/id/LC_MESSAGES/grass.po
	i18n/id/LC_MESSAGES/index.po
	i18n/id/LC_MESSAGES/introduction.po
	i18n/id/LC_MESSAGES/map_composer.po
	i18n/id/LC_MESSAGES/online_resources.po
	i18n/id/LC_MESSAGES/postgis.po
	i18n/id/LC_MESSAGES/postgres.po
	i18n/id/LC_MESSAGES/python.po
	i18n/id/LC_MESSAGES/qgis_plugins.po
	i18n/id/LC_MESSAGES/rasters.po
	i18n/id/LC_MESSAGES/vector_analysis.po
	i18n/id/LC_MESSAGES/vector_classification.po
	i18n/ja/LC_MESSAGES/README.po
	i18n/ja/LC_MESSAGES/answers.po
	i18n/ja/LC_MESSAGES/appendix.po
	i18n/ja/LC_MESSAGES/assessment.po
	i18n/ja/LC_MESSAGES/basic_map.po
	i18n/ja/LC_MESSAGES/complete_analysis.po
	i18n/ja/LC_MESSAGES/create_vector_data.po
	i18n/ja/LC_MESSAGES/foreword.po
	i18n/ja/LC_MESSAGES/grass.po
	i18n/ja/LC_MESSAGES/index.po
	i18n/ja/LC_MESSAGES/introduction.po
	i18n/ja/LC_MESSAGES/map_composer.po
	i18n/ja/LC_MESSAGES/online_resources.po
	i18n/ja/LC_MESSAGES/postgis.po
	i18n/ja/LC_MESSAGES/postgres.po
	i18n/ja/LC_MESSAGES/python.po
	i18n/ja/LC_MESSAGES/qgis_plugins.po
	i18n/ja/LC_MESSAGES/rasters.po
	i18n/ja/LC_MESSAGES/vector_analysis.po
	i18n/ja/LC_MESSAGES/vector_classification.po
	i18n/pot/README.pot
	i18n/pot/answers.pot
	i18n/pot/appendix.pot
	i18n/pot/assessment.pot
	i18n/pot/basic_map.pot
	i18n/pot/complete_analysis.pot
	i18n/pot/create_vector_data.pot
	i18n/pot/foreword.pot
	i18n/pot/grass.pot
	i18n/pot/index.pot
	i18n/pot/introduction.pot
	i18n/pot/map_composer.pot
	i18n/pot/online_resources.pot
	i18n/pot/postgis.pot
	i18n/pot/postgres.pot
	i18n/pot/python.pot
	i18n/pot/qgis_plugins.pot
	i18n/pot/rasters.pot
	i18n/pot/vector_analysis.pot
	i18n/pot/vector_classification.pot
	i18n/ro/LC_MESSAGES/README.po
	i18n/ro/LC_MESSAGES/answers.po
	i18n/ro/LC_MESSAGES/appendix.po
	i18n/ro/LC_MESSAGES/assessment.po
	i18n/ro/LC_MESSAGES/basic_map.po
	i18n/ro/LC_MESSAGES/complete_analysis.po
	i18n/ro/LC_MESSAGES/create_vector_data.po
	i18n/ro/LC_MESSAGES/foreword.po
	i18n/ro/LC_MESSAGES/grass.po
	i18n/ro/LC_MESSAGES/index.po
	i18n/ro/LC_MESSAGES/introduction.po
	i18n/ro/LC_MESSAGES/map_composer.po
	i18n/ro/LC_MESSAGES/online_resources.po
	i18n/ro/LC_MESSAGES/postgis.po
	i18n/ro/LC_MESSAGES/postgres.po
	i18n/ro/LC_MESSAGES/python.po
	i18n/ro/LC_MESSAGES/qgis_plugins.po
	i18n/ro/LC_MESSAGES/rasters.po
	i18n/ro/LC_MESSAGES/vector_analysis.po
	i18n/ro/LC_MESSAGES/vector_classification.po