Merge branch 'master' into saclay-v3.0

Conflicts:
	locale/fr/LC_MESSAGES/django.po

1 files changed, 120 insertions, 55 deletions

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index f0d050b..96cbe37 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-15 19:12+0200\n"
+"POT-Creation-Date: 2017-02-12 21:00+0100\n"
 "PO-Revision-Date: 2010-03-20 20:00+0100\n"
 "Last-Translator: Étienne Loks <etienne.loks@peacefrogs.net>\n"
 "Language-Team: Iggdrasil\n"
@@ -19,7 +19,15 @@ msgstr ""
 msgid "Select"
 msgstr "Sélectionner"
 
-#: templates/chimere/base.html:24
+#: local_settings.py:51
+msgid "Foot"
+msgstr "Marche"
+
+#: local_settings.py:52
+msgid "Bicycle"
+msgstr "À vélo"
+
+#: templates/chimere/base.html:42
 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."
@@ -49,48 +57,48 @@ msgstr "Imprimer"
 msgid "Add multimedia from your computer or a website"
 msgstr "Ajout d'un fichier multimedia depuis votre ordinateur ou un site web"
 
-#: templates/chimere/blocks/alternate_multimedia.html:39
+#: templates/chimere/blocks/alternate_multimedia.html:40
 #: templates/chimere/edit.html:119
 msgid "Name"
 msgstr "Nom"
 
-#: templates/chimere/blocks/alternate_multimedia.html:43
+#: templates/chimere/blocks/alternate_multimedia.html:44
 msgid "Image"
 msgstr "Image"
 
-#: templates/chimere/blocks/alternate_multimedia.html:44
+#: templates/chimere/blocks/alternate_multimedia.html:45
 msgid "Audio, video, other..."
 msgstr "Audio, vidéo, autre..."
 
-#: templates/chimere/blocks/alternate_multimedia.html:47
+#: templates/chimere/blocks/alternate_multimedia.html:48
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/chimere/blocks/alternate_multimedia.html:48
+#: templates/chimere/blocks/alternate_multimedia.html:49
 msgid "Or"
 msgstr "Ou"
 
-#: templates/chimere/blocks/alternate_multimedia.html:49
+#: templates/chimere/blocks/alternate_multimedia.html:50
 msgid "Web address"
 msgstr "Adresse web"
 
-#: templates/chimere/blocks/alternate_multimedia.html:51
+#: templates/chimere/blocks/alternate_multimedia.html:52
 msgid "Add"
 msgstr "Ajout"
 
-#: templates/chimere/blocks/alternate_multimedia.html:81
+#: templates/chimere/blocks/alternate_multimedia.html:82
 msgid "You must provide a name."
 msgstr "Vous devez fournir un nom."
 
-#: templates/chimere/blocks/alternate_multimedia.html:86
+#: templates/chimere/blocks/alternate_multimedia.html:87
 msgid "You must choose a media type."
 msgstr "Vous devez renseigner le type de média."
 
-#: templates/chimere/blocks/alternate_multimedia.html:92
+#: templates/chimere/blocks/alternate_multimedia.html:93
 msgid "You must provide a file or a web address."
 msgstr "Vous devez fournir un fichier ou renseigner une adresse web."
 
-#: templates/chimere/blocks/alternate_multimedia.html:97
+#: templates/chimere/blocks/alternate_multimedia.html:98
 msgid "You must provide a web address."
 msgstr "Vous devez renseigner une adresse web."
 
@@ -106,9 +114,37 @@ msgstr "Options d'affichage"
 msgid "Map type"
 msgstr "Type de carte"
 
-#: templates/chimere/blocks/map.html:72
-msgid "Permalink"
-msgstr "Lien permanent"
+#: templates/chimere/blocks/map_menu.html:5 templates/chimere/detail.html:36
+msgctxt "routing"
+msgid "From"
+msgstr "En partir"
+
+#: templates/chimere/blocks/map_menu.html:6
+msgctxt "routing"
+msgid "Add a step"
+msgstr "Ajouter une étape"
+
+#: templates/chimere/blocks/map_menu.html:7 templates/chimere/detail.html:38
+msgctxt "routing"
+msgid "To"
+msgstr "Y aller"
+
+#: templates/chimere/blocks/map_menu.html:8
+msgctxt "routing"
+msgid "Clear the itinerary"
+msgstr "Effacer l'itinéraire"
+
+#: templates/chimere/blocks/map_menu.html:10
+msgid "Zoom in"
+msgstr "Zoom en avant"
+
+#: templates/chimere/blocks/map_menu.html:11
+msgid "Zoom out"
+msgstr "Zoom en arrière"
+
+#: templates/chimere/blocks/map_menu.html:12
+msgid "Center the map here"
+msgstr "Centrer la carte ici"
 
 #: templates/chimere/blocks/news.html:30
 msgid "See it on the map"
@@ -126,7 +162,7 @@ msgstr "Pas d'actualité aujourd'hui."
 msgid "+ Add a step"
 msgstr "+ Ajouter une étape"
 
-#: templates/chimere/blocks/routing.html:29
+#: templates/chimere/blocks/routing.html:29 templates/search/search.html:35
 msgid "Search"
 msgstr "Recherche"
 
@@ -162,10 +198,14 @@ msgstr "Étape"
 msgid "Share on"
 msgstr "Partager sur"
 
-#: templates/chimere/blocks/share_bar.html:8
+#: templates/chimere/blocks/share_bar.html:10
 msgid "Share"
 msgstr "Partager"
 
+#: templates/chimere/blocks/share_bar.html:25
+msgid "Copy and paste this address to share this item: \\n"
+msgstr "Copiez et collez cette adresse pour partager cet élément : \\n"
+
 #: templates/chimere/detail.html:2
 msgid "Close"
 msgstr "Fermer"
@@ -174,22 +214,12 @@ msgstr "Fermer"
 msgid "Date:"
 msgstr "Date :"
 
-#: templates/chimere/detail.html:33
-msgctxt "routing"
-msgid "From"
-msgstr "En partir"
-
-#: templates/chimere/detail.html:34
+#: templates/chimere/detail.html:37
 msgctxt "routing"
 msgid "Add step"
 msgstr "Ajouter une étape"
 
-#: templates/chimere/detail.html:35
-msgctxt "routing"
-msgid "To"
-msgstr "Y aller"
-
-#: templates/chimere/detail.html:39
+#: templates/chimere/detail.html:42
 msgid "Propose a modification"
 msgstr "Proposer une modification"
 
@@ -272,11 +302,12 @@ msgstr "Traitement en cours. Veuillez patienter..."
 msgid "Propose"
 msgstr "Proposez"
 
-#: templates/chimere/edit.html:197
+#: templates/chimere/edit.html:205
 msgid "There are missing/erroneous fields."
 msgstr "Il y a des champs manquants/erronés."
 
-#: templates/chimere/main_map.html:16
+#: templates/chimere/main_map.html:17
+#: templates/chimere/main_map_simple.html:14
 msgid ""
 "Error while loading the page... Refresh the page. If the problem persist "
 "contact the webmaster."
@@ -284,60 +315,94 @@ msgstr ""
 "Erreur lors du chargement de la page... Rafraichissez la page. Si le "
 "problème perdure prennez contact avec le webmaster."
 
-#: templates/chimere/main_map.html:32
-#: templates/chimere/main_map_simple.html:12
+#: templates/chimere/main_map.html:34
+#: templates/chimere/main_map_simple.html:30
 msgid "Categories"
 msgstr "Categories"
 
-#: templates/chimere/main_map.html:34
+#: templates/chimere/main_map.html:36
 msgctxt "menu"
 msgid "Search"
 msgstr "Recherche"
 
-#: templates/chimere/main_map.html:37
+#: templates/chimere/main_map.html:39
 msgctxt "menu"
 msgid "Routing"
 msgstr "Itinéraire"
 
-#: templates/chimere/main_map.html:42
+#: templates/chimere/main_map.html:44
+#: templates/chimere/main_map_simple.html:38
 msgid "Location"
 msgstr "Lieu"
 
-#: templates/chimere/main_map.html:45
+#: templates/chimere/main_map.html:47
+#: templates/chimere/main_map_simple.html:41
 msgid "Wander"
 msgstr "Balade"
 
-#: templates/chimere/main_map.html:48
+#: templates/chimere/main_map.html:50
+#: templates/chimere/main_map_simple.html:44
 msgid "Event"
 msgstr "Événement"
 
-#: templates/chimere/main_map.html:71
-msgid "contact us"
-msgstr "nous contacter"
+#: templates/chimere/main_map.html:76
+msgid "contact"
+msgstr "contact"
 
-#: templates/chimere/main_map.html:72
-msgid "terms of service, credits"
-msgstr "mentions légales, crédits"
+#: templates/chimere/main_map.html:77
+msgid "terms of service & credits"
+msgstr "mentions légales & crédits"
 
-#: templates/chimere/main_map.html:89
+#: templates/chimere/main_map.html:95
+#: templates/chimere/main_map_simple.html:84
 msgid "Move on the map"
 msgstr "Se déplacer sur la carte"
 
-#: templates/chimere/main_map.html:92
+#: templates/chimere/main_map.html:98
+#: templates/chimere/main_map_simple.html:87
 msgid "Draw"
 msgstr "Dessiner"
 
-#~ msgid "Zoom in"
-#~ msgstr "Zoom en avant"
+#: templates/chimere/main_map_simple.html:33
+#| msgctxt "menu"
+#| msgid "Routing"
+msgid "Routing"
+msgstr "Itinéraire"
+
+#: templates/chimere/main_map_simple.html:66
+msgid "contact us"
+msgstr "nous contacter"
+
+#: templates/chimere/main_map_simple.html:67
+msgid "terms of service, credits"
+msgstr "mentions légales, crédits"
+
+#: templates/search/search.html:3
+msgid "Do you mean: "
+msgstr "Vous voulez dire : "
+
+#: templates/search/search.html:4
+msgid "?"
+msgstr " ?"
+
+#: templates/search/search.html:15
+msgid "No results found."
+msgstr "Pas de résultat trouvé."
+
+#: templates/search/search.html:23
+msgid "Previous"
+msgstr "Précédent"
 
-#~ msgid "Zoom out"
-#~ msgstr "Zoom en arrière"
+#: templates/search/search.html:24
+msgid "More results..."
+msgstr "Plus de résulats..."
 
-#~ msgid "Foot"
-#~ msgstr "Marche"
+#: templates/search/search.html:42
+msgid "No exact match."
+msgstr "Pas de correspondance exacte."
 
-#~ msgid "Bicycle"
-#~ msgstr "À vélo"
+#~ msgid "Permalink"
+#~ msgstr "Lien permanent"
 
 #~ msgid "Motorcar"
 #~ msgstr "En voiture"