Update french translation for dated items (fixes #270)

2 files changed, 97 insertions, 66 deletions

diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po
index 4a2f02f..1b46b24 100644
--- a/chimere/locale/fr/LC_MESSAGES/django.po
+++ b/chimere/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-18 03:35+0100\n"
+"POT-Creation-Date: 2010-11-19 03:17+0100\n"
 "PO-Revision-Date: 2010-03-20 20:00+0100\n"
 "Last-Translator: Étienne Loks <etienne.loks@peacefrogs.net>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Participer"
 msgid "Add a new point of interest"
 msgstr "Ajout d'un point remarquable"
 
-#: main/actions.py:35 templates/edit_route.html:8
+#: main/actions.py:35 templates/edit_route.html:15
 msgid "Add a new route"
 msgstr "Ajout d'un nouveau trajet"
 
@@ -34,182 +34,209 @@ msgstr "Ajout d'un nouveau trajet"
 msgid "Contact us"
 msgstr "Nous contacter"
 
-#: main/forms.py:55
+#: main/forms.py:56
 msgid "New submission for"
 msgstr "Nouvelle proposition pour"
 
-#: main/forms.py:56
+#: main/forms.py:57
 #, python-format
 msgid "The new item \"%s\" has been submited in the category: "
 msgstr "Le nouvel élément « %s » a été proposé dans la catégorie : "
 
-#: main/forms.py:58
+#: main/forms.py:59
 msgid "To valid, precise or unvalid this item: "
 msgstr "Pour valider, préciser ou rejeter cet élément : "
 
-#: main/forms.py:67
+#: main/forms.py:68
 msgid "Email (optional)"
 msgstr "Courriel (optionnel) "
 
-#: main/forms.py:68
+#: main/forms.py:69
 msgid "Object"
 msgstr "Objet"
 
-#: main/forms.py:228 main/models.py:409
+#: main/forms.py:127
+msgid "End date has been set with no start date"
+msgstr "Une date de fin a été donnée sans date de début"
+
+#: main/forms.py:248 main/models.py:446
 msgid "Area"
 msgstr "Zone"
 
-#: main/models.py:35 main/models.py:88 main/models.py:109 main/models.py:122
-#: main/models.py:136 main/models.py:187 main/models.py:259 main/models.py:393
-#: main/models.py:435
+#: main/models.py:37 main/models.py:90 main/models.py:111 main/models.py:124
+#: main/models.py:138 main/models.py:188 main/models.py:269 main/models.py:430
+#: main/models.py:472
 msgid "Name"
 msgstr "Nom"
 
-#: main/models.py:36 main/models.py:110 main/models.py:137 main/models.py:195
-#: main/models.py:267 main/models.py:397 main/models.py:437
+#: main/models.py:38 main/models.py:112 main/models.py:139 main/models.py:196
+#: main/models.py:277 main/models.py:434 main/models.py:474
 msgid "Available"
 msgstr "Disponible"
 
-#: main/models.py:37
+#: main/models.py:39
 msgid "Date"
 msgstr "Date"
 
-#: main/models.py:43 main/models.py:44
+#: main/models.py:45 main/models.py:46
 msgid "News"
 msgstr "Nouvelle"
 
-#: main/models.py:49
+#: main/models.py:51
 msgid "Parameters"
-msgstr ""
+msgstr "Paramètres"
 
-#: main/models.py:53
+#: main/models.py:55
 msgid "TinyUrl"
-msgstr ""
+msgstr "Mini-url"
 
-#: main/models.py:92 main/models.py:99 main/models.py:141
+#: main/models.py:94 main/models.py:101 main/models.py:142
 msgid "Color theme"
 msgstr "Thème de couleur"
 
-#: main/models.py:97
+#: main/models.py:99
 msgid "Code"
 msgstr "Code"
 
-#: main/models.py:98 main/models.py:111 main/models.py:143 main/models.py:396
-#: main/models.py:436
+#: main/models.py:100 main/models.py:113 main/models.py:144 main/models.py:433
+#: main/models.py:473
 msgid "Order"
 msgstr "Ordre"
 
-#: main/models.py:104
+#: main/models.py:106
 msgid "Color"
 msgstr "Couleur"
 
-#: main/models.py:117 main/models.py:135
+#: main/models.py:119 main/models.py:137
 msgid "Category"
 msgstr "Catégorie"
 
-#: main/models.py:123 main/models.py:190 main/models.py:262
-#: templates/edit.html:28 templates/edit_route.html:28
+#: main/models.py:125 main/models.py:191 main/models.py:272
+#: templates/edit.html:35 templates/edit_route.html:35
 msgid "Image"
 msgstr "Image"
 
-#: main/models.py:125 main/models.py:192 main/models.py:264
+#: main/models.py:127 main/models.py:193 main/models.py:274
 msgid "Height"
 msgstr "Hauteur"
 
-#: main/models.py:126 main/models.py:193 main/models.py:265
+#: main/models.py:128 main/models.py:194 main/models.py:275
 msgid "Width"
 msgstr "Largeur"
 
-#: main/models.py:130 main/models.py:140
+#: main/models.py:132 main/models.py:141
 msgid "Icon"
 msgstr "Icône"
 
-#: main/models.py:144
+#: main/models.py:145
 msgid "Marker"
 msgstr "Point d'intérêt"
 
-#: main/models.py:145 main/models.py:261 main/models.py:280
-#: templates/edit_route.html:22
+#: main/models.py:146 main/models.py:271 main/models.py:297
+#: templates/edit_route.html:29
 msgid "Route"
 msgstr "Trajet"
 
-#: main/models.py:146
+#: main/models.py:147
 msgid "Both"
 msgstr "Mixte"
 
-#: main/models.py:147
+#: main/models.py:148
 msgid "Item type"
 msgstr "Type d'élément"
 
-#: main/models.py:152
+#: main/models.py:153
 msgid "Subcategory"
 msgstr "Sous-catégorie"
 
-#: main/models.py:189
+#: main/models.py:190
 msgid "Localisation"
 msgstr "Localisation"
 
-#: main/models.py:194 main/models.py:266
+#: main/models.py:195 main/models.py:276
 msgid "Submited"
 msgstr "Soumis"
 
-#: main/models.py:196 main/models.py:268
+#: main/models.py:197 main/models.py:278
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: main/models.py:200 main/models.py:272
+#: main/models.py:201 main/models.py:289
 msgid "Status"
 msgstr "État"
 
-#: main/models.py:208 main/models.py:459
+#: main/models.py:203 main/models.py:283 templates/edit.html:41
+#: templates/edit_route.html:41
+msgid "Start date"
+msgstr "Date de début"
+
+#: main/models.py:204 main/models.py:284
+msgid "Not mandatory. Set it for dated item such as event. Format YYYY-MM-DD"
+msgstr ""
+"Optionnel. Précisez ce champ pour les éléments datés comme un événement. "
+"Format du champ : AAAA-MM-JJ"
+
+#: main/models.py:206 main/models.py:286 templates/edit.html:47
+#: templates/edit_route.html:47
+msgid "End date"
+msgstr "Date de fin"
+
+#: main/models.py:207 main/models.py:287
+msgid ""
+"Not mandatory. Set it only if you have a multi-day event. Format YYYY-MM-DD"
+msgstr ""
+"Optionnel. Précisez ce champ seulement pour des événements durant plusieurs "
+"jours. Format du champ : AAAA-MM-JJ"
+
+#: main/models.py:216 main/models.py:496
 msgid "Point of interest"
 msgstr "Point d'intérêt"
 
-#: main/models.py:394
+#: main/models.py:431
 msgid "Area urn"
 msgstr "Urn de la zone"
 
-#: main/models.py:398
+#: main/models.py:435
 msgid "Upper left corner"
 msgstr "Coin en haut à gauche"
 
-#: main/models.py:400
+#: main/models.py:437
 msgid "Lower right corner"
 msgstr "Coin en bas à droite"
 
-#: main/models.py:438
+#: main/models.py:475
 msgid "Text"
 msgstr "Texte"
 
-#: main/models.py:439
+#: main/models.py:476
 msgid "Long text"
 msgstr "Texte long"
 
-#: main/models.py:440
+#: main/models.py:477
 msgid "Password"
 msgstr "Mot de passe"
 
-#: main/models.py:444
+#: main/models.py:481
 msgid "Type"
 msgstr "Type"
 
-#: main/models.py:449 main/models.py:461
+#: main/models.py:486 main/models.py:498
 msgid "Property model"
 msgstr "Modèle de propriété"
 
-#: main/models.py:462
+#: main/models.py:499
 msgid "Value"
 msgstr "Valeur"
 
-#: main/models.py:466
+#: main/models.py:503
 msgid "Property"
 msgstr "Propriété"
 
-#: main/views.py:218
+#: main/views.py:221
 msgid "Comments/request on the map"
 msgstr "Commentaires/requètes sur la carte"
 
-#: main/views.py:221
+#: main/views.py:224
 msgid ""
 "Thank you for your contribution. It will be taken into account. If you have "
 "left your email you may be contacted soon for more details."
@@ -218,11 +245,11 @@ msgstr ""
 "laissé votre courriel vous serez peut-être contacté bientôt pour plus de "
 "détails."
 
-#: main/views.py:225
+#: main/views.py:228
 msgid "Temporary error. Renew your message later."
 msgstr "Erreur temporaire. Réenvoyez votre message plus tard."
 
-#: main/views.py:316
+#: main/views.py:338
 msgid "No category available in this area."
 msgstr "Pas de catégorie disponible sur cette zone."
 
@@ -343,39 +370,43 @@ msgstr ""
 msgid "Submit"
 msgstr "Proposer"
 
-#: templates/detail.html:8
+#: templates/detail.html:7
+msgid "Date:"
+msgstr "Date :"
+
+#: templates/detail.html:13
 msgid "Share on"
 msgstr "Partager sur"
 
-#: templates/detail.html:11
+#: templates/detail.html:16
 msgid "Share"
 msgstr "Partager"
 
-#: templates/edit.html:9
+#: templates/edit.html:16
 msgid "Add a new site"
 msgstr "Ajouter un nouveau site"
 
-#: templates/edit.html:10 templates/edit_route.html:9
+#: templates/edit.html:17 templates/edit_route.html:16
 msgid "indicates a mandatory field"
 msgstr "indique un champ obligatoire"
 
-#: templates/edit.html:13 templates/edit_route.html:12
+#: templates/edit.html:20 templates/edit_route.html:19
 msgid "Site name"
 msgstr "Nom du site"
 
-#: templates/edit.html:18 templates/edit_route.html:17
+#: templates/edit.html:25 templates/edit_route.html:24
 msgid "Categories"
 msgstr "Catégories"
 
-#: templates/edit.html:23
+#: templates/edit.html:30
 msgid "Point"
 msgstr "Point"
 
-#: templates/edit.html:24 templates/edit_route.html:23
+#: templates/edit.html:31 templates/edit_route.html:30
 msgid "Select a location for this new site"
 msgstr "Choisissez une localisation pour ce nouveau site"
 
-#: templates/edit.html:39 templates/edit_route.html:39
+#: templates/edit.html:60 templates/edit_route.html:60
 msgid "Propose"
 msgstr "Proposez"
 
diff --git a/chimere/main/models.py b/chimere/main/models.py
index e793435..51e8693 100644
--- a/chimere/main/models.py
+++ b/chimere/main/models.py
@@ -204,7 +204,7 @@ class Marker(models.Model):
 help_text=_("Not mandatory. Set it for dated item such as event. \
 Format YYYY-MM-DD"))
         end_date = models.DateField(_("End date"), blank=True, null=True,
-help_text=_("Not mandatory. Set it only if you have set a start date. \
+help_text=_("Not mandatory. Set it only if you have a multi-day event. \
 Format YYYY-MM-DD"))
     objects = models.GeoManager()
 
@@ -284,7 +284,7 @@ class Route(models.Model):
 help_text=_("Not mandatory. Set it for dated item such as event. \
 Format YYYY-MM-DD"))
         end_date = models.DateField(_("End date"), blank=True, null=True,
-help_text=_("Not mandatory. Set it only if you have set a start date. \
+help_text=_("Not mandatory. Set it only if you have a multi-day event. \
 Format YYYY-MM-DD"))
     status = models.CharField(_("Status"), max_length=1, choices=STATUS)
     objects = models.GeoManager()