Merge branch 'master' into saclay

Conflicts:
	chimere/admin.py
	chimere/fixtures/initial_data.json
	chimere/forms.py
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/models.py
	chimere/static/chimere/css/styles.css
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/views.py
	chimere/widgets.py

1 files changed, 277 insertions, 197 deletions

diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po
index 9973efb..5956c20 100644
--- a/chimere/locale/fr/LC_MESSAGES/django.po
+++ b/chimere/locale/fr/LC_MESSAGES/django.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-02 19:08+0200\n"
+"POT-Creation-Date: 2012-10-14 16:46+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"
 
-#: __init__.py:8 models.py:677
+#: __init__.py:8 models.py:734
 msgid "Multimedia files"
 msgstr "Fichiers multimedias"
 
-#: __init__.py:9 models.py:733
+#: __init__.py:9 models.py:790
 msgid "Picture files"
 msgstr "Fichiers d'image"
 
@@ -45,510 +45,545 @@ msgstr "Flux RSS"
 msgid "Contact us"
 msgstr "Nous contacter"
 
-#: admin.py:64 templates/chimere/feeds/rss.html:69
+#: admin.py:53 templates/chimere/feeds/rss.html:69
 msgid "Validate"
 msgstr "Valider"
 
-#: admin.py:75
+#: admin.py:64
 msgid "Export to KML"
 msgstr "Exporter en KML"
 
-#: admin.py:89
+#: admin.py:78
 msgid "Export to Shapefile"
 msgstr "Exporter en Shapefile"
 
-#: admin.py:99
+#: admin.py:88
 msgid "Export to CSV"
 msgstr "Exporter en CSV"
 
-#: admin.py:182
+#: admin.py:174
 msgid "Import"
 msgstr "Import"
 
-#: admin.py:188
+#: admin.py:180
 msgid "Cancel import"
 msgstr "Annuler l'import"
 
-#: admin.py:194
+#: admin.py:186
 msgid "Cancel export"
 msgstr "Annuler l'export"
 
-#: admin.py:202
+#: admin.py:194
 msgid "Export to osm"
 msgstr "Exporter vers osm"
 
-#: feeds.py:124 feeds.py:211
+#: feeds.py:128 feeds.py:215
 msgid "Last points of interest"
 msgstr "Derniers points d'intérêt"
 
-#: feeds.py:130
+#: feeds.py:134
 msgid "Latest points of interest from "
 msgstr "Nouveaux points d'intérêt de "
 
-#: feeds.py:176
+#: feeds.py:180
 msgid "Last points of interest by area"
 msgstr "Nouveaux points d'intérêt par zone"
 
-#: forms.py:82
+#: forms.py:83
 msgid "New submission for"
 msgstr "Nouvelle proposition pour"
 
-#: forms.py:83
+#: forms.py:84
 #, 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 : "
 
-#: forms.py:85
+#: forms.py:86
 msgid "To valid, precise or unvalid this item: "
 msgstr "Pour valider, préciser ou rejeter cet élément : "
 
-#: forms.py:95
+#: forms.py:96
 msgid "Email (optional)"
 msgstr "Courriel (optionnel) "
 
-#: forms.py:96
+#: forms.py:97
 msgid "Object"
 msgstr "Objet"
 
-#: forms.py:183
+#: forms.py:136
+msgid "Shapefiles must be provided in a zipped archive."
+msgstr ""
+"Les fichiers Shapefiles doivent être fournis regroupés dans une archive zip."
+
+#: forms.py:140
+msgid "You have to set \"source\" or \"source file\" but not both."
+msgstr ""
+"Vous devez spécifier le champ « Source » ou « Fichier source » mais pas les "
+"deux."
+
+#: forms.py:145
+msgid "You have to set \"source\" or \"source file\"."
+msgstr "Vous devez spécifier le champ « Source » ou « Fichier source »."
+
+#: forms.py:204
 msgid "End date has been set with no start date"
 msgstr "Une date de fin a été donnée sans date de début"
 
-#: forms.py:194
+#: forms.py:215
 msgid "This field is mandatory for the selected categories"
 msgstr "Ce champ est obligatoire pour les catégories sélectionnées"
 
-#: forms.py:441
+#: forms.py:478
 msgid "File"
 msgstr "Fichier"
 
-#: forms.py:447
+#: forms.py:484
 msgid "Bad file format: this must be a GPX or KML file"
 msgstr "Mauvais format de fichier : KML et GPX sont supportés"
 
-#: forms.py:452 models.py:50 models.py:98 models.py:158 models.py:179
-#: models.py:192 models.py:206 models.py:324 models.py:611 models.py:667
-#: models.py:710 models.py:826 models.py:1119 models.py:1131 models.py:1216
-#: utils.py:444 templates/chimere/edit.html:39
+#: forms.py:489 models.py:53 models.py:101 models.py:163 models.py:184
+#: models.py:197 models.py:212 models.py:352 models.py:668 models.py:724
+#: models.py:767 models.py:883 models.py:1199 models.py:1211 models.py:1384
+#: utils.py:454 templates/chimere/edit.html:39
 #: templates/chimere/edit_route.html:36
 #: templates/chimere/blocks/alternate_multimedia.html:39
 msgid "Name"
 msgstr "Nom"
 
-#: forms.py:461 models.py:1168
+#: forms.py:498 models.py:1248
 msgid "Area"
 msgstr "Zone"
 
-#: forms.py:520
+#: forms.py:558
 msgid "Start"
 msgstr "Départ"
 
-#: forms.py:521
+#: forms.py:559
 msgid "Finish"
 msgstr "Arrivée :"
 
-#: forms.py:522
+#: forms.py:560
 msgid "Speed"
 msgstr "Vitesse"
 
-#: models.py:51
+#: models.py:54
 msgid "Mnemonic"
 msgstr "Mnémonique"
 
-#: models.py:53 models.py:99 models.py:180 models.py:207 models.py:335
-#: models.py:615 models.py:1137 models.py:1218 models.py:1259
+#: models.py:56 models.py:102 models.py:185 models.py:213 models.py:363
+#: models.py:672 models.py:1217 models.py:1386 models.py:1427
 msgid "Available"
 msgstr "Disponible"
 
-#: models.py:54 models.py:168 models.py:181 models.py:215 models.py:669
-#: models.py:725 models.py:1136 models.py:1205 models.py:1217
+#: models.py:57 models.py:173 models.py:186 models.py:223 models.py:726
+#: models.py:782 models.py:1216 models.py:1373 models.py:1385
 msgid "Order"
 msgstr "Ordre"
 
-#: models.py:55
+#: models.py:58
 msgid "Template path"
 msgstr "Chemin du patron"
 
-#: models.py:62 models.py:63
+#: models.py:65 models.py:66
 msgid "Page"
 msgstr "Page"
 
-#: models.py:100 models.py:401
+#: models.py:103 models.py:443
 msgid "Is front page"
 msgstr "Est en page principale"
 
-#: models.py:102 models.py:1227
+#: models.py:105 models.py:1395
 msgid "Date"
 msgstr "Date"
 
-#: models.py:104 models.py:668
+#: models.py:107 models.py:725
 msgid "Url"
 msgstr "Url"
 
-#: models.py:109 models.py:110 templates/chimere/blocks/news.html:3
+#: models.py:108
+msgid "Associated areas"
+msgstr "Zones associées"
+
+#: models.py:114 models.py:115 templates/chimere/blocks/news.html:3
 #: templates/chimere/blocks/news.html:5
 msgid "News"
 msgstr "Nouvelle"
 
-#: models.py:119
+#: models.py:124
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: models.py:123
+#: models.py:128
 msgid "TinyUrl"
 msgstr "Mini-url"
 
-#: models.py:162 models.py:169 models.py:213
+#: models.py:167 models.py:174 models.py:221
 msgid "Color theme"
 msgstr "Thème de couleur"
 
-#: models.py:167
+#: models.py:172
 msgid "Code"
 msgstr "Code"
 
-#: models.py:174
+#: models.py:179
 msgid "Color"
 msgstr "Couleur"
 
-#: models.py:187 models.py:205 templates/chimere/main_map.html:13
+#: models.py:192 models.py:210 templates/chimere/main_map.html:13
 msgid "Category"
 msgstr "Catégorie"
 
-#: models.py:193 models.py:607 models.py:711 models.py:891
+#: models.py:198 models.py:664 models.py:768 models.py:949
 #: templates/chimere/blocks/alternate_multimedia.html:43
 msgid "Image"
 msgstr "Image"
 
-#: models.py:195 models.py:713 models.py:893
+#: models.py:200 models.py:770 models.py:951
 msgid "Height"
 msgstr "Hauteur"
 
-#: models.py:196 models.py:714 models.py:894
+#: models.py:201 models.py:771 models.py:952
 msgid "Width"
 msgstr "Largeur"
 
-#: models.py:200 models.py:210
+#: models.py:205 models.py:218
 msgid "Icon"
 msgstr "Icône"
 
-#: models.py:208
+#: models.py:214
 msgid "Available for submission"
 msgstr "Disponible pour soumission"
 
-#: models.py:211
+#: models.py:216
+msgid "Displayed in the layer menu"
+msgstr "Apparaît dans le menu des couches ?"
+
+#: models.py:219
 msgid "Hover icon"
 msgstr "Icône en survol"
 
-#: models.py:216
+#: models.py:224
 msgid "Is dated"
 msgstr "Est daté"
 
-#: models.py:217
+#: models.py:225
 msgid "Marker"
 msgstr "Point d'intérêt"
 
-#: models.py:218 models.py:887 models.py:902
+#: models.py:226 models.py:945 models.py:960
 #: templates/chimere/edit_route.html:27
 msgid "Route"
 msgstr "Trajet"
 
-#: models.py:219
+#: models.py:227
 msgid "Both"
 msgstr "Mixte"
 
-#: models.py:220
+#: models.py:228
 msgid "Item type"
 msgstr "Type d'élément"
 
-#: models.py:226
+#: models.py:234
 msgid "Sub-category"
 msgstr "Sous-catégorie"
 
-#: models.py:227
+#: models.py:235
 msgid "Sub-categories"
 msgstr "Sous-catégories"
 
-#: models.py:297
+#: models.py:311
 msgid "Importer type"
 msgstr "Type d'import"
 
-#: models.py:300 models.py:346
+#: models.py:314 models.py:374
 msgid "Source"
 msgstr "Source"
 
-#: models.py:302
+#: models.py:316
+msgid "Source file"
+msgstr "Fichier source"
+
+#: models.py:318
 msgid "Filter"
 msgstr "Filtre"
 
-#: models.py:304
+#: models.py:320
 msgid "Name by default"
 msgstr "Nom par défaut"
 
-#: models.py:307
-msgid "Associated subcategories"
-msgstr "Sous-catégories associées"
-
-#: models.py:308 utils.py:447
-msgid "State"
-msgstr "État"
-
-#: models.py:310
+#: models.py:322
 msgid "SRID"
 msgstr "SRID"
 
-#: models.py:311
+#: models.py:323
 msgid "Zipped file"
 msgstr "Fichier zippé"
 
-#: models.py:314
+#: models.py:324 models.py:380
+msgid "Origin"
+msgstr "Origine"
+
+#: models.py:326 models.py:382
+msgid "License"
+msgstr "Licence"
+
+#: models.py:329
+msgid "Associated subcategories"
+msgstr "Sous-catégories associées"
+
+#: models.py:330 utils.py:458
+msgid "State"
+msgstr "État"
+
+#: models.py:334
 msgid "Importer"
 msgstr "Import"
 
-#: models.py:326
+#: models.py:354
 msgid "Submitter session key"
 msgstr "Clé de session du demandeur"
 
-#: models.py:328
+#: models.py:356
 msgid "Submitter name or nickname"
 msgstr "Nom ou pseudo du demandeur"
 
-#: models.py:330
+#: models.py:358
 msgid "Submitter email"
 msgstr "Courriel du demandeur"
 
-#: models.py:332
+#: models.py:360
 msgid "Submitter comment"
 msgstr "Commentaire du demandeur"
 
-#: models.py:334
+#: models.py:362
 msgid "Submited"
 msgstr "Soumis"
 
-#: models.py:336
+#: models.py:364
 msgid "Modified"
 msgstr "Modifié"
 
-#: models.py:337
+#: models.py:365
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: models.py:338
+#: models.py:366
 msgid "Imported"
 msgstr "Importé"
 
-#: models.py:339
+#: models.py:367
 msgid "Excluded"
 msgstr "Exclu"
 
-#: models.py:341
+#: models.py:369
 msgid "Status"
 msgstr "État"
 
-#: models.py:342
+#: models.py:370
 msgid "Import key"
 msgstr "Clé d'import"
 
-#: models.py:344
+#: models.py:372
 msgid "Import version"
 msgstr "Version de l'import"
 
-#: models.py:348
+#: models.py:376
 msgid "Modified since last import"
 msgstr "Modifié depuis le dernier import"
 
-#: models.py:350
+#: models.py:378
 msgid "Not to be imported inside OSM"
 msgstr "Ne pas importer dans OSM"
 
-#: models.py:353 templates/chimere/edit.html:56
+#: models.py:385 templates/chimere/edit.html:56
 #: templates/chimere/edit_route.html:52
 msgid "Start date"
 msgstr "Date de début"
 
-#: models.py:354
+#: models.py:386
 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"
 
-#: models.py:356 templates/chimere/edit.html:62
+#: models.py:388 templates/chimere/edit.html:62
 #: templates/chimere/edit_route.html:58
 msgid "End date"
 msgstr "Date de fin"
 
-#: models.py:357
+#: models.py:389
 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"
 
-#: models.py:393
+#: models.py:435
 msgid "Reference marker"
 msgstr "Point d'intérêt de référence"
 
-#: models.py:394 utils.py:449 utils.py:450
+#: models.py:436 utils.py:460
 msgid "Localisation"
 msgstr "Localisation"
 
-#: models.py:396
+#: models.py:438
 msgid "Available Date"
 msgstr "Date de mise en disponibilité"
 
-#: models.py:400 utils.py:448 templates/chimere/edit.html:49
+#: models.py:442 utils.py:459 templates/chimere/edit.html:49
 #: templates/chimere/edit_route.html:46
 msgid "Description"
 msgstr "Description"
 
-#: models.py:461 models.py:1269
+#: models.py:506 models.py:1437
 msgid "Point of interest"
 msgstr "Point d'intérêt"
 
-#: models.py:605
+#: models.py:662
 msgid "Audio"
 msgstr "Audio"
 
-#: models.py:606
+#: models.py:663
 msgid "Video"
 msgstr "Vidéo"
 
-#: models.py:608
+#: models.py:665
 msgid "Other"
 msgstr "Autre"
 
-#: models.py:609
+#: models.py:666
 msgid "Media type"
 msgstr "Type de media"
 
-#: models.py:612
+#: models.py:669
 msgid "Mime type"
 msgstr "Type mime"
 
-#: models.py:614
+#: models.py:671
 msgid "Inside an iframe"
 msgstr "À l'intérieur d'un iframe"
 
-#: models.py:618
+#: models.py:675
 msgid "Multimedia type"
 msgstr "Type de multimedia"
 
-#: models.py:619
+#: models.py:676
 msgid "Multimedia types"
 msgstr "Types de multimedia"
 
-#: models.py:654
+#: models.py:711
 msgid "Extension name"
 msgstr "Nom de l'extension"
 
-#: models.py:656
+#: models.py:713
 msgid "Associated multimedia type"
 msgstr "Type de multimedia associé"
 
-#: models.py:660
+#: models.py:717
 msgid "Multimedia extension"
 msgstr "Extension de fichier multimedia"
 
-#: models.py:661
+#: models.py:718
 msgid "Multimedia extensions"
 msgstr "Extensions de fichier multimedia"
 
-#: models.py:671 models.py:715
+#: models.py:728 models.py:772
 msgid "Display inside the description?"
 msgstr "Apparaît dans la description ?"
 
-#: models.py:676
+#: models.py:733
 msgid "Multimedia file"
 msgstr "Fichier multimedia"
 
-#: models.py:717
+#: models.py:774
 msgid "Thumbnail"
 msgstr "Miniature"
 
-#: models.py:721
+#: models.py:778
 msgid "Thumbnail height"
 msgstr "Hauteur de la miniature"
 
-#: models.py:723
+#: models.py:780
 msgid "Thumbnail width"
 msgstr "Largeur de la miniature"
 
-#: models.py:732
+#: models.py:789
 msgid "Picture file"
 msgstr "Fichier d'image"
 
-#: models.py:827
+#: models.py:884
 msgid "Raw file (gpx or kml)"
 msgstr "Fichier brut (gpx ou kml)"
 
-#: models.py:828
+#: models.py:886
 msgid "Simplified file"
 msgstr "Fichier simplifié"
 
-#: models.py:830
+#: models.py:888
 msgid "KML"
 msgstr "KML"
 
-#: models.py:830
+#: models.py:888
 msgid "GPX"
 msgstr "GPX"
 
-#: models.py:835
+#: models.py:893
 msgid "Route file"
 msgstr "Fichier de trajet"
 
-#: models.py:836
+#: models.py:894
 msgid "Route files"
 msgstr "Fichiers de trajet"
 
-#: models.py:886
+#: models.py:944
 msgid "Reference route"
 msgstr "Trajet de référence"
 
-#: models.py:890
+#: models.py:948
 msgid "Associated file"
 msgstr "Fichier associé"
 
-#: models.py:1120
+#: models.py:1200
 msgid "Layer code"
 msgstr "Code pour la couche"
 
-#: models.py:1126
+#: models.py:1206
 msgid "Layer"
 msgstr "Couche"
 
-#: models.py:1132
+#: models.py:1212
 msgid "Area urn"
 msgstr "Urn de la zone"
 
-#: models.py:1134 templates/chimere/blocks/welcome.html:3
+#: models.py:1214 templates/chimere/blocks/welcome.html:3
 msgid "Welcome message"
 msgstr "Message d'accueil"
 
-#: models.py:1138
+#: models.py:1218
 msgid "Upper left corner"
 msgstr "Coin en haut à gauche"
 
-#: models.py:1140
+#: models.py:1220
 msgid "Lower right corner"
 msgstr "Coin en bas à droite"
 
-#: models.py:1142
+#: models.py:1222
 msgid "Default area"
 msgstr "Zone par défaut"
 
-#: models.py:1143
+#: models.py:1223
 msgid "Only one area is set by default"
 msgstr "Seule une zone est définie par défaut"
 
-#: models.py:1147
+#: models.py:1227
 msgid "Sub-categories checked by default"
 msgstr "Sous-catégories cochées par défaut"
 
-#: models.py:1149
+#: models.py:1229
 msgid "Sub-categories dynamicaly displayed"
 msgstr "Sous-categories affichées dynamiquement"
 
-#: models.py:1150
+#: models.py:1230
 msgid ""
 "If checked, categories are only displayed in the menu if they are available "
 "on the current extent."
@@ -556,76 +591,76 @@ msgstr ""
 "Si coché, les catégories sont disponibles sur le menu seulement si elles "
 "apparaissent sur la zone affichée."
 
-#: models.py:1154 models.py:1221
+#: models.py:1234 models.py:1389
 msgid "Restricted to theses sub-categories"
 msgstr "Restreindre à ces sous-categories"
 
-#: models.py:1155
+#: models.py:1235
 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"
 
-#: models.py:1157
+#: models.py:1237
 msgid "Link to an external CSS"
 msgstr "Lien vers une feuille de style externe"
 
-#: models.py:1159
+#: models.py:1239
 msgid "Restrict to the area extent"
 msgstr "Restreindre à l'étendue de la zone"
 
-#: models.py:1206
+#: models.py:1374 widgets.py:86
 msgid "Default layer"
 msgstr "Couche par défaut"
 
-#: models.py:1210 models.py:1211
+#: models.py:1378 models.py:1379
 msgid "Layers"
 msgstr "Couches"
 
-#: models.py:1219
+#: models.py:1387
 msgid "Mandatory"
 msgstr "Obligatoire"
 
-#: models.py:1222
+#: models.py:1390
 msgid ""
 "If no sub-category is set all the property applies to all sub-categories"
 msgstr ""
 "Si aucune sous-catégorie n'est précisée, cette propriété est disponible pour "
 "toutes les sous-catégories"
 
-#: models.py:1224
+#: models.py:1392
 msgid "Text"
 msgstr "Texte"
 
-#: models.py:1225
+#: models.py:1393
 msgid "Long text"
 msgstr "Texte long"
 
-#: models.py:1226
+#: models.py:1394
 msgid "Password"
 msgstr "Mot de passe"
 
-#: models.py:1228
+#: models.py:1396
 msgid "Choices"
 msgstr "Choix"
 
-#: models.py:1236
+#: models.py:1404
 msgid "Type"
 msgstr "Type"
 
-#: models.py:1241 models.py:1257 models.py:1271
+#: models.py:1409 models.py:1425 models.py:1439
 msgid "Property model"
 msgstr "Modèle de propriété"
 
-#: models.py:1258 models.py:1272
+#: models.py:1426 models.py:1440
 msgid "Value"
 msgstr "Valeur"
 
-#: models.py:1264
+#: models.py:1432
 msgid "Model property choice"
 msgstr "Choix pour les modèles de propriété"
 
-#: models.py:1283
+#: models.py:1451
 msgid "Property"
 msgstr "Propriété"
 
@@ -679,14 +714,18 @@ msgstr "Export échoué"
 msgid "Export canceled"
 msgstr "Export annulé"
 
-#: utils.py:118 utils.py:166
+#: utils.py:123 utils.py:172
 msgid "Bad zip file"
 msgstr "Mauvais fichier zip"
 
-#: utils.py:169
+#: utils.py:175
 msgid "Missing file(s) inside the zip file"
 msgstr "Fichier(s) manquant(s) dans l'archive zip"
 
+#: utils.py:216
+msgid "Bad XML file"
+msgstr "Mauvais fichier XML"
+
 #: utils.py:301
 msgid "Error while reading the data source."
 msgstr "Erreur lors de la lecture de la source."
@@ -697,28 +736,40 @@ msgstr ""
 "Les types des éléments géographiques de ce fichier Shapefile ne sont pas "
 "gérés par Chimère."
 
-#: utils.py:393
+#: utils.py:356
+msgid "Bad Shapefile"
+msgstr "Mauvais fichier Shapefile"
+
+#: utils.py:398
 msgid "Could not create file!"
 msgstr "Ne peut pas créer le fichier !"
 
-#: utils.py:404
+#: utils.py:409
 msgid "Failed to create field"
 msgstr "Ne peut pas créer un champ"
 
-#: utils.py:445 templates/chimere/edit.html:44
+#: utils.py:455 templates/chimere/edit.html:44
 #: templates/chimere/edit_route.html:41
 msgid "Categories"
 msgstr "Catégories"
 
-#: utils.py:509
+#: utils.py:488
+msgid "Invalid CSV format"
+msgstr "Fichier CSV non valide"
+
+#: utils.py:563
+msgid "RSS feed is not well formed"
+msgstr "Flux RSS non valide"
+
+#: utils.py:633
 msgid "Nothing to import"
 msgstr "Rien à importer"
 
-#: utils.py:589
+#: utils.py:721
 msgid "New items imported - validate them before exporting"
 msgstr "Nouveaux éléments importés - valider ceux-ci avant d'exporter"
 
-#: utils.py:591
+#: utils.py:723
 msgid ""
 "There are items from a former import not yet validated - validate them "
 "before exporting"
@@ -726,15 +777,15 @@ msgstr ""
 "Il y a des éléments d'un import précédent pas encore validé - Validez les "
 "avant d'exporter"
 
-#: utils.py:601
+#: utils.py:733
 msgid "Bad param"
 msgstr "Mauvais paramètre"
 
-#: utils.py:616
+#: utils.py:748
 msgid "No non ambigious tag is defined in the XAPI request"
 msgstr "Aucun « tag » non ambigu n'est défini dans la requête XAPI"
 
-#: utils.py:618
+#: utils.py:750
 msgid ""
 "No bounding box is defined in the XAPI request.If you are sure to manage the "
 "entire planet set the bounding box to -180,-90,180,90"
@@ -747,15 +798,15 @@ msgstr ""
 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."
 
-#: views.py:350
+#: views.py:353
 msgid "Bad file. Please check it with an external software."
 msgstr "Fichier incohérent. Merci de le vérifier avec un logiciel externe."
 
-#: views.py:482
+#: views.py:465
 msgid "Comments/request on the map"
 msgstr "Commentaires/requètes sur la carte"
 
-#: views.py:485
+#: views.py:468
 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."
@@ -764,52 +815,52 @@ msgstr ""
 "laissé votre courriel vous serez peut-être contacté bientôt pour plus de "
 "détails."
 
-#: views.py:489
+#: views.py:472
 msgid "Temporary error. Renew your message later."
 msgstr "Erreur temporaire. Réenvoyez votre message plus tard."
 
-#: views.py:641
+#: views.py:624
 msgid "No category available in this area."
 msgstr "Pas de catégorie disponible sur cette zone."
 
-#: views.py:785
+#: views.py:768
 msgid "Incorrect choice in the list"
 msgstr "Choix incorrect dans la liste"
 
-#: widgets.py:229
+#: widgets.py:245
 msgid "Street, City, Country"
 msgstr "Rue, Commune, Pays"
 
-#: widgets.py:295
+#: widgets.py:312
 msgid "Latitude"
 msgstr "Latitude"
 
-#: widgets.py:295
+#: widgets.py:312
 msgid "Longitude"
 msgstr "Longitude"
 
-#: widgets.py:320
+#: widgets.py:337
 msgid "Invalid point"
 msgstr "Point invalide"
 
-#: widgets.py:370
+#: widgets.py:390
 msgid "Creation mode"
 msgstr "Mode création"
 
-#: widgets.py:371
+#: widgets.py:391
 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;»."
 
-#: widgets.py:373
+#: widgets.py:393
 msgid "Then click on the map to begin the drawing."
 msgstr "Puis cliquez sur la carte pour commencer le dessin."
 
-#: widgets.py:374
+#: widgets.py:394
 msgid "You can add points by clicking again."
 msgstr "Vous pouvez ajouter des points en cliquant de nouveau."
 
-#: widgets.py:375
+#: widgets.py:395
 msgid ""
 "To finish the drawing double click. When the drawing is finished you can "
 "edit it."
@@ -817,7 +868,7 @@ msgstr ""
 "Pour finir le tracé double-cliquez. Quand le tracé est fini vous pouvez "
 "toujours l'éditer."
 
-#: widgets.py:377
+#: widgets.py:397
 msgid ""
 "While creating to undo a drawing click again on the toggle button \"Stop "
 "drawing\"."
@@ -825,17 +876,17 @@ msgstr ""
 "En mode création vous pouvez annuler un tracé en appuyant sur le bouton "
 "«&nbsp;Arrêter le tracé&nbsp;»."
 
-#: widgets.py:382
+#: widgets.py:402
 msgid "Modification mode"
 msgstr "Mode modification"
 
-#: widgets.py:383
+#: widgets.py:403
 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."
 
-#: widgets.py:384
+#: widgets.py:404
 msgid ""
 "To delete a point move the mouse cursor over it and press the \"d\" or \"Del"
 "\" key."
@@ -843,7 +894,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;»."
 
-#: widgets.py:386
+#: widgets.py:406
 msgid ""
 "To add a point click in the middle of a segment and drag the new point to "
 "the desired position"
@@ -852,33 +903,39 @@ msgstr ""
 "maintenez le bouton appuyé et déplacez le nouveau point à la position "
 "désirée."
 
-#: widgets.py:393
+#: widgets.py:413
 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."
 
-#: widgets.py:396
+#: widgets.py:416
 msgid "Upload a route file (GPX or KML)"
 msgstr "Déposer un trajet (fichier GPX ou KML)"
 
-#: widgets.py:397
+#: widgets.py:417
 msgid "or"
 msgstr "ou"
 
-#: widgets.py:402
+#: widgets.py:422
 msgid "Start \"hand\" drawing"
 msgstr "Commencer le tracé manuellement"
 
-#: widgets.py:425
+#: widgets.py:445
 msgid "Move on the map"
 msgstr "Se déplacer"
 
-#: widgets.py:425
+#: widgets.py:445
 msgid "Draw"
 msgstr "Tracer"
 
-#: widgets.py:550
+#: widgets.py:525
+msgid "Hold CTRL, click and drag to select area on the map"
+msgstr ""
+"Maintenir la touche Control, cliquez puis glissez pour sélectionner une zone "
+"sur la carte"
+
+#: widgets.py:591
 msgid "Select..."
 msgstr "Sélectionner..."
 
@@ -891,7 +948,7 @@ msgid "Internal server error"
 msgstr "Erreur interne du serveur"
 
 #: templates/admin/base_site.html:4 templates/admin/base_site.html.py:7
-msgid "Administration de Chimère"
+msgid "Chimère administration"
 msgstr "Administration de Chimère"
 
 #: templates/chimere/base.html:19
@@ -914,14 +971,26 @@ msgstr "Proposer"
 msgid "Date:"
 msgstr "Date :"
 
+#: templates/chimere/detail.html:25
+msgid "Source:"
+msgstr "Source :"
+
 #: templates/chimere/detail.html:26
+msgid "License:"
+msgstr "Licence :"
+
+#: templates/chimere/detail.html:28
 msgid "Show multimedia gallery"
 msgstr "Montrer la galerie multimedia"
 
-#: templates/chimere/detail.html:30
-msgid "Propose a modification"
+#: templates/chimere/detail.html:32 templates/chimere/detail.html.py:33
+msgid "Propose amendment"
 msgstr "Proposer une modification"
 
+#: templates/chimere/detail.html:32
+msgid "I would like to propose an amendment for this item:"
+msgstr "Je souhaiterai proposer une modification pour cet élément :"
+
 #: templates/chimere/edit.html:20
 msgid "Error"
 msgstr "Erreur"
@@ -991,7 +1060,7 @@ msgstr "Merci pour votre proposition !"
 msgid "Upload a file"
 msgstr "Déposer un fichier"
 
-#: templates/chimere/upload_file.html:46
+#: templates/chimere/upload_file.html:47
 msgid "Upload"
 msgstr "Déposer"
 
@@ -1078,7 +1147,15 @@ msgstr "Carte"
 msgid "Loading of the map in progress"
 msgstr "Chargement de la carte en cours"
 
-#: templates/chimere/blocks/map.html:18
+#: templates/chimere/blocks/map.html:13
+msgid "Display options"
+msgstr "Options d'affichage"
+
+#: templates/chimere/blocks/map.html:15
+msgid "Map type"
+msgstr "Type de carte"
+
+#: templates/chimere/blocks/map.html:24
 msgid "Permalink"
 msgstr "Lien permanent"
 
@@ -1233,7 +1310,10 @@ msgstr "Description :"
 msgid ":"
 msgstr " :"
 
-#: templatetags/chimere_tags.py:65
+#: templatetags/chimere_tags.py:76
 #, python-format
 msgid "Welcome to the %s"
 msgstr "Bienvenue sur %s"
+
+#~ msgid "Administration de Chimère"
+#~ msgstr "Administration de Chimère"