Update french tranlation - minor label change

2 files changed, 152 insertions, 135 deletions

diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po
index 8f830ca..a60a47f 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-12-06 20:37+0100\n"
+"POT-Creation-Date: 2012-12-08 00: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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: __init__.py:8 models.py:644
+#: __init__.py:8 models.py:649
 msgid "Multimedia files"
 msgstr "Fichiers multimedias"
 
-#: __init__.py:9 models.py:716
+#: __init__.py:9 models.py:721
 msgid "Picture files"
 msgstr "Fichiers d'image"
 
@@ -67,73 +67,73 @@ msgstr "Exporter en Shapefile"
 msgid "Export to CSV"
 msgstr "Exporter en CSV"
 
-#: admin.py:99
+#: admin.py:101
 msgid "Only one item can be managed at a time."
 msgstr "Seul un élément à la fois peut-être géré."
 
-#: admin.py:108
+#: admin.py:110
 msgid "No modified item associated to the selected item."
 msgstr "Pas d'élément modifié associé à l'élément sélectionné."
 
-#: admin.py:151
+#: admin.py:156
 msgid "Modified item traited."
 msgstr "Élément modifié traité."
 
-#: admin.py:156
+#: admin.py:161
 msgid "Managed modified items"
 msgstr "Gérer les éléments modifiés"
 
-#: admin.py:190 admin.py:248
+#: admin.py:195 admin.py:270
 msgid "Submitter"
 msgstr "Demandeur"
 
-#: admin.py:195 admin.py:253 admin.py:296
+#: admin.py:200 admin.py:275 admin.py:326
 msgid "Import"
 msgstr "Import"
 
-#: admin.py:200 admin.py:258
+#: admin.py:205 admin.py:280
 msgid "Associated items"
 msgstr "Éléments associés"
 
-#: admin.py:302
+#: admin.py:332
 msgid "Cancel import"
 msgstr "Annuler l'import"
 
-#: admin.py:308
+#: admin.py:338
 msgid "Cancel export"
 msgstr "Annuler l'export"
 
-#: admin.py:312
+#: admin.py:342
 msgid "Can manage only one OSM export at a time."
 msgstr "Ne peux gérer qu'un seul export OSM à la fois."
 
-#: admin.py:317
+#: admin.py:347
 msgid ""
 "You must treat all item with the status \"imported\" before exporting to OSM."
 msgstr ""
 "Vous devez traiter tous les éléments avec le status « importé » avant "
 "d'exporter vers OSM."
 
-#: admin.py:321
+#: admin.py:351
 msgid "Only OSM importer are managed for export."
 msgstr "Seul les imports de type OSM peuvent être gérés pour les exports."
 
-#: admin.py:328
+#: admin.py:358
 msgid "No point of interest are concerned by this export."
 msgstr "Aucun point d'intérêt n'est concerné par cet export."
 
-#: admin.py:340
+#: admin.py:370
 msgid "Export launched."
 msgstr "Export lancé."
 
-#: admin.py:344
+#: admin.py:374
 #, python-format
 msgid ""
 "%s point(s) of interest concerned by this export before bounding box filter."
 msgstr ""
 "%s point(s) d'intérêt concerné par cet export (avant le filtre sur la zone)"
 
-#: admin.py:349
+#: admin.py:379
 msgid "Export to osm"
 msgstr "Exporter vers osm"
 
@@ -174,7 +174,7 @@ msgstr "Objet"
 msgid "OSM user"
 msgstr "Utilisateur OSM"
 
-#: forms.py:98 models.py:1333
+#: forms.py:98 models.py:1338
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -236,15 +236,15 @@ 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:471 models.py:51 models.py:106 models.py:127 models.py:140
-#: models.py:155 models.py:272 models.py:578 models.py:634 models.py:693
-#: models.py:809 models.py:1138 models.py:1150 models.py:1323 utils.py:461
+#: models.py:155 models.py:273 models.py:583 models.py:639 models.py:698
+#: models.py:814 models.py:1143 models.py:1155 models.py:1328 utils.py:469
 #: templates/admin/chimere/managed_modified.html:23
 #: templates/chimere/edit.html:39 templates/chimere/edit_route.html:36
 #: templates/chimere/blocks/alternate_multimedia.html:38
 msgid "Name"
 msgstr "Nom"
 
-#: forms.py:480 models.py:1187
+#: forms.py:480 models.py:1192
 msgid "Area"
 msgstr "Zone"
 
@@ -258,12 +258,12 @@ 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:582
-#: models.py:1156 models.py:1325
+#: models.py:52 models.py:128 models.py:156 models.py:284 models.py:587
+#: models.py:1161 models.py:1330
 msgid "Available"
 msgstr "Disponible"
 
-#: models.py:53 models.py:1334
+#: models.py:53 models.py:1339
 msgid "Date"
 msgstr "Date"
 
@@ -291,8 +291,8 @@ msgstr "Thème de couleur"
 msgid "Code"
 msgstr "Code"
 
-#: models.py:116 models.py:129 models.py:162 models.py:636 models.py:708
-#: models.py:1155 models.py:1312 models.py:1324
+#: models.py:116 models.py:129 models.py:162 models.py:641 models.py:713
+#: models.py:1160 models.py:1317 models.py:1329
 msgid "Order"
 msgstr "Ordre"
 
@@ -304,16 +304,16 @@ msgstr "Couleur"
 msgid "Category"
 msgstr "Catégorie"
 
-#: models.py:141 models.py:574 models.py:694 models.py:875
+#: models.py:141 models.py:579 models.py:699 models.py:880
 #: templates/chimere/blocks/alternate_multimedia.html:42
 msgid "Image"
 msgstr "Image"
 
-#: models.py:143 models.py:696 models.py:877
+#: models.py:143 models.py:701 models.py:882
 msgid "Height"
 msgstr "Hauteur"
 
-#: models.py:144 models.py:697 models.py:878
+#: models.py:144 models.py:702 models.py:883
 msgid "Width"
 msgstr "Largeur"
 
@@ -329,7 +329,7 @@ msgstr "Disponible pour soumission"
 msgid "Marker"
 msgstr "Point d'intérêt"
 
-#: models.py:164 models.py:871 models.py:888
+#: models.py:164 models.py:876 models.py:893
 #: templates/chimere/edit_route.html:27
 msgid "Route"
 msgstr "Trajet"
@@ -378,287 +378,291 @@ msgstr "SRID"
 msgid "Zipped file"
 msgstr "Fichier zippé"
 
-#: models.py:242 models.py:299
+#: models.py:242
+msgid "Overwrite data"
+msgstr "Écraser les données existantes"
+
+#: models.py:243 models.py:300
 msgid "Origin"
 msgstr "Origine"
 
-#: models.py:244 models.py:301
+#: models.py:245 models.py:302
 msgid "License"
 msgstr "Licence"
 
-#: models.py:247
+#: models.py:248
 msgid "Associated subcategories"
 msgstr "Sous-catégories associées"
 
-#: models.py:248 utils.py:465
+#: models.py:249 utils.py:473
 msgid "State"
 msgstr "État"
 
-#: models.py:250
+#: models.py:251
 msgid "Automatically associate a marker to a way"
 msgstr "Associer automatiquement un marqueur à une route"
 
-#: models.py:254
+#: models.py:255
 msgid "Importer"
 msgstr "Import"
 
-#: models.py:274
+#: models.py:275
 msgid "Submitter session key"
 msgstr "Clé de session du demandeur"
 
-#: models.py:276
+#: models.py:277
 msgid "Submitter name or nickname"
 msgstr "Nom ou pseudo du demandeur"
 
-#: models.py:278
+#: models.py:279
 msgid "Submitter email"
 msgstr "Courriel du demandeur"
 
-#: models.py:280
+#: models.py:281
 msgid "Submitter comment"
 msgstr "Commentaire du demandeur"
 
-#: models.py:282
+#: models.py:283
 msgid "Submited"
 msgstr "Soumis"
 
-#: models.py:284
+#: models.py:285
 msgid "Modified"
 msgstr "Modifié"
 
-#: models.py:285
+#: models.py:286
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: models.py:286
+#: models.py:287
 msgid "Imported"
 msgstr "Importé"
 
-#: 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:293
+#: models.py:294
 msgid "Source"
 msgstr "Source"
 
-#: models.py:295
+#: models.py:296
 msgid "Modified since last import"
 msgstr "Modifié depuis le dernier import"
 
-#: models.py:297
+#: models.py:298
 msgid "Not to be exported to OSM"
 msgstr "À ne pas exporter vers OSM"
 
-#: models.py:303 templates/chimere/edit.html:56
+#: models.py:304 templates/chimere/edit.html:56
 #: templates/chimere/edit_route.html:52
 msgid "Start date"
 msgstr "Date de début"
 
-#: models.py:304
+#: models.py:305
 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:306 templates/chimere/edit.html:62
+#: models.py:307 templates/chimere/edit.html:62
 #: templates/chimere/edit_route.html:58
 msgid "End date"
 msgstr "Date de fin"
 
-#: models.py:307
+#: models.py:308
 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:353
+#: models.py:354
 msgid "Reference marker"
 msgstr "Point d'intérêt de référence"
 
-#: models.py:354 utils.py:467
+#: models.py:355 utils.py:475
 msgid "Localisation"
 msgstr "Localisation"
 
-#: models.py:356
+#: models.py:357
 msgid "Available Date"
 msgstr "Date de mise en disponibilité"
 
-#: models.py:360 utils.py:466 templates/admin/chimere/managed_modified.html:31
+#: models.py:361 utils.py:474 templates/admin/chimere/managed_modified.html:31
 #: templates/chimere/edit.html:49 templates/chimere/edit_route.html:46
 msgid "Description"
 msgstr "Description"
 
-#: models.py:422 models.py:1359
+#: models.py:423 models.py:1364
 msgid "Point of interest"
 msgstr "Point d'intérêt"
 
-#: models.py:572
+#: models.py:577
 msgid "Audio"
 msgstr "Audio"
 
-#: models.py:573
+#: models.py:578
 msgid "Video"
 msgstr "Vidéo"
 
-#: models.py:575
+#: models.py:580
 msgid "Other"
 msgstr "Autre"
 
-#: models.py:576
+#: models.py:581
 msgid "Media type"
 msgstr "Type de media"
 
-#: models.py:579
+#: models.py:584
 msgid "Mime type"
 msgstr "Type mime"
 
-#: models.py:581
+#: models.py:586
 msgid "Inside an iframe"
 msgstr "À l'intérieur d'un iframe"
 
-#: models.py:585
+#: models.py:590
 msgid "Multimedia type"
 msgstr "Type de multimedia"
 
-#: models.py:586
+#: models.py:591
 msgid "Multimedia types"
 msgstr "Types de multimedia"
 
-#: models.py:595
+#: models.py:600
 msgid "Automatic recognition"
 msgstr "Reconnaissance automatique"
 
-#: models.py:621
+#: models.py:626
 msgid "Extension name"
 msgstr "Nom de l'extension"
 
-#: models.py:623
+#: models.py:628
 msgid "Associated multimedia type"
 msgstr "Type de multimedia associé"
 
-#: models.py:627
+#: models.py:632
 msgid "Multimedia extension"
 msgstr "Extension multimedia"
 
-#: models.py:628
+#: models.py:633
 msgid "Multimedia extensions"
 msgstr "Extensions multimedia"
 
-#: models.py:635
+#: models.py:640
 msgid "Url"
 msgstr "Url"
 
-#: models.py:638 models.py:698
+#: models.py:643 models.py:703
 msgid "Display inside the description?"
 msgstr "Apparaît dans la description ?"
 
-#: models.py:643
+#: models.py:648
 msgid "Multimedia file"
 msgstr "Fichier multimedia"
 
-#: models.py:700
+#: models.py:705
 msgid "Thumbnail"
 msgstr "Miniature"
 
-#: models.py:704
+#: models.py:709
 msgid "Thumbnail height"
 msgstr "Hauteur de la miniature"
 
-#: models.py:706
+#: models.py:711
 msgid "Thumbnail width"
 msgstr "Largeur de la miniature"
 
-#: models.py:715
+#: models.py:720
 msgid "Picture file"
 msgstr "Fichier d'image"
 
-#: models.py:810
+#: models.py:815
 msgid "Raw file (gpx or kml)"
 msgstr "Fichier brut (gpx ou kml)"
 
-#: models.py:812
+#: models.py:817
 msgid "Simplified file"
 msgstr "Fichier simplifié"
 
-#: models.py:814
+#: models.py:819
 msgid "KML"
 msgstr "KML"
 
-#: models.py:814
+#: models.py:819
 msgid "GPX"
 msgstr "GPX"
 
-#: models.py:819
+#: models.py:824
 msgid "Route file"
 msgstr "Fichier de trajet"
 
-#: models.py:820
+#: models.py:825
 msgid "Route files"
 msgstr "Fichiers de trajet"
 
-#: models.py:870
+#: models.py:875
 msgid "Reference route"
 msgstr "Trajet de référence"
 
-#: models.py:874
+#: models.py:879
 msgid "Associated file"
 msgstr "Fichier associé"
 
-#: models.py:879
+#: models.py:884
 msgid "Has an associated marker"
 msgstr "Dispose d'un marqueur associé"
 
-#: models.py:1139
+#: models.py:1144
 msgid "Layer code"
 msgstr "Code pour la couche"
 
-#: models.py:1145
+#: models.py:1150
 msgid "Layer"
 msgstr "Couche"
 
-#: models.py:1151
+#: models.py:1156
 msgid "Area urn"
 msgstr "Urn de la zone"
 
-#: models.py:1153 templates/chimere/blocks/welcome.html:3
+#: models.py:1158 templates/chimere/blocks/welcome.html:3
 msgid "Welcome message"
 msgstr "Message d'accueil"
 
-#: models.py:1157
+#: models.py:1162
 msgid "Upper left corner"
 msgstr "Coin en haut à gauche"
 
-#: models.py:1159
+#: models.py:1164
 msgid "Lower right corner"
 msgstr "Coin en bas à droite"
 
-#: models.py:1161
+#: models.py:1166
 msgid "Default area"
 msgstr "Zone par défaut"
 
-#: models.py:1162
+#: models.py:1167
 msgid "Only one area is set by default"
 msgstr "Seule une zone est définie par défaut"
 
-#: models.py:1166
+#: models.py:1171
 msgid "Sub-categories checked by default"
 msgstr "Sous-catégories cochées par défaut"
 
-#: models.py:1168
+#: models.py:1173
 msgid "Sub-categories dynamicaly displayed"
 msgstr "Sous-categories affichées dynamiquement"
 
-#: models.py:1169
+#: models.py:1174
 msgid ""
 "If checked, categories are only displayed in the menu if they are available "
 "on the current extent."
@@ -666,64 +670,64 @@ msgstr ""
 "Si coché, les catégories sont disponibles sur le menu seulement si elles "
 "apparaissent sur la zone affichée."
 
-#: models.py:1173 models.py:1328
+#: models.py:1178 models.py:1333
 msgid "Restricted to theses sub-categories"
 msgstr "Restreindre à ces sous-categories"
 
-#: models.py:1174
+#: models.py:1179
 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:1176
+#: models.py:1181
 msgid "Link to an external CSS"
 msgstr "Lien vers une feuille de style externe"
 
-#: models.py:1178
+#: models.py:1183
 msgid "Restrict to the area extent"
 msgstr "Restreindre à l'étendue de la zone"
 
-#: models.py:1313
+#: models.py:1318
 msgid "Default layer"
 msgstr "Couche par défaut"
 
-#: models.py:1317 models.py:1318
+#: models.py:1322 models.py:1323
 msgid "Layers"
 msgstr "Couches"
 
-#: models.py:1326
+#: models.py:1331
 msgid "Mandatory"
 msgstr "Obligatoire"
 
-#: models.py:1329
+#: models.py:1334
 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:1331
+#: models.py:1336
 msgid "Text"
 msgstr "Texte"
 
-#: models.py:1332
+#: models.py:1337
 msgid "Long text"
 msgstr "Texte long"
 
-#: models.py:1339
+#: models.py:1344
 msgid "Type"
 msgstr "Type"
 
-#: models.py:1344 models.py:1361
+#: models.py:1349 models.py:1366
 msgid "Property model"
 msgstr "Modèle de propriété"
 
-#: models.py:1362
+#: models.py:1367
 msgid "Value"
 msgstr "Valeur"
 
-#: models.py:1366
+#: models.py:1371
 msgid "Property"
 msgstr "Propriété"
 
@@ -777,69 +781,69 @@ msgstr "Export échoué"
 msgid "Export canceled"
 msgstr "Export annulé"
 
-#: utils.py:126 utils.py:175
+#: utils.py:134 utils.py:183
 msgid "Bad zip file"
 msgstr "Mauvais fichier zip"
 
-#: utils.py:178
+#: utils.py:186
 msgid "Missing file(s) inside the zip file"
 msgstr "Fichier(s) manquant(s) dans l'archive zip"
 
-#: utils.py:219
+#: utils.py:227
 msgid "Bad XML file"
 msgstr "Mauvais fichier XML"
 
-#: utils.py:304
+#: utils.py:312
 msgid "Error while reading the data source."
 msgstr "Erreur lors de la lecture de la source."
 
-#: utils.py:322
+#: utils.py:330
 #, python-format
 msgid "SRID cannot be guessed. The default SRID (%s) has been used."
 msgstr "Le SRID n'a pu être trouvé. Le SRID par défaut (%s) a été utilisé."
 
-#: utils.py:343
+#: utils.py:351
 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:363
+#: utils.py:371
 msgid "Bad Shapefile"
 msgstr "Mauvais fichier Shapefile"
 
-#: utils.py:405
+#: utils.py:413
 msgid "Could not create file!"
 msgstr "Ne peut pas créer le fichier !"
 
-#: utils.py:416
+#: utils.py:424
 msgid "Failed to create field"
 msgstr "Ne peut pas créer un champ"
 
-#: utils.py:462 templates/admin/chimere/managed_modified.html:25
+#: utils.py:470 templates/admin/chimere/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:495
+#: utils.py:503
 msgid "Invalid CSV format"
 msgstr "Fichier CSV non valide"
 
-#: utils.py:570
+#: utils.py:578
 msgid "RSS feed is not well formed"
 msgstr "Flux RSS non valide"
 
-#: utils.py:645
+#: utils.py:653
 msgid "Nothing to import"
 msgstr "Rien à importer"
 
-#: utils.py:733
+#: utils.py:741
 msgid "New items imported - validate them before exporting"
 msgstr "Nouveaux éléments importés - valider ceux-ci avant d'exporter"
 
-#: utils.py:735
+#: utils.py:743
 msgid ""
 "There are items from a former import not yet validated - validate them "
 "before exporting"
@@ -847,19 +851,19 @@ msgstr ""
 "Il y a des éléments d'un import précédent pas encore validé - Validez les "
 "avant d'exporter"
 
-#: utils.py:747
+#: utils.py:755
 msgid "Bad params - programming error"
 msgstr "Mauvais paramètres - erreur de programmation"
 
-#: utils.py:757
+#: utils.py:765
 msgid "Bad param"
 msgstr "Mauvais paramètre"
 
-#: utils.py:772
+#: utils.py:780
 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:774
+#: utils.py:782
 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"
@@ -1134,6 +1138,18 @@ msgstr ""
 msgid "Export to OSM"
 msgstr "Exporter vers OSM"
 
+#: templates/admin/chimere/marker/change_form.html:7
+#: templates/admin/chimere/route/change_form.html:7
+#, python-format
+msgid ""
+"\n"
+"This item has a reference item associated to it. You should treat it via the "
+"<a href='%(rapprochement_form)s'>rapprochement form</a>.\n"
+msgstr ""
+"\n"
+"Cet élément a un élément de référence associé. Vous devriez le traiter via le "
+"<a href='%(rapprochement_form)s'>formulaire de rapprochement</a>.\n"
+
 #: templates/admin/chimere/propertymodel/change_form.html:5
 msgid ""
 "After add/modification of property models you'll have to reload the "
diff --git a/chimere/models.py b/chimere/models.py
index 50a3dc9..827a0e7 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -239,7 +239,8 @@ class Importer(models.Model):
                                     blank=True, null=True)
     srid = models.IntegerField(_(u"SRID"), blank=True, null=True)
     zipped = models.BooleanField(_(u"Zipped file"), default=False)
-    overwrite = models.BooleanField(_(u"Overwrite data"), default=False)
+    overwrite = models.BooleanField(_(u"Overwrite existing data"),
+                                    default=False)
     origin = models.CharField(_(u"Origin"), max_length=100,
                               blank=True, null=True)
     license = models.CharField(_(u"License"), max_length=100,