Merge branch 'v2.2' into carteouverte

2 files changed, 68 insertions, 18 deletions

diff --git a/chimere_example_static/chimere/css/extra-styles.css b/chimere_example_static/chimere/css/extra-styles.css
index aea52b1..38f3b7b 100644
--- a/chimere_example_static/chimere/css/extra-styles.css
+++ b/chimere_example_static/chimere/css/extra-styles.css
@@ -201,6 +201,7 @@ ul.share {
 #main-map {
     height: auto;
     bottom: 0px;
+    top:50px;
 }
 
 #footer .map-footer {
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 109e5bc..4b98532 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-10 19:23+0100\n"
+"POT-Creation-Date: 2015-02-25 13:39+0100\n"
 "PO-Revision-Date: 2014-12-10 19:23+0100\n"
 "Last-Translator: Étienne Loks <etienne.loks@peacefrogs.net>\n"
 "Language: \n"
@@ -45,19 +45,56 @@ msgstr "Vous conduisez plutôt lentement"
 msgid "You are riding pretty quickly"
 msgstr "Vous conduisez plutôt vite"
 
-#: templates/chimere/base.html:20
+#: templates/chimere/base.html:21
 msgid "You must enable JavaScript in your browser to display Chimère."
-msgstr "Vous devez activer le JavaScript sur votre navigateur pour utiliser Chimère."
+msgstr ""
+"Vous devez activer le JavaScript sur votre navigateur pour utiliser Chimère."
+
+#: templates/chimere/detail.html:18
+msgid "Date:"
+msgstr "Date :"
+
+#: templates/chimere/detail.html:27
+msgid "Source:"
+msgstr "Source :"
+
+#: templates/chimere/detail.html:28
+msgid "License:"
+msgstr "Licence :"
+
+#: templates/chimere/detail.html:30
+msgid "Show the gallery"
+msgstr "Montrer la gallerie"
+
+#: templates/chimere/detail.html:35
+msgid "Submit an amendment"
+msgstr "Proposer une modification"
+
+#: templates/chimere/detail.html:38 templates/chimere/detail.html.py:39
+msgid "Propose amendment"
+msgstr "Proposer une modification"
 
-#: templates/chimere/blocks/actions.html:28
+#: templates/chimere/detail.html:38
+msgid "I would like to propose an amendment for this item:"
+msgstr "Je voudrais proposer une modification pour cet élément :"
+
+#: templates/chimere/detail.html:51
+msgid "Gallery"
+msgstr "Galerie"
+
+#: templates/chimere/blocks/actions.html:31
+msgid "News"
+msgstr "Nouvelles"
+
+#: templates/chimere/blocks/actions.html:33
 msgid "Simple map"
 msgstr "Carte simple"
 
-#: templates/chimere/blocks/actions.html:30
+#: templates/chimere/blocks/actions.html:36
 msgid "Categories "
 msgstr "Catégories"
 
-#: templates/chimere/blocks/actions.html:32
+#: templates/chimere/blocks/actions.html:38
 msgid "Search"
 msgstr "Recherche"
 
@@ -85,18 +122,30 @@ msgstr "Type de carte"
 msgid "Permalink"
 msgstr "Lien permanent"
 
-#: templates/search/search.html:23
-msgid "No results found."
-msgstr "Pas de résultats."
+#: templates/chimere/blocks/share_bar.html:3
+msgid "Share on"
+msgstr "Partager sur"
+
+#: templates/chimere/blocks/share_bar.html:7
+msgid "Share"
+msgstr "Partager"
+
+#: templates/chimere/blocks/welcome.html:17
+msgid "Upcoming events"
+msgstr "Événements à venir"
+
+#: templates/chimere/blocks/welcome.html:50
+msgid "See it on the map"
+msgstr "Voir sur la carte"
+
+#~ msgid "No results found."
+#~ msgstr "Pas de résultats."
 
-#: templates/search/search.html:31
-msgid "Previous"
-msgstr "Précedent"
+#~ msgid "Previous"
+#~ msgstr "Précedent"
 
-#: templates/search/search.html:32
-msgid "More results..."
-msgstr "Plus de résultats..."
+#~ msgid "More results..."
+#~ msgstr "Plus de résultats..."
 
-#: templates/search/search.html:45
-msgid "No exact match."
-msgstr "Pas de terme correspondant exactement."
+#~ msgid "No exact match."
+#~ msgstr "Pas de terme correspondant exactement."