Merge branch 'saclay'

Conflicts:
	chimere/migrations/0029_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
	chimere/migrations/0029_auto__add_propertymodelchoice.py
	chimere/migrations/0030_auto__add_field_importer_default_name.py
	chimere/migrations/0031_auto__add_field_subcategory_dated.py
	chimere/migrations/0031_auto__chg_field_picturefile_width__chg_field_picturefile_height.py
	chimere/migrations/0032_auto__add_field_subcategory_submission.py
	chimere/migrations/0033_auto__add_field_importer_source_file.py
	chimere/migrations/0034_auto__add_field_importer_origin__add_field_importer_license__add_field.py
	chimere/migrations/0035_area_permissions.py
	chimere/migrations/0035_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
	chimere/migrations/0036_auto.py
	chimere/migrations/0036_auto__add_field_importer_default_name.py
	chimere/migrations/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
	chimere/migrations/0038_auto__chg_field_picturefile_width__chg_field_picturefile_height.py
	chimere/migrations/0039_auto__add_multimediaextension__chg_field_multimediafile_multimedia_typ.py
	chimere/migrations/0040_remove_excluded_status.py
	chimere/migrations/0041_auto__add_field_importer_overwrite.py
	chimere/migrations/0041_auto__add_field_importer_source_file.py
	chimere/migrations/0042_auto__add_field_importer_origin__add_field_importer_license__add_field.py
	chimere/migrations/0042_fix_rights.py
	chimere/migrations/0043_area_permissions.py
	chimere/migrations/0043_auto__add_field_importer_get_description.py
	chimere/migrations/0044_auto.py
	chimere/migrations/0044_auto__add_field_importer_default_description.py
	chimere/migrations/0046_auto__del_field_subcategory_routing_available.py
	chimere/migrations/0047_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
	chimere/migrations/0049_auto__chg_field_multimediafile_multimedia_type.py
	chimere/migrations/0050_remove_excluded_status.py
	chimere/migrations/0051_auto__add_field_importer_overwrite.py
	chimere/migrations/0054_fix_rights.py
	chimere/old_migrations/v2.0/0029_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
	chimere/old_migrations/v2.0/0030_auto__add_field_importer_default_name.py
	chimere/old_migrations/v2.0/0031_auto__chg_field_picturefile_width__chg_field_picturefile_height.py
	chimere/old_migrations/v2.0/0032_auto__add_field_subcategory_submission.py
	chimere/old_migrations/v2.0/0033_auto__add_field_importer_source_file.py
	chimere/old_migrations/v2.0/0034_auto__add_field_importer_origin__add_field_importer_license__add_field.py
	chimere/old_migrations/v2.0/0035_area_permissions.py
	chimere/old_migrations/v2.0/0036_auto.py
	chimere/old_migrations/v2.0/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
	chimere/old_migrations/v2.0/0038_osm_import_filtr.py
	chimere/old_migrations/v2.0/0039_auto__add_multimediaextension__chg_field_multimediafile_multimedia_typ.py
	chimere/old_migrations/v2.0/0040_remove_excluded_status.py
	chimere/old_migrations/v2.0/0041_auto__add_field_importer_overwrite.py
	chimere/old_migrations/v2.0/0042_fix_rights.py
	chimere/old_migrations/v2.0/0043_auto__add_field_importer_get_description.py
	chimere/old_migrations/v2.0/0044_auto__add_field_importer_default_description.py

1 files changed, 47 insertions, 0 deletions

diff --git a/example_project/locale/fr/LC_MESSAGES/django.po b/example_project/locale/fr/LC_MESSAGES/django.po
new file mode 100644
index 0000000..ac36871
--- /dev/null
+++ b/example_project/locale/fr/LC_MESSAGES/django.po
@@ -0,0 +1,47 @@
+# Chimère
+# Copyright (C) 2012
+# This file is distributed under the same license as the Chimère package.
+# Étienne Loks <etienne.loks@peacefrogs.net>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-26 17:11+0200\n"
+"Last-Translator: Étienne Loks <etienne.loks@peacefrogs.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: settings.py:79
+msgid "Foot"
+msgstr "Marche"
+
+#: settings.py:80
+msgid "Bicycle"
+msgstr "À vélo"
+
+#: settings.py:81
+msgid "Motorcar"
+msgstr "En voiture"
+
+#: settings.py:84
+msgid "You are walking slowly"
+msgstr "Vous marchez lentement"
+
+#: settings.py:85
+msgid "You are walking pretty quickly"
+msgstr "Vous marchez plutôt vite"
+
+#: settings.py:86
+msgid "You are riding pretty slowly"
+msgstr "Vous conduisez plutôt lentement"
+
+#: settings.py:87
+msgid "You are riding pretty quickly"
+msgstr "Vous conduisez plutôt rapidement"
+
+#: settings.py:106
+msgid "Hello, I would like to propose you a modification about this item: "
+msgstr "Bonjour, je voudrais vous proposer une modification à propos de cet élément : "