diff --git a/umap/locale/fr/LC_MESSAGES/django.mo b/umap/locale/fr/LC_MESSAGES/django.mo
index e6d8eb68700108fb1d4be3a4c957c7a946c0c343..2e4341ab9d1effa4616d22e030576ecd4c05e8e3 100644
Binary files a/umap/locale/fr/LC_MESSAGES/django.mo and b/umap/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/umap/locale/fr/LC_MESSAGES/django.po b/umap/locale/fr/LC_MESSAGES/django.po
index 20e6c1149c167facfa38bfe1248e3dcf728c4a22..65286dca7fa1c5f62e8e52c1de6134f23afd8543 100644
--- a/umap/locale/fr/LC_MESSAGES/django.po
+++ b/umap/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 14:08+0100\n"
+"POT-Creation-Date: 2013-02-12 18:43+0100\n"
 "PO-Revision-Date: 2012-12-27 11:09+0100\n"
 "Last-Translator: YOHAN BONIFACE <yb@enix.org>\n"
 "Language-Team: FR <LL@li.org>\n"
@@ -18,8 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: templates/leaflet_storage/category_form.html:26
-#: templates/leaflet_storage/feature_form.html:14
+#: templates/auth/user_detail.html:7
+#, python-format
+msgid "Browse %(current_user)s's maps"
+msgstr "Consulter les cartes de %(current_user)s"
+
+#: templates/leaflet_storage/category_form.html:18
+#: templates/leaflet_storage/feature_form.html:12
 #: templates/leaflet_storage/map_form.html:17
 msgid "Delete"
 msgstr "Supprimer"
@@ -28,94 +33,174 @@ msgstr "Supprimer"
 msgid "Create your map now!"
 msgstr "Créer une carte"
 
-#: templates/leaflet_storage/map_list.html:8
+#: templates/leaflet_storage/map_list.html:6
 msgid "Cured by"
 msgstr "Maintenu par"
 
-#: templates/leaflet_storage/map_list.html:8
+#: templates/leaflet_storage/map_list.html:6
 msgid "See this map!"
 msgstr "Voir cette carte!"
 
+#: templates/leaflet_storage/map_list.html:10
+msgid "More"
+msgstr "Plus"
+
+#: templates/leaflet_storage/map_update_settings.html:2
+msgid "Map settings"
+msgstr "Paramètres"
+
 #: templates/leaflet_storage/map_update_tilelayers.html:2
 msgid "Choose your tilelayer"
 msgstr "Choisir un fond de carte"
 
-#: templates/youmap/home.html:39
+#: templates/leaflet_storage/upload_form.html:2
+msgid "Upload features"
+msgstr "Importer des données"
+
+#: templates/leaflet_storage/upload_form.html:11
+msgid "Details on formats"
+msgstr "Détails sur les formats"
+
+#: templates/leaflet_storage/upload_form.html:13
+msgid "GeoJSON"
+msgstr "GeoJSON"
+
+#: templates/leaflet_storage/upload_form.html:15
+msgid "Properties used: name or title, description, color"
+msgstr "Propriétés prises en compte: name ou title, description, color"
+
+#: templates/leaflet_storage/upload_form.html:20
+msgid "KML"
+msgstr "KML"
+
+#: templates/leaflet_storage/upload_form.html:22
+msgid "Properties used: name, description"
+msgstr "Propriétés prises en compte: name, description"
+
+#: templates/leaflet_storage/upload_form.html:27
+msgid "GPX"
+msgstr "GPX"
+
+#: templates/leaflet_storage/upload_form.html:29
+msgid "Properties used: name, desc"
+msgstr "Propriétés prises en compte: name, desc"
+
+#: templates/registration/login.html:4
+msgid "Please choose a provider"
+msgstr "Merci de choisir un fournisseur"
+
+#: templates/umap/about_summary.html:4
+msgid "What is u{Map}"
+msgstr "u{Map}, c'est quoi"
+
+#: templates/umap/about_summary.html:5
+#, python-format
 msgid ""
-"u{Map} let you create maps with OpenStreetMap layers in a minute and embed "
-"them in your site.<br /> This is a demo instance, you can host your own, "
-"it's <strong>open source</strong>!"
+"u{Map} let you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
+"layers in a minute and embed them in your site.<br /> This is a demo "
+"instance, you can host your own, it's <a href=\"%(repo_url)s\">open source</"
+"a>!"
 msgstr ""
-"u{Map} permet de créer des cartes personnalisées sur des fonds OpenStreetMap "
-"en un instant et les afficher dans votre site <br /> Ceci est une instance "
-"de démonstration, vous pouvez héberger la vôtre, c'est <strong>open source</"
-"strong>!"
+"u{Map} permet de créer des cartes personnalisées sur des fonds <a href="
+"\"%(osm_url)s\" />OpenStreetMap</a> en un instant et les afficher dans votre "
+"site <br /> Ceci est une instance de démonstration, vous pouvez héberger la "
+"vôtre, c'est <a href=\"%(repo_url)s\">open source</a>"
 
-#: templates/youmap/home.html:43
-msgid "What you can do?"
+#: templates/umap/about_summary.html:9
+msgid "What can you do?"
 msgstr "Que pouvez-vous faire?"
 
-#: templates/youmap/home.html:45
+#: templates/umap/about_summary.html:11
 msgid "Choose the layers of your map"
 msgstr "Choisir les fonds de carte"
 
-#: templates/youmap/home.html:46
+#: templates/umap/about_summary.html:12
 msgid "Add POIs: markers, lines, polygons..."
 msgstr "Ajouter des POI: markes, lignes, polygones..."
 
-#: templates/youmap/home.html:47
+#: templates/umap/about_summary.html:13
 msgid "Manage POIs colours and icons"
 msgstr "Choisir la couleur et les icônes"
 
-#: templates/youmap/home.html:48
+#: templates/umap/about_summary.html:14
+msgid "Manage map options: display a minimap, locate user on load…"
+msgstr ""
+"Gérer les options de la carte: afficher une minicarte, géolocaliser "
+"l'utilisateur..."
+
+#: templates/umap/about_summary.html:15
 msgid "Batch import geostructured data (GEOJson...)"
 msgstr "Import des données géographiques en masse (GeoJSON...)"
 
-#: templates/youmap/home.html:49
+#: templates/umap/about_summary.html:16
 msgid "Choose the licence for your data"
 msgstr "Choisir la licence de vos données"
 
-#: templates/youmap/home.html:50
+#: templates/umap/about_summary.html:17
 msgid "Embed and share your map"
 msgstr "Exporter et partager votre carte"
 
-#: templates/youmap/home.html:62
-msgid "Test it and create a map"
-msgstr "Tester et créer une carte"
+#: templates/umap/about_summary.html:23
+msgid "Play with the demo"
+msgstr "Tester la démo"
 
-#: templates/youmap/home.html:68
-msgid "Fork it"
-msgstr "Forker"
+#: templates/umap/content.html:26 templates/umap/search_bar.html:6
+msgid "Search maps"
+msgstr "Chercher des cartes"
 
-#: templates/youmap/home.html:73
-msgid "Users to play with"
-msgstr "Utilisateurs pour tester"
+#: templates/umap/content.html:35
+msgid "Last maps"
+msgstr "Dernières cartes"
 
-#: templates/youmap/home.html:87
-msgid "Browse maps"
-msgstr "Voir des cartes"
+#: templates/umap/home.html:12
+msgid "Get inspired, browse maps"
+msgstr "Naviguer dans les cartes"
 
-#: templates/youmap/navigation.html:11
+#: templates/umap/navigation.html:12
 msgid "My maps"
 msgstr "Mes cartes"
 
-#: templates/youmap/navigation.html:12
-msgid "Log out"
-msgstr "Déconnexion"
-
-#: templates/youmap/navigation.html:14
+#: templates/umap/navigation.html:14
 msgid "Log in"
 msgstr "Connexion"
 
-#: templates/youmap/navigation.html:21
-msgid "Search maps"
-msgstr "Chercher des cartes"
+#: templates/umap/navigation.html:14
+msgid "Sign in"
+msgstr "Créer un compte"
+
+#: templates/umap/navigation.html:16
+msgid "About"
+msgstr "À propos"
+
+#: templates/umap/navigation.html:17
+msgid "Feedback"
+msgstr "Feedback"
 
-#: templates/youmap/search.html:19
+#: templates/umap/navigation.html:19
+msgid "Log out"
+msgstr "Déconnexion"
+
+#: templates/umap/navigation.html:28
+msgid "Create a map"
+msgstr "Créer une carte"
+
+#: templates/umap/search.html:9
 #, python-format
 msgid "Search for maps containing «%(q)s» "
 msgstr "Chercher des cartes contenant «%(q)s»"
 
-#: templates/youmap/search.html:29
+#: templates/umap/search.html:17
 msgid "Not map found."
 msgstr "Aucune carte trouvée."
+
+#: templates/umap/search_bar.html:9
+msgid "Search"
+msgstr "Chercher"
+
+#: templates/umap/styles_fieldset.html:3
+msgid "Styles options"
+msgstr "Options de mise en forme"
+
+#: templates/umap/styles_fieldset.html:11
+msgid "Change marker shape and symbol."
+msgstr "Changer la forme du marqueur et le picto"
diff --git a/umap/templates/umap/about_summary.html b/umap/templates/umap/about_summary.html
index 2886b898bda82a3c079ae1eabd14f9491aada1a9..a11ae40242b06a3a74dada3580ce734144717998 100644
--- a/umap/templates/umap/about_summary.html
+++ b/umap/templates/umap/about_summary.html
@@ -2,7 +2,7 @@
 <div class="col _35">
   <div class="col _11 c20_20 tintbox">
     <h5>{% trans "What is u{Map}" %}</h5>
-    <p>{% blocktrans %}u{Map} let you create maps with <a href="http://osm.org" />OpenStreetMap</a> layers in a minute and embed them in your site.<br /> This is a demo instance, you can host your own, it's <a href="https://bitbucket.org/yohanboniface/umap">open source</a>!{% endblocktrans %}
+    <p>{% blocktrans with osm_url="http://osm.org" repo_url="https://bitbucket.org/yohanboniface/umap" %}u{Map} let you create maps with <a href="{{ osm_url }}" />OpenStreetMap</a> layers in a minute and embed them in your site.<br /> This is a demo instance, you can host your own, it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
     </p>
   </div>
   <div class="col umap-features-list _11 c20_20 c30_18 c25_13">
@@ -20,7 +20,7 @@
   {% if demo_map %}
   <div class="col _11 demo_map c30_wide">
     {% map_fragment demo_map %}
-    <a href="{{ demo_map.get_absolute_url }}" class="button">Play with the demo</a>
+    <a href="{{ demo_map.get_absolute_url }}" class="button">{% trans "Play with the demo" %}</a>
   </div>
   {% endif %}
 </div>
diff --git a/umap/templates/umap/search_bar.html b/umap/templates/umap/search_bar.html
index 4bf116fb5f00714f72284c45d011072058c4996d..45ff8affce62f851b159068d65caaf20be636dfa 100644
--- a/umap/templates/umap/search_bar.html
+++ b/umap/templates/umap/search_bar.html
@@ -6,7 +6,7 @@
     <input name="q" type="search" placeholder="{% trans 'Search maps' %}" value="{{ q|default:"" }}" />
   </div>
   <div class="part _5">
-    <input type="submit" value="Search" />
+    <input type="submit" value="{% trans 'Search' %}" />
   </div>
   </form>
 </div>