Change welcome label

2 files changed, 232 insertions, 256 deletions

diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po
index 8421b35..53cf4d4 100644
--- a/chimere/locale/fr/LC_MESSAGES/django.po
+++ b/chimere/locale/fr/LC_MESSAGES/django.po
@@ -7,474 +7,453 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-02 13:55+0200\n"
+"POT-Creation-Date: 2012-08-02 20:40+0200\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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: extra-locales/chimere/__init__.py:8 extra-locales/chimere/models.py:490
+#: __init__.py:8 models.py:490
 msgid "Multimedia files"
 msgstr "Fichiers multimedias"
 
-#: extra-locales/chimere/__init__.py:9 extra-locales/chimere/models.py:539
+#: __init__.py:9 models.py:539
 msgid "Picture files"
 msgstr "Fichiers d'image"
 
-#: extra-locales/chimere/actions.py:31
+#: actions.py:31
 msgid "View"
 msgstr "Voir"
 
-#: extra-locales/chimere/actions.py:32
+#: actions.py:32
 msgid "Contribute"
 msgstr "Participer"
 
-#: extra-locales/chimere/actions.py:33
+#: actions.py:33
 msgid "Add a new point of interest"
 msgstr "Ajout d'un point remarquable"
 
-#: extra-locales/chimere/actions.py:34
+#: actions.py:34
 msgid "Add a new route"
 msgstr "Ajout d'un nouveau trajet"
 
-#: extra-locales/chimere/actions.py:38
+#: actions.py:38
 msgid "RSS feeds"
 msgstr "Flux RSS"
 
-#: extra-locales/chimere/actions.py:41
+#: actions.py:41
 msgid "Contact us"
 msgstr "Nous contacter"
 
-#: extra-locales/chimere/admin.py:62
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:69
+#: admin.py:62 templates/chimere/feeds/rss.html:69
 msgid "Validate"
 msgstr "Valider"
 
-#: extra-locales/chimere/admin.py:73
+#: admin.py:73
 msgid "Export to KML"
 msgstr "Exporter en KML"
 
-#: extra-locales/chimere/admin.py:87
+#: admin.py:87
 msgid "Export to Shapefile"
 msgstr "Exporter en Shapefile"
 
-#: extra-locales/chimere/admin.py:173
+#: admin.py:173
 msgid "Import"
 msgstr "Import"
 
-#: extra-locales/chimere/admin.py:179
+#: admin.py:179
 msgid "Cancel import"
 msgstr "Annuler l'import"
 
-#: extra-locales/chimere/admin.py:185
+#: admin.py:185
 msgid "Cancel export"
 msgstr "Annuler l'export"
 
-#: extra-locales/chimere/admin.py:193
+#: admin.py:193
 msgid "Export to osm"
 msgstr "Exporter vers osm"
 
-#: extra-locales/chimere/feeds.py:124 extra-locales/chimere/feeds.py:211
+#: feeds.py:124 feeds.py:211
 msgid "Last points of interest"
 msgstr "Derniers points d'intérêt"
 
-#: extra-locales/chimere/feeds.py:130
+#: feeds.py:130
 msgid "Latest points of interest from "
 msgstr "Nouveaux points d'intérêt de "
 
-#: extra-locales/chimere/feeds.py:176
+#: feeds.py:176
 msgid "Last points of interest by area"
 msgstr "Nouveaux points d'intérêt par zone"
 
-#: extra-locales/chimere/forms.py:76
+#: forms.py:76
 msgid "New submission for"
 msgstr "Nouvelle proposition pour"
 
-#: extra-locales/chimere/forms.py:77
+#: forms.py:77
 #, 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 : "
 
-#: extra-locales/chimere/forms.py:79
+#: forms.py:79
 msgid "To valid, precise or unvalid this item: "
 msgstr "Pour valider, préciser ou rejeter cet élément : "
 
-#: extra-locales/chimere/forms.py:89
+#: forms.py:89
 msgid "Email (optional)"
 msgstr "Courriel (optionnel) "
 
-#: extra-locales/chimere/forms.py:90
+#: forms.py:90
 msgid "Object"
 msgstr "Objet"
 
-#: extra-locales/chimere/forms.py:147
+#: forms.py:147
 msgid "End date has been set with no start date"
 msgstr "Une date de fin a été donnée sans date de début"
 
-#: extra-locales/chimere/forms.py:358
+#: forms.py:358
 msgid "File"
 msgstr "Fichier"
 
-#: extra-locales/chimere/forms.py:364
+#: forms.py:364
 msgid "Bad file format: this must be a GPX or KML file"
 msgstr "Mauvais format de fichier : KML et GPX sont supportés"
 
-#: extra-locales/chimere/forms.py:369 extra-locales/chimere/models.py:48
-#: extra-locales/chimere/models.py:101 extra-locales/chimere/models.py:122
-#: extra-locales/chimere/models.py:135 extra-locales/chimere/models.py:149
-#: extra-locales/chimere/models.py:232 extra-locales/chimere/models.py:437
-#: extra-locales/chimere/models.py:480 extra-locales/chimere/models.py:524
-#: extra-locales/chimere/models.py:555 extra-locales/chimere/models.py:792
-#: extra-locales/chimere/models.py:804 extra-locales/chimere/models.py:889
-#: extra-locales/chimere/templates/chimere/edit.html:39
-#: extra-locales/chimere/templates/chimere/edit_route.html:36
+#: forms.py:369 models.py:48 models.py:101 models.py:122 models.py:135
+#: models.py:149 models.py:232 models.py:437 models.py:480 models.py:524
+#: models.py:555 models.py:792 models.py:804 models.py:889
+#: templates/chimere/edit.html:39 templates/chimere/edit_route.html:36
 msgid "Name"
 msgstr "Nom"
 
-#: extra-locales/chimere/forms.py:378 extra-locales/chimere/models.py:841
+#: forms.py:378 models.py:841
 msgid "Area"
 msgstr "Zone"
 
-#: extra-locales/chimere/models.py:49 extra-locales/chimere/models.py:123
-#: extra-locales/chimere/models.py:150 extra-locales/chimere/models.py:241
-#: extra-locales/chimere/models.py:441 extra-locales/chimere/models.py:810
-#: extra-locales/chimere/models.py:891
+#: models.py:49 models.py:123 models.py:150 models.py:241 models.py:441
+#: models.py:810 models.py:891
 msgid "Available"
 msgstr "Disponible"
 
-#: extra-locales/chimere/models.py:50
+#: models.py:50
 msgid "Date"
 msgstr "Date"
 
-#: extra-locales/chimere/models.py:56 extra-locales/chimere/models.py:57
-#: extra-locales/chimere/templates/chimere/blocks/welcome.html:5
+#: models.py:56 models.py:57
 msgid "News"
 msgstr "Nouvelle"
 
-#: extra-locales/chimere/models.py:62
+#: models.py:62
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: extra-locales/chimere/models.py:66
+#: models.py:66
 msgid "TinyUrl"
 msgstr "Mini-url"
 
-#: extra-locales/chimere/models.py:105 extra-locales/chimere/models.py:112
-#: extra-locales/chimere/models.py:152
+#: models.py:105 models.py:112 models.py:152
 msgid "Color theme"
 msgstr "Thème de couleur"
 
-#: extra-locales/chimere/models.py:110
+#: models.py:110
 msgid "Code"
 msgstr "Code"
 
-#: extra-locales/chimere/models.py:111 extra-locales/chimere/models.py:124
-#: extra-locales/chimere/models.py:154 extra-locales/chimere/models.py:482
-#: extra-locales/chimere/models.py:531 extra-locales/chimere/models.py:809
-#: extra-locales/chimere/models.py:878 extra-locales/chimere/models.py:890
+#: models.py:111 models.py:124 models.py:154 models.py:482 models.py:531
+#: models.py:809 models.py:878 models.py:890
 msgid "Order"
 msgstr "Ordre"
 
-#: extra-locales/chimere/models.py:117
+#: models.py:117
 msgid "Color"
 msgstr "Couleur"
 
-#: extra-locales/chimere/models.py:130 extra-locales/chimere/models.py:148
-#: extra-locales/chimere/templates/chimere/main_map.html:13
+#: models.py:130 models.py:148 templates/chimere/main_map.html:13
 msgid "Category"
 msgstr "Catégorie"
 
-#: extra-locales/chimere/models.py:136 extra-locales/chimere/models.py:433
-#: extra-locales/chimere/models.py:525 extra-locales/chimere/models.py:620
+#: models.py:136 models.py:433 models.py:525 models.py:620
 msgid "Image"
 msgstr "Image"
 
-#: extra-locales/chimere/models.py:138 extra-locales/chimere/models.py:527
-#: extra-locales/chimere/models.py:622
+#: models.py:138 models.py:527 models.py:622
 msgid "Height"
 msgstr "Hauteur"
 
-#: extra-locales/chimere/models.py:139 extra-locales/chimere/models.py:528
-#: extra-locales/chimere/models.py:623
+#: models.py:139 models.py:528 models.py:623
 msgid "Width"
 msgstr "Largeur"
 
-#: extra-locales/chimere/models.py:143 extra-locales/chimere/models.py:151
+#: models.py:143 models.py:151
 msgid "Icon"
 msgstr "Icône"
 
-#: extra-locales/chimere/models.py:155
+#: models.py:155
 msgid "Marker"
 msgstr "Point d'intérêt"
 
-#: extra-locales/chimere/models.py:156 extra-locales/chimere/models.py:616
-#: extra-locales/chimere/models.py:631
-#: extra-locales/chimere/templates/chimere/edit_route.html:27
+#: models.py:156 models.py:616 models.py:631
+#: templates/chimere/edit_route.html:27
 msgid "Route"
 msgstr "Trajet"
 
-#: extra-locales/chimere/models.py:157
+#: models.py:157
 msgid "Both"
 msgstr "Mixte"
 
-#: extra-locales/chimere/models.py:158
+#: models.py:158
 msgid "Item type"
 msgstr "Type d'élément"
 
-#: extra-locales/chimere/models.py:163
+#: models.py:163
 msgid "Sub-category"
 msgstr "Sous-catégorie"
 
-#: extra-locales/chimere/models.py:164
+#: models.py:164
 msgid "Sub-categories"
 msgstr "Sous-catégories"
 
-#: extra-locales/chimere/models.py:210
+#: models.py:210
 msgid "Importer type"
 msgstr "Type d'import"
 
-#: extra-locales/chimere/models.py:213 extra-locales/chimere/models.py:252
+#: models.py:213 models.py:252
 msgid "Source"
 msgstr "Source"
 
-#: extra-locales/chimere/models.py:215
+#: models.py:215
 msgid "Filter"
 msgstr "Filtre"
 
-#: extra-locales/chimere/models.py:218
+#: models.py:218
 msgid "Associated subcategories"
 msgstr "Sous-catégories associées"
 
-#: extra-locales/chimere/models.py:219
+#: models.py:219
 msgid "State"
 msgstr "État"
 
-#: extra-locales/chimere/models.py:221
+#: models.py:221
 msgid "SRID"
 msgstr "SRID"
 
-#: extra-locales/chimere/models.py:222
+#: models.py:222
 msgid "Zipped file"
 msgstr "Fichier zippé"
 
-#: extra-locales/chimere/models.py:225
+#: models.py:225
 msgid "Importer"
 msgstr "Import"
 
-#: extra-locales/chimere/models.py:234
+#: models.py:234
 msgid "Submitter session key"
 msgstr "Clé de session du demandeur"
 
-#: extra-locales/chimere/models.py:236
+#: models.py:236
 msgid "Submitter email"
 msgstr "Courriel du demandeur"
 
-#: extra-locales/chimere/models.py:238
+#: models.py:238
 msgid "Submitter comment"
 msgstr "Commentaire du demandeur"
 
-#: extra-locales/chimere/models.py:240
+#: models.py:240
 msgid "Submited"
 msgstr "Soumis"
 
-#: extra-locales/chimere/models.py:242
+#: models.py:242
 msgid "Modified"
 msgstr "Modifié"
 
-#: extra-locales/chimere/models.py:243
+#: models.py:243
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: extra-locales/chimere/models.py:244
+#: models.py:244
 msgid "Imported"
 msgstr "Importé"
 
-#: extra-locales/chimere/models.py:245
+#: models.py:245
 msgid "Excluded"
 msgstr "Exclu"
 
-#: extra-locales/chimere/models.py:247
+#: models.py:247
 msgid "Status"
 msgstr "État"
 
-#: extra-locales/chimere/models.py:248
+#: models.py:248
 msgid "Import key"
 msgstr "Clé d'import"
 
-#: extra-locales/chimere/models.py:250
+#: models.py:250
 msgid "Import version"
 msgstr "Version de l'import"
 
-#: extra-locales/chimere/models.py:255
-#: extra-locales/chimere/templates/chimere/edit.html:56
-#: extra-locales/chimere/templates/chimere/edit_route.html:52
+#: models.py:255 templates/chimere/edit.html:56
+#: templates/chimere/edit_route.html:52
 msgid "Start date"
 msgstr "Date de début"
 
-#: extra-locales/chimere/models.py:256
+#: models.py:256
 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"
 
-#: extra-locales/chimere/models.py:258
-#: extra-locales/chimere/templates/chimere/edit.html:62
-#: extra-locales/chimere/templates/chimere/edit_route.html:58
+#: models.py:258 templates/chimere/edit.html:62
+#: templates/chimere/edit_route.html:58
 msgid "End date"
 msgstr "Date de fin"
 
-#: extra-locales/chimere/models.py:259
+#: models.py:259
 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"
 
-#: extra-locales/chimere/models.py:291
+#: models.py:291
 msgid "Reference marker"
 msgstr "Point d'intérêt de référence"
 
-#: extra-locales/chimere/models.py:292
+#: models.py:292
 msgid "Localisation"
 msgstr "Localisation"
 
-#: extra-locales/chimere/models.py:294
+#: models.py:294
 msgid "Available Date"
 msgstr "Date de mise en disponibilité"
 
-#: extra-locales/chimere/models.py:298
-#: extra-locales/chimere/templates/chimere/edit.html:49
-#: extra-locales/chimere/templates/chimere/edit_route.html:46
+#: models.py:298 templates/chimere/edit.html:49
+#: templates/chimere/edit_route.html:46
 msgid "Description"
 msgstr "Description"
 
-#: extra-locales/chimere/models.py:337 extra-locales/chimere/models.py:913
+#: models.py:337 models.py:913
 msgid "Point of interest"
 msgstr "Point d'intérêt"
 
-#: extra-locales/chimere/models.py:431
+#: models.py:431
 msgid "Audio"
 msgstr "Audio"
 
-#: extra-locales/chimere/models.py:432
+#: models.py:432
 msgid "Video"
 msgstr "Vidéo"
 
-#: extra-locales/chimere/models.py:434
+#: models.py:434
 msgid "Other"
 msgstr "Autre"
 
-#: extra-locales/chimere/models.py:435
+#: models.py:435
 msgid "Media type"
 msgstr "Type de media"
 
-#: extra-locales/chimere/models.py:438
+#: models.py:438
 msgid "Mime type"
 msgstr "Type mime"
 
-#: extra-locales/chimere/models.py:440
+#: models.py:440
 msgid "Inside an iframe"
 msgstr "À l'intérieur d'un iframe"
 
-#: extra-locales/chimere/models.py:444
+#: models.py:444
 msgid "Multimedia type"
 msgstr "Type de multimedia"
 
-#: extra-locales/chimere/models.py:445
+#: models.py:445
 msgid "Multimedia types"
 msgstr "Types de multimedia"
 
-#: extra-locales/chimere/models.py:481
+#: models.py:481
 msgid "Url"
 msgstr "Url"
 
-#: extra-locales/chimere/models.py:484 extra-locales/chimere/models.py:529
+#: models.py:484 models.py:529
 msgid "Display inside the description?"
 msgstr "Apparaît dans la description ?"
 
-#: extra-locales/chimere/models.py:489
+#: models.py:489
 msgid "Multimedia file"
 msgstr "Fichier multimedia"
 
-#: extra-locales/chimere/models.py:538
+#: models.py:538
 msgid "Picture file"
 msgstr "Fichier d'image"
 
-#: extra-locales/chimere/models.py:556
+#: models.py:556
 msgid "Raw file (gpx or kml)"
 msgstr "Fichier brut (gpx ou kml)"
 
-#: extra-locales/chimere/models.py:557
+#: models.py:557
 msgid "Simplified file"
 msgstr "Fichier simplifié"
 
-#: extra-locales/chimere/models.py:559
+#: models.py:559
 msgid "KML"
 msgstr "KML"
 
-#: extra-locales/chimere/models.py:559
+#: models.py:559
 msgid "GPX"
 msgstr "GPX"
 
-#: extra-locales/chimere/models.py:564
+#: models.py:564
 msgid "Route file"
 msgstr "Fichier de trajet"
 
-#: extra-locales/chimere/models.py:565
+#: models.py:565
 msgid "Route files"
 msgstr "Fichiers de trajet"
 
-#: extra-locales/chimere/models.py:615
+#: models.py:615
 msgid "Reference route"
 msgstr "Trajet de référence"
 
-#: extra-locales/chimere/models.py:619
+#: models.py:619
 msgid "Associated file"
 msgstr "Fichier associé"
 
-#: extra-locales/chimere/models.py:793
+#: models.py:793
 msgid "Layer code"
 msgstr "Code pour la couche"
 
-#: extra-locales/chimere/models.py:799
+#: models.py:799
 msgid "Layer"
 msgstr "Couche"
 
-#: extra-locales/chimere/models.py:805
+#: models.py:805
 msgid "Area urn"
 msgstr "Urn de la zone"
 
-#: extra-locales/chimere/models.py:807
-#: extra-locales/chimere/templates/chimere/blocks/welcome.html:3
+#: models.py:807 templates/chimere/blocks/welcome.html:3
 msgid "Welcome message"
 msgstr "Message d'accueil"
 
-#: extra-locales/chimere/models.py:811
+#: models.py:811
 msgid "Upper left corner"
 msgstr "Coin en haut à gauche"
 
-#: extra-locales/chimere/models.py:813
+#: models.py:813
 msgid "Lower right corner"
 msgstr "Coin en bas à droite"
 
-#: extra-locales/chimere/models.py:815
+#: models.py:815
 msgid "Default area"
 msgstr "Zone par défaut"
 
-#: extra-locales/chimere/models.py:816
+#: models.py:816
 msgid "Only one area is set by default"
 msgstr "Seule une zone est définie par défaut"
 
-#: extra-locales/chimere/models.py:820
+#: models.py:820
 msgid "Sub-categories checked by default"
 msgstr "Sous-catégories cochées par défaut"
 
-#: extra-locales/chimere/models.py:822
+#: models.py:822
 msgid "Sub-categories dynamicaly displayed"
 msgstr "Sous-categories affichées dynamiquement"
 
-#: extra-locales/chimere/models.py:823
+#: models.py:823
 msgid ""
 "If checked, categories are only displayed in the menu if they are available "
 "on the current extent."
@@ -482,145 +461,145 @@ msgstr ""
 "Si coché, les catégories sont disponibles sur le menu seulement si elles "
 "apparaissent sur la zone affichée."
 
-#: extra-locales/chimere/models.py:827
+#: models.py:827
 msgid "Restricted to theses sub-categories"
 msgstr "Restreindre à ces sous-categories"
 
-#: extra-locales/chimere/models.py:828
+#: models.py:828
 msgid "If no sub-category is set all sub-categories are available"
 msgstr ""
 "Si aucune sous-catégorie n'est définie toutes les sous-catégories sont "
 "disponibles"
 
-#: extra-locales/chimere/models.py:830
+#: models.py:830
 msgid "Link to an external CSS"
 msgstr "Lien vers une feuille de style externe"
 
-#: extra-locales/chimere/models.py:832
+#: models.py:832
 msgid "Restrict to the area extent"
 msgstr "Restreindre à l'étendue de la zone"
 
-#: extra-locales/chimere/models.py:879
+#: models.py:879
 msgid "Default layer"
 msgstr "Couche par défaut"
 
-#: extra-locales/chimere/models.py:883 extra-locales/chimere/models.py:884
+#: models.py:883 models.py:884
 msgid "Layers"
 msgstr "Couches"
 
-#: extra-locales/chimere/models.py:892
+#: models.py:892
 msgid "Text"
 msgstr "Texte"
 
-#: extra-locales/chimere/models.py:893
+#: models.py:893
 msgid "Long text"
 msgstr "Texte long"
 
-#: extra-locales/chimere/models.py:894
+#: models.py:894
 msgid "Password"
 msgstr "Mot de passe"
 
-#: extra-locales/chimere/models.py:898
+#: models.py:898
 msgid "Type"
 msgstr "Type"
 
-#: extra-locales/chimere/models.py:903 extra-locales/chimere/models.py:915
+#: models.py:903 models.py:915
 msgid "Property model"
 msgstr "Modèle de propriété"
 
-#: extra-locales/chimere/models.py:916
+#: models.py:916
 msgid "Value"
 msgstr "Valeur"
 
-#: extra-locales/chimere/models.py:920
+#: models.py:920
 msgid "Property"
 msgstr "Propriété"
 
-#: extra-locales/chimere/tasks.py:47
+#: tasks.py:47
 msgid "Import pending"
 msgstr "Import en attente"
 
-#: extra-locales/chimere/tasks.py:48
+#: tasks.py:48
 msgid "Import processing"
 msgstr "Import en cours"
 
-#: extra-locales/chimere/tasks.py:49
+#: tasks.py:49
 msgid "Import successfuly done"
 msgstr "Import fait avec succès"
 
-#: extra-locales/chimere/tasks.py:50
+#: tasks.py:50
 #, python-format
 msgid " %(new)d new item(s), %(updated)d updated item(s)"
 msgstr " %(new)d nouveau(x) élément(s), %(updated)d élément(s) mis à jour"
 
-#: extra-locales/chimere/tasks.py:51
+#: tasks.py:51
 msgid "Import failed"
 msgstr "Import échoué"
 
-#: extra-locales/chimere/tasks.py:52
+#: tasks.py:52
 msgid "Import canceled"
 msgstr "Import annulé"
 
-#: extra-locales/chimere/tasks.py:53
+#: tasks.py:53
 msgid "Export pending"
 msgstr "Export en attente"
 
-#: extra-locales/chimere/tasks.py:54
+#: tasks.py:54
 msgid "Export processing"
 msgstr "Export en cours"
 
-#: extra-locales/chimere/tasks.py:55
+#: tasks.py:55
 msgid "Export successfuly done"
 msgstr "Export réalisé avec succès"
 
-#: extra-locales/chimere/tasks.py:56
+#: tasks.py:56
 #, python-format
 msgid " %(updated)d updated item(s)"
 msgstr " %(updated)d éléments mis à jour"
 
-#: extra-locales/chimere/tasks.py:57
+#: tasks.py:57
 msgid "Export failed"
 msgstr "Export échoué"
 
-#: extra-locales/chimere/tasks.py:58
+#: tasks.py:58
 msgid "Export canceled"
 msgstr "Export annulé"
 
-#: extra-locales/chimere/utils.py:104 extra-locales/chimere/utils.py:152
+#: utils.py:104 utils.py:152
 msgid "Bad zip file"
 msgstr "Mauvais fichier zip"
 
-#: extra-locales/chimere/utils.py:155
+#: utils.py:155
 msgid "Missing file(s) inside the zip file"
 msgstr "Fichier(s) manquant(s) dans l'archive zip"
 
-#: extra-locales/chimere/utils.py:284
+#: utils.py:284
 msgid "Error while reading the data source."
 msgstr "Erreur lors de la lecture de la source."
 
-#: extra-locales/chimere/utils.py:319
+#: utils.py:319
 msgid "Type of geographic item of this shapefile is not managed by Chimère."
 msgstr ""
 "Les types des éléments géographiques de ce fichier Shapefile ne sont pas "
 "gérés par Chimère."
 
-#: extra-locales/chimere/utils.py:400
+#: utils.py:400
 msgid "Could not create file!"
 msgstr "Ne peut pas créer le fichier !"
 
-#: extra-locales/chimere/utils.py:411
+#: utils.py:411
 msgid "Failed to create field"
 msgstr "Ne peut pas créer un champ"
 
-#: extra-locales/chimere/utils.py:482
+#: utils.py:482
 msgid "Nothing to import"
 msgstr "Rien à importer"
 
-#: extra-locales/chimere/utils.py:562
+#: utils.py:562
 msgid "New items imported - validate them before exporting"
 msgstr "Nouveaux éléments importés - valider ceux-ci avant d'exporter"
 
-#: extra-locales/chimere/utils.py:564
+#: utils.py:564
 msgid ""
 "There are items from a former import not yet validated - validate them "
 "before exporting"
@@ -628,23 +607,23 @@ msgstr ""
 "Il y a des éléments d'un import précédent pas encore validé - Validez les "
 "avant d'exporter"
 
-#: extra-locales/chimere/utils.py:574
+#: utils.py:574
 msgid "Bad param"
 msgstr "Mauvais paramètre"
 
-#: extra-locales/chimere/views.py:223
+#: views.py:223
 msgid "There are missing field(s) and/or errors in the submited form."
 msgstr "Il y a des champs manquants ou des erreurs dans ce formulaire."
 
-#: extra-locales/chimere/views.py:302
+#: views.py:302
 msgid "Bad file. Please check it with an external software."
 msgstr "Fichier incohérent. Merci de le vérifier avec un logiciel externe."
 
-#: extra-locales/chimere/views.py:424
+#: views.py:424
 msgid "Comments/request on the map"
 msgstr "Commentaires/requètes sur la carte"
 
-#: extra-locales/chimere/views.py:427
+#: views.py:427
 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."
@@ -653,48 +632,48 @@ msgstr ""
 "laissé votre courriel vous serez peut-être contacté bientôt pour plus de "
 "détails."
 
-#: extra-locales/chimere/views.py:431
+#: views.py:431
 msgid "Temporary error. Renew your message later."
 msgstr "Erreur temporaire. Réenvoyez votre message plus tard."
 
-#: extra-locales/chimere/views.py:562
+#: views.py:562
 msgid "No category available in this area."
 msgstr "Pas de catégorie disponible sur cette zone."
 
-#: extra-locales/chimere/views.py:669
+#: views.py:669
 msgid "Incorrect choice in the list"
 msgstr "Choix incorrect dans la liste"
 
-#: extra-locales/chimere/widgets.py:187
+#: widgets.py:187
 msgid "Latitude"
 msgstr "Latitude"
 
-#: extra-locales/chimere/widgets.py:187
+#: widgets.py:187
 msgid "Longitude"
 msgstr "Longitude"
 
-#: extra-locales/chimere/widgets.py:212
+#: widgets.py:212
 msgid "Invalid point"
 msgstr "Point invalide"
 
-#: extra-locales/chimere/widgets.py:262
+#: widgets.py:262
 msgid "Creation mode"
 msgstr "Mode création"
 
-#: extra-locales/chimere/widgets.py:263
+#: widgets.py:263
 msgid "To start drawing the route click on the toggle button: \"Draw\"."
 msgstr ""
 "Pour commencer le dessin cliquez sur le bouton&nbsp;: «&nbsp;Tracer&nbsp;»."
 
-#: extra-locales/chimere/widgets.py:265
+#: widgets.py:265
 msgid "Then click on the map to begin the drawing."
 msgstr "Puis cliquez sur la carte pour commencer le dessin."
 
-#: extra-locales/chimere/widgets.py:266
+#: widgets.py:266
 msgid "You can add points by clicking again."
 msgstr "Vous pouvez ajouter des points en cliquant de nouveau."
 
-#: extra-locales/chimere/widgets.py:267
+#: widgets.py:267
 msgid ""
 "To finish the drawing double click. When the drawing is finished you can "
 "edit it."
@@ -702,7 +681,7 @@ msgstr ""
 "Pour finir le tracé double-cliquez. Quand le tracé est fini vous pouvez "
 "toujours l'éditer."
 
-#: extra-locales/chimere/widgets.py:269
+#: widgets.py:269
 msgid ""
 "While creating to undo a drawing click again on the toggle button \"Stop "
 "drawing\"."
@@ -710,17 +689,17 @@ msgstr ""
 "En mode création vous pouvez annuler un tracé en appuyant sur le bouton "
 "«&nbsp;Arrêter le tracé&nbsp;»."
 
-#: extra-locales/chimere/widgets.py:274
+#: widgets.py:274
 msgid "Modification mode"
 msgstr "Mode modification"
 
-#: extra-locales/chimere/widgets.py:275
+#: widgets.py:275
 msgid "To move a point click on it and drag it to the desired position."
 msgstr ""
 "Pour bouger un point, cliquez dessus, maintenez le click pour le déposer à "
 "la position désirée."
 
-#: extra-locales/chimere/widgets.py:276
+#: widgets.py:276
 msgid ""
 "To delete a point move the mouse cursor over it and press the \"d\" or \"Del"
 "\" key."
@@ -728,7 +707,7 @@ msgstr ""
 "Pour supprimer un point, mettez le curseur de la souris sur celui-ci et "
 "appuyez sur le touche «&nbsp;d&nbsp;» ou «&nbsp;Suppr&nbsp;»."
 
-#: extra-locales/chimere/widgets.py:278
+#: widgets.py:278
 msgid ""
 "To add a point click in the middle of a segment and drag the new point to "
 "the desired position"
@@ -737,179 +716,174 @@ msgstr ""
 "maintenez le bouton appuyé et déplacez le nouveau point à la position "
 "désirée."
 
-#: extra-locales/chimere/widgets.py:285
+#: widgets.py:285
 msgid "Give a name and set category before uploading a file."
 msgstr ""
 "Renseignez le nom et choisissez au moins une catégorie avant de déposer un "
 "fichier."
 
-#: extra-locales/chimere/widgets.py:288
+#: widgets.py:288
 msgid "Upload a route file (GPX or KML)"
 msgstr "Déposer un trajet (fichier GPX ou KML)"
 
-#: extra-locales/chimere/widgets.py:289
+#: widgets.py:289
 msgid "or"
 msgstr "ou"
 
-#: extra-locales/chimere/widgets.py:294
+#: widgets.py:294
 msgid "Start \"hand\" drawing"
 msgstr "Commencer le tracé manuellement"
 
-#: extra-locales/chimere/widgets.py:317
+#: widgets.py:317
 msgid "Move on the map"
 msgstr "Se déplacer"
 
-#: extra-locales/chimere/widgets.py:317
+#: widgets.py:317
 msgid "Draw"
 msgstr "Tracer"
 
-#: extra-locales/chimere/widgets.py:442
+#: widgets.py:442
 msgid "Select..."
 msgstr "Sélectionner..."
 
-#: extra-locales/chimere/templates/404.html:10
+#: templates/404.html:10
 msgid "Page not found"
 msgstr "Page non trouvée"
 
-#: extra-locales/chimere/templates/500.html:10
+#: templates/500.html:10
 msgid "Internal server error"
 msgstr "Erreur interne du serveur"
 
-#: extra-locales/chimere/templates/admin/base_site.html:4
-#: extra-locales/chimere/templates/admin/base_site.html:7
+#: templates/admin/base_site.html:4 templates/admin/base_site.html.py:7
 msgid "Administration de Chimère"
 msgstr "Administration de Chimère"
 
-#: extra-locales/chimere/templates/chimere/base.html:18
+#: templates/chimere/base.html:18
 msgid "You must enable JavaScript in your browser to display Chimère."
 msgstr ""
 "Vous devez activer le JavaScript dans votre navigateur pour afficher Chimère."
 
-#: extra-locales/chimere/templates/chimere/contactus.html:16
+#: templates/chimere/contactus.html:16
 msgid ""
 "If you have some requests or remarks about this site you can leave them here."
 msgstr ""
 "Si vous avez des requètes, des remarques à propos de ce site vous pouvez "
 "nous laisser un commentaire ici."
 
-#: extra-locales/chimere/templates/chimere/contactus.html:19
+#: templates/chimere/contactus.html:19
 msgid "Submit"
 msgstr "Proposer"
 
-#: extra-locales/chimere/templates/chimere/detail.html:16
+#: templates/chimere/detail.html:16
 msgid "Date:"
 msgstr "Date :"
 
-#: extra-locales/chimere/templates/chimere/detail.html:26
+#: templates/chimere/detail.html:26
 msgid "Show multimedia gallery"
 msgstr "Montrer la galerie multimedia"
 
-#: extra-locales/chimere/templates/chimere/detail.html:29
+#: templates/chimere/detail.html:29
 msgid "Share on"
 msgstr "Partager sur"
 
-#: extra-locales/chimere/templates/chimere/detail.html:33
+#: templates/chimere/detail.html:33
 msgid "Share"
 msgstr "Partager"
 
-#: extra-locales/chimere/templates/chimere/detail.html:37
+#: templates/chimere/detail.html:37
 msgid "Submit a modification"
 msgstr "Proposer une modification"
 
-#: extra-locales/chimere/templates/chimere/edit.html:20
+#: templates/chimere/edit.html:20
 msgid "Error"
 msgstr "Erreur"
 
-#: extra-locales/chimere/templates/chimere/edit.html:24
+#: templates/chimere/edit.html:24
 msgid "Add/modify a site"
 msgstr "Ajouter ou modifier un site"
 
-#: extra-locales/chimere/templates/chimere/edit.html:30
+#: templates/chimere/edit.html:30
 msgid "Point"
 msgstr "Point"
 
-#: extra-locales/chimere/templates/chimere/edit.html:31
-#: extra-locales/chimere/templates/chimere/edit_route.html:28
+#: templates/chimere/edit.html:31 templates/chimere/edit_route.html:28
 msgid "Select a location for this new site"
 msgstr "Choisissez une localisation pour ce nouveau site"
 
-#: extra-locales/chimere/templates/chimere/edit.html:37
-#: extra-locales/chimere/templates/chimere/edit_route.html:34
+#: templates/chimere/edit.html:37 templates/chimere/edit_route.html:34
 msgid "indicates a mandatory field"
 msgstr "indique un champ obligatoire"
 
-#: extra-locales/chimere/templates/chimere/edit.html:44
-#: extra-locales/chimere/templates/chimere/edit_route.html:41
+#: templates/chimere/edit.html:44 templates/chimere/edit_route.html:41
 msgid "Categories"
 msgstr "Catégories"
 
-#: extra-locales/chimere/templates/chimere/edit.html:86
-#: extra-locales/chimere/templates/chimere/edit_route.html:77
+#: templates/chimere/edit.html:86 templates/chimere/edit_route.html:77
 msgid "Propose"
 msgstr "Proposez"
 
-#: extra-locales/chimere/templates/chimere/edit_route.html:21
+#: templates/chimere/edit_route.html:21
 msgid "Add/modify a route"
 msgstr "Ajout ou modifier un trajet"
 
-#: extra-locales/chimere/templates/chimere/main_map_simple.html:10
+#: templates/chimere/main_map_simple.html:10
 msgid "Topics"
 msgstr "Thèmes"
 
-#: extra-locales/chimere/templates/chimere/upload_file.html:13
+#: templates/chimere/upload_file.html:13
 msgid "Thank you for your submission!"
 msgstr "Merci pour votre proposition !"
 
-#: extra-locales/chimere/templates/chimere/upload_file.html:17
+#: templates/chimere/upload_file.html:17
 msgid "Upload a file"
 msgstr "Déposer un fichier"
 
-#: extra-locales/chimere/templates/chimere/upload_file.html:46
+#: templates/chimere/upload_file.html:46
 msgid "Upload"
 msgstr "Déposer"
 
-#: extra-locales/chimere/templates/chimere/blocks/areas.html:4
+#: templates/chimere/blocks/areas.html:4
 msgid "Areas:"
 msgstr "Zones :"
 
-#: extra-locales/chimere/templates/chimere/blocks/areas_alternative.html:4
+#: templates/chimere/blocks/areas_alternative.html:4
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: extra-locales/chimere/templates/chimere/blocks/areas_alternative.html:7
-#: extra-locales/chimere/templates/chimere/blocks/categories.html:8
-#: extra-locales/chimere/templates/chimere/blocks/categories.html:17
+#: templates/chimere/blocks/areas_alternative.html:7
+#: templates/chimere/blocks/categories.html:8
+#: templates/chimere/blocks/categories.html:17
 msgid "Zoom to"
 msgstr "Zoomer sur"
 
-#: extra-locales/chimere/templates/chimere/blocks/categories.html:21
+#: templates/chimere/blocks/categories.html:21
 msgid "Tell me more..."
 msgstr "En savoir plus..."
 
-#: extra-locales/chimere/templates/chimere/blocks/categories.html:27
+#: templates/chimere/blocks/categories.html:27
 msgid "Display markers and routes waiting for validation"
 msgstr ""
 "Afficher les points remarquables et les trajets en attente de validation"
 
-#: extra-locales/chimere/templates/chimere/blocks/footer.html:2
+#: templates/chimere/blocks/footer.html:2
 msgid "This site uses Chimère"
 msgstr "Ce site utilise Chimère"
 
-#: extra-locales/chimere/templates/chimere/blocks/footer.html:2
+#: templates/chimere/blocks/footer.html:2
 msgid "Map"
 msgstr "Carte"
 
-#: extra-locales/chimere/templates/chimere/blocks/map_params.html:6
+#: templates/chimere/blocks/map_params.html:6
 msgid "Permalink"
 msgstr "Lien permanent"
 
-#: extra-locales/chimere/templates/chimere/blocks/multimedia_file.html:19
+#: templates/chimere/blocks/multimedia_file.html:19
 msgid "Please use a modern browser or install the non free Flash-Plugin."
 msgstr ""
 "Utilisez un navigateur internet plus récent ou installez le greffon non "
 "libre Flash."
 
-#: extra-locales/chimere/templates/chimere/blocks/submited.html:3
+#: templates/chimere/blocks/submited.html:3
 msgid ""
 "Your new proposition/modification has been submited. A moderator will treat "
 "your submission shortly. Thanks!"
@@ -917,57 +891,59 @@ msgstr ""
 "Votre proposition/modification a été soumise. Un modérateur va traiter votre "
 "proposition sous peu. Merci !"
 
-#: extra-locales/chimere/templates/chimere/blocks/submited.html:8
+#: templates/chimere/blocks/submited.html:8
 msgid "Thank you"
 msgstr "Merci"
 
-#: extra-locales/chimere/templates/chimere/blocks/submited.html:11
+#: templates/chimere/blocks/submited.html:11
 msgid "Add a new item"
 msgstr "Ajout d'un nouvel élément"
 
-#: extra-locales/chimere/templates/chimere/blocks/submited.html:15
+#: templates/chimere/blocks/submited.html:15
 msgid "Continue edition of this item"
 msgstr "Continuer l'édition de cet élément"
 
-#: extra-locales/chimere/templates/chimere/blocks/submited.html:19
+#: templates/chimere/blocks/submited.html:19
 msgid "Return to the map"
 msgstr "Retourner à la carte"
 
-#: extra-locales/chimere/templates/chimere/blocks/welcome.html:47
+#: templates/chimere/blocks/welcome.html:5
+msgid "Welcome"
+msgstr "Accueil"
+
+#: templates/chimere/blocks/welcome.html:47
 msgid "See it on the map"
 msgstr "Voir sur la carte"
 
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:13
+#: templates/chimere/feeds/rss.html:13
 msgid "Subscribe to RSS feed"
 msgstr "Souscrire à un flux RSS"
 
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:20
+#: templates/chimere/feeds/rss.html:20
 msgid "Type of RSS feed"
 msgstr "Type de flux RSS"
 
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:23
+#: templates/chimere/feeds/rss.html:23
 msgid "All new points of interest"
 msgstr "Tous les nouveaux points d'intérêt"
 
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:24
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:31
+#: templates/chimere/feeds/rss.html:24 templates/chimere/feeds/rss.html:31
 msgid "New points of interest by category"
 msgstr "Les nouveaux points d'intérêt par catégorie"
 
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:25
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:47
+#: templates/chimere/feeds/rss.html:25 templates/chimere/feeds/rss.html:47
 msgid "New points of interest by area"
 msgstr "Les nouveaux points d'intérêt par zone"
 
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:33
+#: templates/chimere/feeds/rss.html:33
 msgid "Choose a category"
 msgstr "Choisir une catégorie"
 
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:50
+#: templates/chimere/feeds/rss.html:50
 msgid "Choose a pre-defined areas"
 msgstr "Choisir une zone pré-définie"
 
-#: extra-locales/chimere/templates/chimere/feeds/rss.html:64
+#: templates/chimere/feeds/rss.html:64
 msgid "Or select the area by zooming and panning this map"
 msgstr "Ou sélectionner une zone en zoomant et en se déplaçant sur cette carte"
 
diff --git a/chimere/templates/chimere/blocks/welcome.html b/chimere/templates/chimere/blocks/welcome.html
index 9751552..abbf910 100644
--- a/chimere/templates/chimere/blocks/welcome.html
+++ b/chimere/templates/chimere/blocks/welcome.html
@@ -2,7 +2,7 @@
 {% if news_lst or welcome_message %}
 <a href='#' id='welcome_button' class='ui-widget ui-button ui-state-default ui-corner-all'>{% trans "Welcome message"%}</a>
 <script type='text/javascript'>
-function display_welcome(){$("#welcome").dialog({title:"{% trans "News"%}",
+function display_welcome(){$("#welcome").dialog({title:"{% trans "Welcome"%}",
                                                  width:360});}
 $("#welcome_button").bind('click', display_welcome);
 {% if display %}display_welcome();{%endif%}