diff options
| -rw-r--r-- | chimere/locale/fr/LC_MESSAGES/django.po | 110 | ||||
| -rw-r--r-- | chimere/models.py | 2 |
2 files changed, 57 insertions, 55 deletions
diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po index 13ca044..38fca68 100644 --- a/chimere/locale/fr/LC_MESSAGES/django.po +++ b/chimere/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-18 19:06+0200\n" +"POT-Creation-Date: 2013-07-07 19:08+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" @@ -219,46 +219,46 @@ msgstr "La date de fin ne peut pas être antérieure à la date de début" msgid "This field is mandatory for the selected categories" msgstr "Ce champ est obligatoire pour les catégories sélectionnées" -#: forms.py:501 +#: forms.py:507 msgid "File" msgstr "Fichier" -#: forms.py:507 +#: forms.py:513 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:512 models.py:53 models.py:101 models.py:163 models.py:185 +#: forms.py:518 models.py:53 models.py:101 models.py:163 models.py:185 #: models.py:198 models.py:213 models.py:378 models.py:752 models.py:808 #: models.py:867 models.py:985 models.py:1343 models.py:1355 models.py:1582 #: utils.py:485 templates/admin/chimere/managed_modified.html:23 -#: templates/chimere/edit.html:40 templates/chimere/edit_route.html:37 +#: templates/chimere/edit.html:43 templates/chimere/edit_route.html:39 #: templates/chimere/blocks/alternate_multimedia.html:39 msgid "Name" msgstr "Nom" -#: forms.py:521 +#: forms.py:527 msgid "Area" msgstr "Zone" -#: forms.py:561 +#: forms.py:567 msgid "No area selected." msgstr "Pas de zone sélectionnée." -#: forms.py:568 +#: forms.py:574 #, 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." -#: forms.py:619 +#: forms.py:625 msgid "Start" msgstr "Départ" -#: forms.py:620 +#: forms.py:626 msgid "Finish" msgstr "Arrivée" -#: forms.py:621 +#: forms.py:627 msgid "Speed" msgstr "Vitesse" @@ -359,7 +359,7 @@ msgid "Marker" msgstr "Point d'intérêt" #: models.py:220 models.py:1047 models.py:1064 -#: templates/chimere/edit_route.html:28 +#: templates/chimere/edit_route.html:30 msgid "Route" msgstr "Trajet" @@ -515,8 +515,8 @@ msgstr "Modifié depuis le dernier import" msgid "Not to be exported to OSM" msgstr "À ne pas exporter vers OSM" -#: models.py:403 templates/chimere/edit.html:57 -#: templates/chimere/edit_route.html:53 +#: models.py:403 templates/chimere/edit.html:60 +#: templates/chimere/edit_route.html:55 msgid "Start date" msgstr "Date de début" @@ -526,8 +526,8 @@ msgstr "" "Optionnel. Précisez ce champ pour les éléments datés comme un événement. " "Format du champ : AAAA-MM-JJ" -#: models.py:406 templates/chimere/edit.html:63 -#: templates/chimere/edit_route.html:59 +#: models.py:406 templates/chimere/edit.html:66 +#: templates/chimere/edit_route.html:61 msgid "End date" msgstr "Date de fin" @@ -555,7 +555,7 @@ msgid "Quantity" msgstr "Quantité" #: models.py:473 utils.py:490 templates/admin/chimere/managed_modified.html:31 -#: templates/chimere/edit.html:50 templates/chimere/edit_route.html:47 +#: templates/chimere/edit.html:53 templates/chimere/edit_route.html:49 msgid "Description" msgstr "Description" @@ -956,7 +956,7 @@ msgid "Failed to create field" msgstr "Ne peut pas créer un champ" #: utils.py:486 templates/admin/chimere/managed_modified.html:25 -#: templates/chimere/edit.html:45 templates/chimere/edit_route.html:42 +#: templates/chimere/edit.html:48 templates/chimere/edit_route.html:44 #: templates/chimere/main_map.html:26 #: templates/chimere/main_map_simple.html:10 msgid "Categories" @@ -1011,19 +1011,19 @@ msgstr "" msgid "Invalid user or password." msgstr "Nom d'utilisateur ou mot de passe incorrect" -#: views.py:325 +#: views.py:326 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:411 +#: views.py:412 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:524 +#: views.py:525 msgid "Comments/request on the map" msgstr "Commentaires/requètes sur la carte" -#: views.py:527 +#: views.py:528 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." @@ -1032,19 +1032,19 @@ msgstr "" "laissé votre courriel vous serez peut-être contacté bientôt pour plus de " "détails." -#: views.py:531 +#: views.py:532 msgid "Temporary error. Renew your message later." msgstr "Erreur temporaire. Réenvoyez votre message plus tard." -#: views.py:725 +#: views.py:726 msgid "No category available in this area." msgstr "Pas de catégorie disponible sur cette zone." -#: views.py:825 +#: views.py:826 msgid "Bad geometry" msgstr "Géométrie incorrecte" -#: views.py:914 +#: views.py:915 msgid "Incorrect choice in the list" msgstr "Choix incorrect dans la liste" @@ -1353,11 +1353,11 @@ msgstr "Proposer une modification" msgid "I would like to propose an amendment for this item:" msgstr "Je souhaiterais proposer une modification pour cet élément :" -#: templates/chimere/edit.html:20 +#: templates/chimere/edit.html:22 msgid "Error" msgstr "Erreur" -#: templates/chimere/edit.html:23 templates/chimere/edit_route.html:20 +#: templates/chimere/edit.html:25 templates/chimere/edit_route.html:22 msgid "" "You are logged as an administrator. Your modifications will be taking into " "account immediately." @@ -1365,31 +1365,40 @@ msgstr "" "Vous êtes connecté comme administrateur. Vos modifications vont être prises " "en compte immédiatement." -#: templates/chimere/edit.html:25 +#: templates/chimere/edit.html:27 msgid "Modify a point of interest" msgstr "Modifier un point d'intérêt" -#: templates/chimere/edit.html:25 +#: templates/chimere/edit.html:27 msgid "Add a point of interest" msgstr "Ajout d'un point d'intérêt" -#: templates/chimere/edit.html:31 +#: templates/chimere/edit.html:29 templates/chimere/edit.html.py:179 +msgid "Add/modify" +msgstr "Ajouter - Modifier" + +#: templates/chimere/edit.html:29 templates/chimere/edit.html.py:179 +#: templates/chimere/edit_route.html:103 +msgid "Propose" +msgstr "Proposez" + +#: templates/chimere/edit.html:34 msgid "Point" msgstr "Point" -#: templates/chimere/edit.html:32 templates/chimere/edit_route.html:29 +#: templates/chimere/edit.html:35 templates/chimere/edit_route.html:31 msgid "Select a location for this new site" msgstr "Choisissez une localisation pour ce nouveau site" -#: templates/chimere/edit.html:38 templates/chimere/edit_route.html:35 +#: templates/chimere/edit.html:41 templates/chimere/edit_route.html:37 msgid "indicates a mandatory field" msgstr "indique un champ obligatoire" -#: templates/chimere/edit.html:114 +#: templates/chimere/edit.html:119 msgid "Personal information" msgstr "Informations personnelles" -#: templates/chimere/edit.html:116 +#: templates/chimere/edit.html:121 msgid "" "This fields are not mandatory. If you provided them they not will be made " "public and they will only used to join you for this project." @@ -1398,39 +1407,35 @@ msgstr "" "pas publiés et ne seront utilisés seulement pour vous joindre dans le cadre " "de ce projet." -#: templates/chimere/edit.html:119 +#: templates/chimere/edit.html:124 msgid "Your name or nickname" msgstr "Votre nom ou pseudo" -#: templates/chimere/edit.html:124 +#: templates/chimere/edit.html:129 msgid "Your email" msgstr "Votre courriel" -#: templates/chimere/edit.html:129 +#: templates/chimere/edit.html:134 msgid "Comments about your submission" msgstr "Commentaires au sujet de votre proposition" -#: templates/chimere/edit.html:135 +#: templates/chimere/edit.html:140 msgid "Upload in progress. Please wait..." msgstr "Dépôt en cours. Veuillez patienter..." -#: templates/chimere/edit.html:153 templates/chimere/edit_route.html:78 -msgid "Propose" -msgstr "Proposez" - -#: templates/chimere/edit_route.html:22 +#: templates/chimere/edit_route.html:24 msgid "Modify a route" msgstr "Modifier un trajet" -#: templates/chimere/edit_route.html:22 +#: templates/chimere/edit_route.html:24 msgid "Add a route" msgstr "Ajout d'un nouveau trajet" -#: templates/chimere/main_map.html:22 templates/chimere/no_map.html:20 +#: templates/chimere/main_map.html:22 templates/chimere/no_map.html:21 msgid "Identified as: " msgstr "Identifié en tant que : " -#: templates/chimere/main_map.html:22 templates/chimere/no_map.html:20 +#: templates/chimere/main_map.html:22 templates/chimere/no_map.html:21 msgid "Logout" msgstr "Se déconnecter" @@ -1438,17 +1443,17 @@ msgstr "Se déconnecter" msgid "Simple map" msgstr "Carte simple" -#: templates/chimere/no_map.html:30 +#: templates/chimere/no_map.html:31 msgid "No map are currently available for your account." msgstr "Aucune carte n'est disponible actuellement pour votre compte." -#: templates/chimere/no_map.html:32 +#: templates/chimere/no_map.html:33 msgid "" "No map are currently available for public access. If you have an account " "identify yourself." msgstr "" -"Aucune carte n'est disponible actuellement en accès public. Si vous " -"avez un compte identifiez vous." +"Aucune carte n'est disponible actuellement en accès public. Si vous avez un " +"compte identifiez vous." #: templates/chimere/upload_file.html:13 msgid "Thank you for your submission!" @@ -1727,9 +1732,6 @@ msgstr "Bienvenue sur %s" #~ msgid "Administration de Chimère" #~ msgstr "Administration de Chimère" -#~ msgid "Add/modify a site" -#~ msgstr "Ajouter ou modifier un site" - #~ msgid "Categorys" #~ msgstr "Catégories" diff --git a/chimere/models.py b/chimere/models.py index f851b9c..0591701 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -1534,7 +1534,7 @@ post_save.connect(map_post_save, sender=Map) def get_maps_for_user(user): """ - Getting subcats for a specific user + Getting maps for a specific user """ perms = user.get_all_permissions() maps = set() |