summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chimere/locale/fr/LC_MESSAGES/django.po505
-rw-r--r--chimere/widgets.py2
2 files changed, 322 insertions, 185 deletions
diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po
index 8066b61..ceb86e2 100644
--- a/chimere/locale/fr/LC_MESSAGES/django.po
+++ b/chimere/locale/fr/LC_MESSAGES/django.po
@@ -7,18 +7,18 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-26 18:28+0200\n"
+"POT-Creation-Date: 2012-11-22 02:05+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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: __init__.py:8 models.py:628
+#: __init__.py:8 models.py:633
msgid "Multimedia files"
msgstr "Fichiers multimedias"
-#: __init__.py:9 models.py:684
+#: __init__.py:9 models.py:689
msgid "Picture files"
msgstr "Fichiers d'image"
@@ -46,35 +46,56 @@ msgstr "Flux RSS"
msgid "Contact us"
msgstr "Nous contacter"
-#: admin.py:53 templates/chimere/feeds/rss.html:69
+#: admin.py:54
+msgid "Disable"
+msgstr "Désactiver"
+
+#: admin.py:60 templates/admin/managed_modified.html:44
+#: templates/chimere/feeds/rss.html:70
msgid "Validate"
msgstr "Valider"
-#: admin.py:64
+#: admin.py:71
msgid "Export to KML"
msgstr "Exporter en KML"
-#: admin.py:78
+#: admin.py:85
msgid "Export to Shapefile"
msgstr "Exporter en Shapefile"
-#: admin.py:88
+#: admin.py:95
msgid "Export to CSV"
msgstr "Exporter en CSV"
-#: admin.py:174
+#: admin.py:99
+msgid "Only one item can be managed at a time."
+msgstr "Seul élément à la fois peut-être géré."
+
+#: admin.py:108
+msgid "No modified item associated to the selected item."
+msgstr "Pas d'élément modifié associé à l'élément sélectionné."
+
+#: admin.py:133
+msgid "Modified item traited."
+msgstr "Élément modifié traité."
+
+#: admin.py:138
+msgid "Managed modified items"
+msgstr "Gérer les éléments modifiés"
+
+#: admin.py:227
msgid "Import"
msgstr "Import"
-#: admin.py:180
+#: admin.py:233
msgid "Cancel import"
msgstr "Annuler l'import"
-#: admin.py:186
+#: admin.py:239
msgid "Cancel export"
msgstr "Annuler l'export"
-#: admin.py:194
+#: admin.py:247
msgid "Export to osm"
msgstr "Exporter vers osm"
@@ -111,58 +132,77 @@ msgstr "Courriel (optionnel) "
msgid "Object"
msgstr "Objet"
-#: forms.py:115
+#: forms.py:118 forms.py:122
+msgid ""
+"For OSM import you must be provide a filter. Select an area and node/way "
+"filter."
+msgstr ""
+"Pour les imports OSM vous devez fournir un filtre. Sélectionnez une zone "
+" et un filtre sur les nœuds/routes."
+
+#: forms.py:126
msgid "Shapefiles must be provided in a zipped archive."
msgstr ""
"Les fichiers Shapefiles doivent être fournis regroupés dans une archive zip."
-#: forms.py:119
+#: forms.py:130
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:124
+#: forms.py:135
msgid "You have to set \"source\" or \"source file\"."
msgstr "Vous devez spécifier le champ « Source » ou « Fichier source »."
-#: forms.py:182
+#: forms.py:193
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:186
+#: forms.py:197
msgid "End date can't be before start date"
msgstr "La date de fin ne peut pas être antérieure à la date de début"
-#: forms.py:196
+#: forms.py:207
msgid "This field is mandatory for the selected categories"
msgstr "Ce champ est obligatoire pour les catégories sélectionnées"
-#: forms.py:417
+#: forms.py:432
msgid "File"
msgstr "Fichier"
-#: forms.py:423
+#: forms.py:438
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:428 models.py:51 models.py:106 models.py:127 models.py:140
-#: models.py:155 models.py:271 models.py:575 models.py:618 models.py:661
-#: models.py:777 models.py:1093 models.py:1105 models.py:1278 utils.py:454
-#: templates/chimere/edit.html:39 templates/chimere/edit_route.html:36
+#: forms.py:443 models.py:51 models.py:106 models.py:127 models.py:140
+#: models.py:155 models.py:272 models.py:580 models.py:623 models.py:666
+#: models.py:782 models.py:1108 models.py:1120 models.py:1293 utils.py:457
+#: templates/admin/managed_modified.html:23 templates/chimere/edit.html:39
+#: templates/chimere/edit_route.html:36
msgid "Name"
msgstr "Nom"
-#: forms.py:437 models.py:1142
+#: forms.py:452 models.py:1157
msgid "Area"
msgstr "Zone"
-#: models.py:52 models.py:128 models.py:156 models.py:282 models.py:579
-#: models.py:1111 models.py:1280
+#: forms.py:492
+msgid "No area selected."
+msgstr "Pas de zone sélectionnée."
+
+#: forms.py:499
+#, python-format
+msgid "The area \"%s\" has the same order, you need to choose another one."
+msgstr ""
+"La zone « %s » a le même numéro d'ordre, vous devez un choisir un autre."
+
+#: models.py:52 models.py:128 models.py:156 models.py:283 models.py:584
+#: models.py:1126 models.py:1295
msgid "Available"
msgstr "Disponible"
-#: models.py:53 models.py:1289
+#: models.py:53 models.py:1304
msgid "Date"
msgstr "Date"
@@ -190,8 +230,8 @@ msgstr "Thème de couleur"
msgid "Code"
msgstr "Code"
-#: models.py:116 models.py:129 models.py:162 models.py:620 models.py:676
-#: models.py:1110 models.py:1267 models.py:1279
+#: models.py:116 models.py:129 models.py:162 models.py:625 models.py:681
+#: models.py:1125 models.py:1282 models.py:1294
msgid "Order"
msgstr "Ordre"
@@ -199,19 +239,19 @@ msgstr "Ordre"
msgid "Color"
msgstr "Couleur"
-#: models.py:135 models.py:153 templates/chimere/main_map.html:13
+#: models.py:135 models.py:153
msgid "Category"
msgstr "Catégorie"
-#: models.py:141 models.py:571 models.py:662 models.py:843
+#: models.py:141 models.py:576 models.py:667 models.py:848
msgid "Image"
msgstr "Image"
-#: models.py:143 models.py:664 models.py:845
+#: models.py:143 models.py:669 models.py:850
msgid "Height"
msgstr "Hauteur"
-#: models.py:144 models.py:665 models.py:846
+#: models.py:144 models.py:670 models.py:851
msgid "Width"
msgstr "Largeur"
@@ -227,7 +267,7 @@ msgstr "Disponible pour soumission"
msgid "Marker"
msgstr "Point d'intérêt"
-#: models.py:164 models.py:839 models.py:854
+#: models.py:164 models.py:844 models.py:861
#: templates/chimere/edit_route.html:27
msgid "Route"
msgstr "Trajet"
@@ -252,283 +292,295 @@ msgstr "Sous-catégories"
msgid "Importer type"
msgstr "Type d'import"
-#: models.py:233 models.py:293
-msgid "Source"
-msgstr "Source"
+#: models.py:232
+msgid "Filter"
+msgstr "Filtre"
+
+#: models.py:234
+msgid "Web address"
+msgstr "Adresse web"
-#: models.py:235
+#: models.py:236
msgid "Source file"
msgstr "Fichier source"
-#: models.py:237
-msgid "Filter"
-msgstr "Filtre"
-
-#: models.py:239
+#: models.py:238
msgid "Name by default"
msgstr "Nom par défaut"
-#: models.py:241
+#: models.py:240
msgid "SRID"
msgstr "SRID"
-#: models.py:242
+#: models.py:241
msgid "Zipped file"
msgstr "Fichier zippé"
-#: models.py:243 models.py:299
+#: models.py:242 models.py:300
msgid "Origin"
msgstr "Origine"
-#: models.py:245 models.py:301
+#: models.py:244 models.py:302
msgid "License"
msgstr "Licence"
-#: models.py:248
+#: models.py:247
msgid "Associated subcategories"
msgstr "Sous-catégories associées"
-#: models.py:249 utils.py:458
+#: models.py:248 utils.py:461
msgid "State"
msgstr "État"
-#: models.py:253
+#: models.py:250
+msgid "Automatically associate a marker to a way"
+msgstr "Associer automatiquement un marqueur à une route"
+
+#: models.py:254
msgid "Importer"
msgstr "Import"
-#: models.py:273
+#: models.py:274
msgid "Submitter session key"
msgstr "Clé de session du demandeur"
-#: models.py:275
+#: models.py:276
msgid "Submitter name or nickname"
msgstr "Nom ou pseudo du demandeur"
-#: models.py:277
+#: models.py:278
msgid "Submitter email"
msgstr "Courriel du demandeur"
-#: models.py:279
+#: models.py:280
msgid "Submitter comment"
msgstr "Commentaire du demandeur"
-#: models.py:281
+#: models.py:282
msgid "Submited"
msgstr "Soumis"
-#: models.py:283
+#: models.py:284
msgid "Modified"
msgstr "Modifié"
-#: models.py:284
+#: models.py:285
msgid "Disabled"
msgstr "Désactivé"
-#: models.py:285
+#: models.py:286
msgid "Imported"
msgstr "Importé"
-#: models.py:286
+#: models.py:287
msgid "Excluded"
msgstr "Exclu"
-#: models.py:288
+#: models.py:289
msgid "Status"
msgstr "État"
-#: models.py:289
+#: models.py:290
msgid "Import key"
msgstr "Clé d'import"
-#: models.py:291
+#: models.py:292
msgid "Import version"
msgstr "Version de l'import"
-#: models.py:295
+#: models.py:294
+msgid "Source"
+msgstr "Source"
+
+#: models.py:296
msgid "Modified since last import"
msgstr "Modifié depuis le dernier import"
-#: models.py:297
+#: models.py:298
msgid "Not to be imported inside OSM"
msgstr "À ne pas importer dans OSM"
-#: models.py:304 templates/chimere/edit.html:56
+#: models.py:305 templates/chimere/edit.html:56
#: templates/chimere/edit_route.html:52
msgid "Start date"
msgstr "Date de début"
-#: models.py:305
+#: models.py:306
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:307 templates/chimere/edit.html:62
+#: models.py:308 templates/chimere/edit.html:62
#: templates/chimere/edit_route.html:58
msgid "End date"
msgstr "Date de fin"
-#: models.py:308
+#: models.py:309
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:354
+#: models.py:355
msgid "Reference marker"
msgstr "Point d'intérêt de référence"
-#: models.py:355 utils.py:460
+#: models.py:356 utils.py:463
msgid "Localisation"
msgstr "Localisation"
-#: models.py:357
+#: models.py:358
msgid "Available Date"
msgstr "Date de mise en disponibilité"
-#: models.py:361 utils.py:459 templates/chimere/edit.html:49
-#: templates/chimere/edit_route.html:46
+#: models.py:362 utils.py:462 templates/admin/managed_modified.html:31
+#: templates/chimere/edit.html:49 templates/chimere/edit_route.html:46
msgid "Description"
msgstr "Description"
-#: models.py:419 models.py:1314
+#: models.py:424 models.py:1329
msgid "Point of interest"
msgstr "Point d'intérêt"
-#: models.py:569
+#: models.py:574
msgid "Audio"
msgstr "Audio"
-#: models.py:570
+#: models.py:575
msgid "Video"
msgstr "Vidéo"
-#: models.py:572
+#: models.py:577
msgid "Other"
msgstr "Autre"
-#: models.py:573
+#: models.py:578
msgid "Media type"
msgstr "Type de media"
-#: models.py:576
+#: models.py:581
msgid "Mime type"
msgstr "Type mime"
-#: models.py:578
+#: models.py:583
msgid "Inside an iframe"
msgstr "À l'intérieur d'un iframe"
-#: models.py:582
+#: models.py:587
msgid "Multimedia type"
msgstr "Type de multimedia"
-#: models.py:583
+#: models.py:588
msgid "Multimedia types"
msgstr "Types de multimedia"
-#: models.py:619
+#: models.py:624
msgid "Url"
msgstr "Url"
-#: models.py:622 models.py:666
+#: models.py:627 models.py:671
msgid "Display inside the description?"
msgstr "Apparaît dans la description ?"
-#: models.py:627
+#: models.py:632
msgid "Multimedia file"
msgstr "Fichier multimedia"
-#: models.py:668
+#: models.py:673
msgid "Thumbnail"
msgstr "Miniature"
-#: models.py:672
+#: models.py:677
msgid "Thumbnail height"
msgstr "Hauteur de la miniature"
-#: models.py:674
+#: models.py:679
msgid "Thumbnail width"
msgstr "Largeur de la miniature"
-#: models.py:683
+#: models.py:688
msgid "Picture file"
msgstr "Fichier d'image"
-#: models.py:778
+#: models.py:783
msgid "Raw file (gpx or kml)"
msgstr "Fichier brut (gpx ou kml)"
-#: models.py:780
+#: models.py:785
msgid "Simplified file"
msgstr "Fichier simplifié"
-#: models.py:782
+#: models.py:787
msgid "KML"
msgstr "KML"
-#: models.py:782
+#: models.py:787
msgid "GPX"
msgstr "GPX"
-#: models.py:787
+#: models.py:792
msgid "Route file"
msgstr "Fichier de trajet"
-#: models.py:788
+#: models.py:793
msgid "Route files"
msgstr "Fichiers de trajet"
-#: models.py:838
+#: models.py:843
msgid "Reference route"
msgstr "Trajet de référence"
-#: models.py:842
+#: models.py:847
msgid "Associated file"
msgstr "Fichier associé"
-#: models.py:1094
+#: models.py:852
+msgid "Has an associated marker"
+msgstr "Dispose d'un marqueur associé"
+
+#: models.py:1109
msgid "Layer code"
msgstr "Code pour la couche"
-#: models.py:1100
+#: models.py:1115
msgid "Layer"
msgstr "Couche"
-#: models.py:1106
+#: models.py:1121
msgid "Area urn"
msgstr "Urn de la zone"
-#: models.py:1108 templates/chimere/blocks/welcome.html:3
+#: models.py:1123 templates/chimere/blocks/welcome.html:3
msgid "Welcome message"
msgstr "Message d'accueil"
-#: models.py:1112
+#: models.py:1127
msgid "Upper left corner"
msgstr "Coin en haut à gauche"
-#: models.py:1114
+#: models.py:1129
msgid "Lower right corner"
msgstr "Coin en bas à droite"
-#: models.py:1116
+#: models.py:1131
msgid "Default area"
msgstr "Zone par défaut"
-#: models.py:1117
+#: models.py:1132
msgid "Only one area is set by default"
msgstr "Seule une zone est définie par défaut"
-#: models.py:1121
+#: models.py:1136
msgid "Sub-categories checked by default"
msgstr "Sous-catégories cochées par défaut"
-#: models.py:1123
+#: models.py:1138
msgid "Sub-categories dynamicaly displayed"
msgstr "Sous-categories affichées dynamiquement"
-#: models.py:1124
+#: models.py:1139
msgid ""
"If checked, categories are only displayed in the menu if they are available "
"on the current extent."
@@ -536,68 +588,68 @@ msgstr ""
"Si coché, les catégories sont disponibles sur le menu seulement si elles "
"apparaissent sur la zone affichée."
-#: models.py:1128 models.py:1283
+#: models.py:1143 models.py:1298
msgid "Restricted to theses sub-categories"
msgstr "Restreindre à ces sous-categories"
-#: models.py:1129
+#: models.py:1144
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:1131
+#: models.py:1146
msgid "Link to an external CSS"
msgstr "Lien vers une feuille de style externe"
-#: models.py:1133
+#: models.py:1148
msgid "Restrict to the area extent"
msgstr "Restreindre à l'étendue de la zone"
-#: models.py:1268
+#: models.py:1283
msgid "Default layer"
msgstr "Couche par défaut"
-#: models.py:1272 models.py:1273
+#: models.py:1287 models.py:1288
msgid "Layers"
msgstr "Couches"
-#: models.py:1281
+#: models.py:1296
msgid "Mandatory"
msgstr "Obligatoire"
-#: models.py:1284
+#: models.py:1299
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:1286
+#: models.py:1301
msgid "Text"
msgstr "Texte"
-#: models.py:1287
+#: models.py:1302
msgid "Long text"
msgstr "Texte long"
-#: models.py:1288
+#: models.py:1303
msgid "Password"
msgstr "Mot de passe"
-#: models.py:1294
+#: models.py:1309
msgid "Type"
msgstr "Type"
-#: models.py:1299 models.py:1316
+#: models.py:1314 models.py:1331
msgid "Property model"
msgstr "Modèle de propriété"
-#: models.py:1317
+#: models.py:1332
msgid "Value"
msgstr "Valeur"
-#: models.py:1321
+#: models.py:1336
msgid "Property"
msgstr "Propriété"
@@ -651,62 +703,64 @@ msgstr "Export échoué"
msgid "Export canceled"
msgstr "Export annulé"
-#: utils.py:123 utils.py:172
+#: utils.py:126 utils.py:175
msgid "Bad zip file"
msgstr "Mauvais fichier zip"
-#: utils.py:175
+#: utils.py:178
msgid "Missing file(s) inside the zip file"
msgstr "Fichier(s) manquant(s) dans l'archive zip"
-#: utils.py:216
+#: utils.py:219
msgid "Bad XML file"
msgstr "Mauvais fichier XML"
-#: utils.py:301
+#: utils.py:304
msgid "Error while reading the data source."
msgstr "Erreur lors de la lecture de la source."
-#: utils.py:336
+#: utils.py:339
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."
-#: utils.py:356
+#: utils.py:359
msgid "Bad Shapefile"
msgstr "Mauvais fichier Shapefile"
-#: utils.py:398
+#: utils.py:401
msgid "Could not create file!"
msgstr "Ne peut pas créer le fichier !"
-#: utils.py:409
+#: utils.py:412
msgid "Failed to create field"
msgstr "Ne peut pas créer un champ"
-#: utils.py:455 templates/chimere/edit.html:44
-#: templates/chimere/edit_route.html:41
+#: utils.py:458 templates/admin/managed_modified.html:25
+#: templates/chimere/edit.html:44 templates/chimere/edit_route.html:41
+#: templates/chimere/main_map.html:13
+#: templates/chimere/main_map_simple.html:10
msgid "Categories"
msgstr "Catégories"
-#: utils.py:488
+#: utils.py:491
msgid "Invalid CSV format"
msgstr "Fichier CSV non valide"
-#: utils.py:563
+#: utils.py:566
msgid "RSS feed is not well formed"
msgstr "Flux RSS non valide"
-#: utils.py:633
+#: utils.py:636
msgid "Nothing to import"
msgstr "Rien à importer"
-#: utils.py:721
+#: utils.py:724
msgid "New items imported - validate them before exporting"
msgstr "Nouveaux éléments importés - valider ceux-ci avant d'exporter"
-#: utils.py:723
+#: utils.py:726
msgid ""
"There are items from a former import not yet validated - validate them "
"before exporting"
@@ -714,15 +768,15 @@ msgstr ""
"Il y a des éléments d'un import précédent pas encore validé - Validez les "
"avant d'exporter"
-#: utils.py:733
+#: utils.py:738
msgid "Bad param"
msgstr "Mauvais paramètre"
-#: utils.py:748
+#: utils.py:753
msgid "No non ambigious tag is defined in the XAPI request"
msgstr "Pas de tag non ambigü définis dans la requête XAPI"
-#: utils.py:750
+#: utils.py:755
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"
@@ -756,44 +810,44 @@ msgstr ""
msgid "Temporary error. Renew your message later."
msgstr "Erreur temporaire. Réenvoyez votre message plus tard."
-#: views.py:570
+#: views.py:572
msgid "No category available in this area."
msgstr "Pas de catégorie disponible sur cette zone."
-#: views.py:678
+#: views.py:680
msgid "Incorrect choice in the list"
msgstr "Choix incorrect dans la liste"
-#: widgets.py:208
+#: widgets.py:217
msgid "Latitude"
msgstr "Latitude"
-#: widgets.py:208
+#: widgets.py:217
msgid "Longitude"
msgstr "Longitude"
-#: widgets.py:233
+#: widgets.py:242
msgid "Invalid point"
msgstr "Point invalide"
-#: widgets.py:285
+#: widgets.py:294
msgid "Creation mode"
msgstr "Mode création"
-#: widgets.py:286
+#: widgets.py:295
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:288
+#: widgets.py:297
msgid "Then click on the map to begin the drawing."
msgstr "Puis cliquez sur la carte pour commencer le dessin."
-#: widgets.py:289
+#: widgets.py:298
msgid "You can add points by clicking again."
msgstr "Vous pouvez ajouter des points en cliquant de nouveau."
-#: widgets.py:290
+#: widgets.py:299
msgid ""
"To finish the drawing double click. When the drawing is finished you can "
"edit it."
@@ -801,7 +855,7 @@ msgstr ""
"Pour finir le tracé double-cliquez. Quand le tracé est fini vous pouvez "
"toujours l'éditer."
-#: widgets.py:292
+#: widgets.py:301
msgid ""
"While creating to undo a drawing click again on the toggle button \"Stop "
"drawing\"."
@@ -809,17 +863,17 @@ msgstr ""
"En mode création vous pouvez annuler un tracé en appuyant sur le bouton "
"«&nbsp;Arrêter le tracé&nbsp;»."
-#: widgets.py:297
+#: widgets.py:306
msgid "Modification mode"
msgstr "Mode modification"
-#: widgets.py:298
+#: widgets.py:307
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:299
+#: widgets.py:308
msgid ""
"To delete a point move the mouse cursor over it and press the \"d\" or \"Del"
"\" key."
@@ -827,7 +881,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:301
+#: widgets.py:310
msgid ""
"To add a point click in the middle of a segment and drag the new point to "
"the desired position"
@@ -836,39 +890,94 @@ msgstr ""
"maintenez le bouton appuyé et déplacez le nouveau point à la position "
"désirée."
-#: widgets.py:308
+#: widgets.py:317
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:311
+#: widgets.py:320
msgid "Upload a route file (GPX or KML)"
msgstr "Déposer un trajet (fichier GPX ou KML)"
-#: widgets.py:312
+#: widgets.py:321
msgid "or"
msgstr "ou"
-#: widgets.py:317
+#: widgets.py:326
msgid "Start \"hand\" drawing"
msgstr "Commencer le tracé manuellement"
-#: widgets.py:340
+#: widgets.py:349
msgid "Move on the map"
msgstr "Se déplacer"
-#: widgets.py:340
+#: widgets.py:349
msgid "Draw"
msgstr "Tracer"
-#: widgets.py:420
+#: widgets.py:439
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:486
+#: widgets.py:496
+msgid "Type:"
+msgstr "Type :"
+
+#: widgets.py:496
+msgid "Node"
+msgstr "Nœud"
+
+#: widgets.py:497
+msgid "Way"
+msgstr "Route"
+
+#: widgets.py:508
+msgid ""
+"Enter an OSM \"tag=value\" string such as \"amenity=pub\". A list of common "
+"tag is available <a href='https://wiki.openstreetmap.org/wiki/Map_Features' "
+"target='_blank'>here</a>."
+msgstr ""
+"Entrez une chaîne OSM de type \"clé=valeur\" telle que \"amenity=pub\". Une "
+"liste des clé est disponible "
+"<a href='https://wiki.openstreetmap.org/wiki/FR:Map_Features' target='_blank'>"
+"ici</a>."
+
+#: widgets.py:515
+msgid "Tag:"
+msgstr "Clé/valeur :"
+
+#: widgets.py:519
+msgid "You have to select an area."
+msgstr "Vous devez sélectionner une zone."
+
+#: widgets.py:521
+msgid "You have to select a type."
+msgstr "Vous devez sélectionner un type."
+
+#: widgets.py:523
+msgid "You have to insert a filter tag."
+msgstr "Vous devez saisir une clé=valeur."
+
+#: widgets.py:525
+msgid "If you change the above form don't forget to refresh before submit!"
+msgstr ""
+"Si vous modifiez le formulaire ci-dessus n'oubliez pas de rafraîchir avant "
+"de valider !"
+
+#: widgets.py:528
+msgid "You can put a Folder name of the KML file to filter on it."
+msgstr ""
+"Vous pouvez saisir le nom d'un « Folder » du fichier KML pour filter sur "
+"celui-ci."
+
+#: widgets.py:536
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+#: widgets.py:599
msgid "Select..."
msgstr "Sélectionner..."
@@ -884,7 +993,35 @@ msgstr "Erreur interne du serveur"
msgid "Chimère administration"
msgstr "Administration de Chimère"
-#: templates/chimere/base.html:18
+#: templates/admin/managed_modified.html:11
+msgid ""
+"Be careful: after validation, the modified item will be deleted. There is no "
+"roll-back."
+msgstr ""
+"Attention: après validation, l'élément modifié sera supprimé. Il n'y a pas "
+"d'annulation possible."
+
+#: templates/admin/managed_modified.html:20
+msgid "Reference"
+msgstr "Référence"
+
+#: templates/admin/managed_modified.html:20
+msgid "Modified item"
+msgstr "Élément modifié"
+
+#: templates/admin/managed_modified.html:20
+msgid "Accept modification"
+msgstr "Accepter la modification"
+
+#: templates/admin/managed_modified.html:30
+msgid "Emplacement"
+msgstr "Emplacement"
+
+#: templates/admin/managed_modified.html:43
+msgid "Back to list"
+msgstr "Retourner à la liste"
+
+#: templates/chimere/base.html:11
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."
@@ -916,19 +1053,23 @@ msgstr "Licence :"
msgid "Show multimedia gallery"
msgstr "Montrer la galerie multimedia"
-#: templates/chimere/detail.html:38 templates/chimere/detail.html.py:39
+#: templates/chimere/detail.html:32
+msgid "Submit an amendment"
+msgstr "Proposer une modification"
+
+#: templates/chimere/detail.html:35 templates/chimere/detail.html.py:36
msgid "Propose amendment"
msgstr "Proposer une modification"
-#: templates/chimere/detail.html:38
+#: templates/chimere/detail.html:35
msgid "I would like to propose an amendment for this item:"
msgstr "Je souhaiterais proposer une modification pour cet élément :"
-#: templates/chimere/detail.html:42
+#: templates/chimere/detail.html:39
msgid "Share on"
msgstr "Partager sur"
-#: templates/chimere/detail.html:46
+#: templates/chimere/detail.html:43
msgid "Share"
msgstr "Partager"
@@ -989,10 +1130,6 @@ msgstr "Proposez"
msgid "Add/modify a route"
msgstr "Ajout ou modifier un trajet"
-#: templates/chimere/main_map_simple.html:10
-msgid "Topics"
-msgstr "Thèmes"
-
#: templates/chimere/upload_file.html:13
msgid "Thank you for your submission!"
msgstr "Merci pour votre proposition !"
@@ -1062,23 +1199,23 @@ msgstr ""
msgid "Thank you"
msgstr "Merci"
-#: templates/chimere/blocks/submited.html:11
+#: templates/chimere/blocks/submited.html:12
msgid "Add a new item"
msgstr "Ajout d'un nouvel élément"
-#: templates/chimere/blocks/submited.html:15
+#: templates/chimere/blocks/submited.html:16
msgid "Continue edition of this item"
msgstr "Continuer l'édition de cet élément"
-#: templates/chimere/blocks/submited.html:19
+#: templates/chimere/blocks/submited.html:20
msgid "Return to the map"
msgstr "Retourner à la carte"
-#: templates/chimere/blocks/welcome.html:5
+#: templates/chimere/blocks/welcome.html:9
msgid "Welcome"
msgstr "Accueil"
-#: templates/chimere/blocks/welcome.html:47
+#: templates/chimere/blocks/welcome.html:52
msgid "See it on the map"
msgstr "Voir sur la carte"
@@ -1098,7 +1235,7 @@ msgstr "Tous les nouveaux points d'intérêt"
msgid "New points of interest by category"
msgstr "Les nouveaux points d'intérêt par catégorie"
-#: templates/chimere/feeds/rss.html:25 templates/chimere/feeds/rss.html:47
+#: templates/chimere/feeds/rss.html:25 templates/chimere/feeds/rss.html:48
msgid "New points of interest by area"
msgstr "Les nouveaux points d'intérêt par zone"
@@ -1106,11 +1243,11 @@ msgstr "Les nouveaux points d'intérêt par zone"
msgid "Choose a category"
msgstr "Choisir une catégorie"
-#: templates/chimere/feeds/rss.html:50
+#: templates/chimere/feeds/rss.html:51
msgid "Choose a pre-defined areas"
msgstr "Choisir une zone pré-définie"
-#: templates/chimere/feeds/rss.html:64
+#: templates/chimere/feeds/rss.html:65
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"
@@ -1122,12 +1259,12 @@ msgstr "Description :"
msgid ":"
msgstr " :"
+#~ msgid "Topics"
+#~ msgstr "Thèmes"
+
#~ msgid "Administration de Chimère"
#~ msgstr "Administration de Chimère"
-#~ msgid "Submit a modification"
-#~ msgstr "Proposer une modification"
-
#~ msgid "Add/modify a site"
#~ msgstr "Ajouter ou modifier un site"
diff --git a/chimere/widgets.py b/chimere/widgets.py
index 7fa8893..5bd905d 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -525,7 +525,7 @@ class ImportFiltrWidget(AreaWidget):
help_msg = _(u"If you change the above form don't forget to refresh "\
u"before submit!")
tpl += u"<p class='help-osm errornote'>%s</p>\n" % help_msg
- help_msg = _(u"You can put a Folder name in the KML file to filter on "\
+ help_msg = _(u"You can put a Folder name of the KML file to filter on "\
u"it.")
tpl += u"<p class='help-kml'>%s</p>\n" % help_msg
if not value: