diff --git a/umap/locale/es/LC_MESSAGES/django.mo b/umap/locale/es/LC_MESSAGES/django.mo
index cac1f17d..4106e69b 100644
Binary files a/umap/locale/es/LC_MESSAGES/django.mo and b/umap/locale/es/LC_MESSAGES/django.mo differ
diff --git a/umap/locale/es/LC_MESSAGES/django.po b/umap/locale/es/LC_MESSAGES/django.po
index f7b3b650..8d774115 100644
--- a/umap/locale/es/LC_MESSAGES/django.po
+++ b/umap/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-15 15:14+0200\n"
+"POT-Creation-Date: 2013-06-16 17:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Browse %(current_user)s's maps"
 msgstr "Mapas de %(current_user)s"
 
-#: templates/leaflet_storage/category_form.html:18
+#: templates/leaflet_storage/datalayer_form.html:18
 #: templates/leaflet_storage/feature_form.html:12
 #: templates/leaflet_storage/map_form.html:20
 msgid "Delete"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: templates/leaflet_storage/map_list.html:6
-msgid "Cured by"
+msgid "Cooked up by"
 msgstr "Iniciado por"
 
 #: templates/leaflet_storage/map_list.html:6
@@ -58,40 +58,43 @@ msgstr "Más"
 msgid "Map settings"
 msgstr ""
 
-#: templates/leaflet_storage/map_update_tilelayers.html:2
-msgid "Choose your tilelayer"
-msgstr ""
-
 #: templates/leaflet_storage/upload_form.html:2
 msgid "Upload features"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:11
+#: templates/leaflet_storage/upload_form.html:14
 msgid "Details on formats"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:13
+#: templates/leaflet_storage/upload_form.html:16
 msgid "GeoJSON"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:15
-msgid "Properties used: name or title, description, color"
+#: templates/leaflet_storage/upload_form.html:18
+#: templates/leaflet_storage/upload_form.html:25
+#: templates/leaflet_storage/upload_form.html:32
+msgid "Properties used"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:20
+#: templates/leaflet_storage/upload_form.html:23
 msgid "KML"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:22
-msgid "Properties used: name, description"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:27
+#: templates/leaflet_storage/upload_form.html:30
 msgid "GPX"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:29
-msgid "Properties used: name, desc"
+#: templates/leaflet_storage/upload_form.html:37
+msgid "CSV"
+msgstr ""
+
+#: templates/leaflet_storage/upload_form.html:39
+msgid ""
+"Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point "
+"geometries are imported. The import will look at the column headers for any "
+"mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the "
+"begining of the header, case insensitive). Also, column «title» or «name», "
+"«description» and «color» will be taken into account."
 msgstr ""
 
 #: templates/registration/login.html:3
diff --git a/umap/locale/fi/LC_MESSAGES/django.mo b/umap/locale/fi/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..fc5ee809
Binary files /dev/null and b/umap/locale/fi/LC_MESSAGES/django.mo differ
diff --git a/umap/locale/fi/LC_MESSAGES/django.po b/umap/locale/fi/LC_MESSAGES/django.po
index 5e969e08..19261449 100644
--- a/umap/locale/fi/LC_MESSAGES/django.po
+++ b/umap/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-16 12:20+0200\n"
+"POT-Creation-Date: 2013-06-16 17:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Browse %(current_user)s's maps"
 msgstr ""
 
-#: templates/leaflet_storage/category_form.html:18
+#: templates/leaflet_storage/datalayer_form.html:18
 #: templates/leaflet_storage/feature_form.html:12
 #: templates/leaflet_storage/map_form.html:20
 msgid "Delete"
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 
 #: templates/leaflet_storage/map_list.html:6
-msgid "Cured by"
+msgid "Cooked up by"
 msgstr ""
 
 #: templates/leaflet_storage/map_list.html:6
@@ -58,40 +58,43 @@ msgstr ""
 msgid "Map settings"
 msgstr ""
 
-#: templates/leaflet_storage/map_update_tilelayers.html:2
-msgid "Choose your tilelayer"
-msgstr ""
-
 #: templates/leaflet_storage/upload_form.html:2
 msgid "Upload features"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:11
+#: templates/leaflet_storage/upload_form.html:14
 msgid "Details on formats"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:13
+#: templates/leaflet_storage/upload_form.html:16
 msgid "GeoJSON"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:15
-msgid "Properties used: name or title, description, color"
+#: templates/leaflet_storage/upload_form.html:18
+#: templates/leaflet_storage/upload_form.html:25
+#: templates/leaflet_storage/upload_form.html:32
+msgid "Properties used"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:20
+#: templates/leaflet_storage/upload_form.html:23
 msgid "KML"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:22
-msgid "Properties used: name, description"
-msgstr ""
-
-#: templates/leaflet_storage/upload_form.html:27
+#: templates/leaflet_storage/upload_form.html:30
 msgid "GPX"
 msgstr ""
 
-#: templates/leaflet_storage/upload_form.html:29
-msgid "Properties used: name, desc"
+#: templates/leaflet_storage/upload_form.html:37
+msgid "CSV"
+msgstr ""
+
+#: templates/leaflet_storage/upload_form.html:39
+msgid ""
+"Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point "
+"geometries are imported. The import will look at the column headers for any "
+"mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the "
+"begining of the header, case insensitive). Also, column «title» or «name», "
+"«description» and «color» will be taken into account."
 msgstr ""
 
 #: templates/registration/login.html:3
diff --git a/umap/locale/fr/LC_MESSAGES/django.mo b/umap/locale/fr/LC_MESSAGES/django.mo
index 39f74c58..e72eca1f 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 a7fc062e..295ff01e 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: 2013-05-01 18:49-0400\n"
+"POT-Creation-Date: 2013-06-16 17:32+0200\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"
@@ -23,7 +23,7 @@ msgstr ""
 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/datalayer_form.html:18
 #: templates/leaflet_storage/feature_form.html:12
 #: templates/leaflet_storage/map_form.html:20
 msgid "Delete"
@@ -48,7 +48,7 @@ msgstr ""
 "et chargez la carte, celle-ci sera automatiquement associée à votre compte."
 
 #: templates/leaflet_storage/map_list.html:6
-msgid "Cured by"
+msgid "Cooked up by"
 msgstr "Maintenu par"
 
 #: templates/leaflet_storage/map_list.html:6
@@ -63,43 +63,52 @@ msgstr "Plus"
 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/leaflet_storage/upload_form.html:2
 msgid "Upload features"
 msgstr "Importer des données"
 
-#: templates/leaflet_storage/upload_form.html:11
+#: templates/leaflet_storage/upload_form.html:14
 msgid "Details on formats"
 msgstr "Détails sur les formats"
 
-#: templates/leaflet_storage/upload_form.html:13
+#: templates/leaflet_storage/upload_form.html:16
 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:18
+#: templates/leaflet_storage/upload_form.html:25
+#: templates/leaflet_storage/upload_form.html:32
+msgid "Properties used"
+msgstr "Propriétés prises en compte"
 
-#: templates/leaflet_storage/upload_form.html:20
+#: templates/leaflet_storage/upload_form.html:23
 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
+#: templates/leaflet_storage/upload_form.html:30
 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/leaflet_storage/upload_form.html:37
+msgid "CSV"
+msgstr "CSV"
 
-#: templates/registration/login.html:4
+#: templates/leaflet_storage/upload_form.html:39
+msgid ""
+"Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point "
+"geometries are imported. The import will look at the column headers for any "
+"mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the "
+"begining of the header, case insensitive). Also, column «title» or «name», "
+"«description» and «color» will be taken into account."
+msgstr ""
+"CSV (séparateur: virgule, point-virgule ou tabulation). Seule la projection WGS84 "
+"est supportée. Seuls les géométries de type Point sont pris en compte. Les chaînes "
+"suivantes sont recherchées, en début ou fin de titre de colonne, insensible à la "
+"casse pour déterminer les coordonnées géométriques: «lat», «latitude», «lng», «lon», " 
+"«longitude». Les colonnes «title» ou «name», «description» ou «text» et «color» "
+"seront aussi utilisées, si présentes."
+
+#: templates/registration/login.html:3
 msgid "Please choose a provider"
 msgstr "Merci de choisir un fournisseur"
 
@@ -123,8 +132,8 @@ msgid ""
 "This is a demo instance, you can host your own, it's <a href=\"%(repo_url)s"
 "\">open source</a>!"
 msgstr ""
-"Ceci est une instance de démonstration, vous pouvez héberger la "
-"vôtre, c'est <a href=\"%(repo_url)s\">open source</a>"
+"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/umap/about_summary.html:9
 #, python-format
diff --git a/umap/locale/it/LC_MESSAGES/django.mo b/umap/locale/it/LC_MESSAGES/django.mo
index a873428c..1b079828 100644
Binary files a/umap/locale/it/LC_MESSAGES/django.mo and b/umap/locale/it/LC_MESSAGES/django.mo differ
diff --git a/umap/locale/it/LC_MESSAGES/django.po b/umap/locale/it/LC_MESSAGES/django.po
index 2f28c647..d307bd72 100644
--- a/umap/locale/it/LC_MESSAGES/django.po
+++ b/umap/locale/it/LC_MESSAGES/django.po
@@ -7,7 +7,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-06-16 17:32+0200\n"
 "PO-Revision-Date: 2013-01-04 12:19+0100\n"
 "Last-Translator: Stefano\n"
 "Language-Team: FR <LL@li.org>\n"
@@ -17,9 +17,14 @@ 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/leaflet_storage/map_form.html:17
+#: templates/auth/user_detail.html:7
+#, python-format
+msgid "Browse %(current_user)s's maps"
+msgstr ""
+
+#: templates/leaflet_storage/datalayer_form.html:18
+#: templates/leaflet_storage/feature_form.html:12
+#: templates/leaflet_storage/map_form.html:20
 msgid "Delete"
 msgstr "Cancella"
 
@@ -27,88 +32,197 @@ msgstr "Cancella"
 msgid "Create your map now!"
 msgstr "Crea la tua mappa!"
 
-#: templates/leaflet_storage/map_list.html:8
-msgid "Cured by"
+#: templates/leaflet_storage/map_form.html:17
+msgid ""
+"You are creating a map without being authenticated. A cookie will be set on "
+"this browser to make possible for you to edit the map in the future. If you "
+"want to edit the map from another computer, use the \"edit url\" displayed "
+"in the \"permissions\" window. If you log in and load the map, it will be "
+"attached to your account."
+msgstr ""
+
+#: templates/leaflet_storage/map_list.html:6
+msgid "Cooked up by"
 msgstr "Curato da"
 
-#: templates/leaflet_storage/map_list.html:8
+#: templates/leaflet_storage/map_list.html:6
 msgid "See this map!"
 msgstr "Guarda la mappa!"
 
-#: templates/leaflet_storage/map_update_tilelayers.html:2
-msgid "Choose your tilelayer"
-msgstr "Scegli un livello di sfondo"
+#: templates/leaflet_storage/map_list.html:10
+msgid "More"
+msgstr ""
 
-#: templates/youmap/home.html:39
-msgid "uMap 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>!"
-msgstr "uMap ti permette di creare mappe con i livelli OpenStreetMap in un minuto e di integrarle nel tuo sito. <br/> Questa è una istanza di prova, puoi hostare la tua copia, è <strong>open source</strong>!"
+#: templates/leaflet_storage/map_update_settings.html:2
+msgid "Map settings"
+msgstr ""
 
-#: templates/youmap/home.html:43
-msgid "What you can do?"
+#: templates/leaflet_storage/upload_form.html:2
+msgid "Upload features"
+msgstr ""
+
+#: templates/leaflet_storage/upload_form.html:14
+msgid "Details on formats"
+msgstr ""
+
+#: templates/leaflet_storage/upload_form.html:16
+msgid "GeoJSON"
+msgstr ""
+
+#: templates/leaflet_storage/upload_form.html:18
+#: templates/leaflet_storage/upload_form.html:25
+#: templates/leaflet_storage/upload_form.html:32
+msgid "Properties used"
+msgstr ""
+
+#: templates/leaflet_storage/upload_form.html:23
+msgid "KML"
+msgstr ""
+
+#: templates/leaflet_storage/upload_form.html:30
+msgid "GPX"
+msgstr ""
+
+#: templates/leaflet_storage/upload_form.html:37
+msgid "CSV"
+msgstr ""
+
+#: templates/leaflet_storage/upload_form.html:39
+msgid ""
+"Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point "
+"geometries are imported. The import will look at the column headers for any "
+"mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the "
+"begining of the header, case insensitive). Also, column «title» or «name», "
+"«description» and «color» will be taken into account."
+msgstr ""
+
+#: templates/registration/login.html:3
+msgid "Please choose a provider"
+msgstr ""
+
+#: templates/umap/about_summary.html:4
+msgid "What is uMap"
+msgstr ""
+
+#: templates/umap/about_summary.html:5
+#, fuzzy, python-format
+msgid ""
+"uMap let you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
+"layers in a minute and embed them in your site."
+msgstr ""
+"uMap ti permette di creare mappe con i livelli OpenStreetMap in un minuto e "
+"di integrarle nel tuo sito. <br/> Questa è una istanza di prova, puoi "
+"hostare la tua copia, è <strong>open source</strong>!"
+
+#: templates/umap/about_summary.html:7
+#, python-format
+msgid ""
+"This is a demo instance, you can host your own, it's <a href=\"%(repo_url)s"
+"\">open source</a>!"
+msgstr ""
+
+#: templates/umap/about_summary.html:9
+#, python-format
+msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
+msgstr ""
+
+#: templates/umap/about_summary.html:14
+#, fuzzy
+msgid "What can you do?"
 msgstr "Cosa puoi fare?"
 
-#: templates/youmap/home.html:45
+#: templates/umap/about_summary.html:16
 msgid "Choose the layers of your map"
 msgstr "Scegli i livelli della tua mappa"
 
-#: templates/youmap/home.html:46
+#: templates/umap/about_summary.html:17
 msgid "Add POIs: markers, lines, polygons..."
 msgstr "Aggiungi POI: marker, linee, poligoni.."
 
-#: templates/youmap/home.html:47
+#: templates/umap/about_summary.html:18
 msgid "Manage POIs colours and icons"
 msgstr "Scegli i colori e le icone dei POI"
 
-#: templates/youmap/home.html:48
+#: templates/umap/about_summary.html:19
+msgid "Manage map options: display a minimap, locate user on load…"
+msgstr ""
+
+#: templates/umap/about_summary.html:20
 msgid "Batch import geostructured data (GEOJson...)"
 msgstr "Importa dati geostrutturati (GEOJson...)"
 
-#: templates/youmap/home.html:49
+#: templates/umap/about_summary.html:21
 msgid "Choose the licence for your data"
 msgstr "Scegli la licenza dei tuoi dati"
 
-#: templates/youmap/home.html:50
+#: templates/umap/about_summary.html:22
 msgid "Embed and share your map"
 msgstr "Integra e condividi la tua mappa"
 
-#: templates/youmap/home.html:62
-msgid "Test it and create a map"
-msgstr "Testa e crea una mappa"
+#: templates/umap/about_summary.html:28
+msgid "Play with the demo"
+msgstr ""
 
-#: templates/youmap/home.html:68
-msgid "Fork it"
-msgstr "Forkalo"
-
-#: templates/youmap/home.html:73
-msgid "Users to play with"
-msgstr "Utenti di prova"
-
-#: templates/youmap/home.html:87
-msgid "Browse maps"
-msgstr "Naviga le carte"
-
-#: templates/youmap/navigation.html:11
-msgid "My maps"
-msgstr "Le mie carte"
-
-#: templates/youmap/navigation.html:12
-msgid "Log out"
-msgstr "Logout"
-
-#: templates/youmap/navigation.html:14
-msgid "Log in"
-msgstr "Login"
-
-#: templates/youmap/navigation.html:21
+#: templates/umap/content.html:26 templates/umap/search_bar.html:6
 msgid "Search maps"
 msgstr "Cerca mappe"
 
-#: templates/youmap/search.html:19
+#: templates/umap/content.html:35
+#, fuzzy
+msgid "Last maps"
+msgstr "Le mie carte"
+
+#: templates/umap/home.html:12
+msgid "Get inspired, browse maps"
+msgstr ""
+
+#: templates/umap/navigation.html:12
+msgid "My maps"
+msgstr "Le mie carte"
+
+#: templates/umap/navigation.html:14
+msgid "Log in"
+msgstr "Login"
+
+#: templates/umap/navigation.html:14
+msgid "Sign in"
+msgstr ""
+
+#: templates/umap/navigation.html:16
+msgid "About"
+msgstr ""
+
+#: templates/umap/navigation.html:17
+msgid "Feedback"
+msgstr ""
+
+#: templates/umap/navigation.html:19
+msgid "Log out"
+msgstr "Logout"
+
+#: templates/umap/navigation.html:28
+#, fuzzy
+msgid "Create a map"
+msgstr "Crea la tua mappa!"
+
+#: templates/umap/search.html:9
 #, python-format
 msgid "Search for maps containing «%(q)s» "
 msgstr "Cerca mappe che contengono «%(q)s»"
 
-#: templates/youmap/search.html:29
+#: templates/umap/search.html:17
 msgid "Not map found."
 msgstr "Nessuna mappa trovata."
 
+#: templates/umap/search_bar.html:9
+#, fuzzy
+msgid "Search"
+msgstr "Cerca mappe"
+
+#: templates/umap/styles_fieldset.html:3
+msgid "Styles options"
+msgstr ""
+
+#: templates/umap/styles_fieldset.html:11
+msgid "Change marker shape and symbol."
+msgstr ""
\ No newline at end of file
diff --git a/umap/locale/pt/LC_MESSAGES/django.mo b/umap/locale/pt/LC_MESSAGES/django.mo
index 73750b6e..b75b61d2 100644
Binary files a/umap/locale/pt/LC_MESSAGES/django.mo and b/umap/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/umap/locale/pt/LC_MESSAGES/django.po b/umap/locale/pt/LC_MESSAGES/django.po
index aaf2baf8..ccc7a59e 100644
--- a/umap/locale/pt/LC_MESSAGES/django.po
+++ b/umap/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-24 11:45+0100\n"
+"POT-Creation-Date: 2013-06-16 17:32+0200\n"
 "PO-Revision-Date: 2013-03-10 20:00+0100\n"
 "Last-Translator: Francisco DOS SANTOS <f.dos.santos@free.fr>\n"
 "Language-Team: PT <LL@li.org>\n"
@@ -23,9 +23,9 @@ msgstr ""
 msgid "Browse %(current_user)s's maps"
 msgstr "Consulta os mapas de %(current_user)s"
 
-#: templates/leaflet_storage/category_form.html:18
+#: templates/leaflet_storage/datalayer_form.html:18
 #: templates/leaflet_storage/feature_form.html:12
-#: templates/leaflet_storage/map_form.html:17
+#: templates/leaflet_storage/map_form.html:20
 msgid "Delete"
 msgstr "Apagar"
 
@@ -33,8 +33,17 @@ msgstr "Apagar"
 msgid "Create your map now!"
 msgstr "Cria o seu mapa já!"
 
+#: templates/leaflet_storage/map_form.html:17
+msgid ""
+"You are creating a map without being authenticated. A cookie will be set on "
+"this browser to make possible for you to edit the map in the future. If you "
+"want to edit the map from another computer, use the \"edit url\" displayed "
+"in the \"permissions\" window. If you log in and load the map, it will be "
+"attached to your account."
+msgstr ""
+
 #: templates/leaflet_storage/map_list.html:6
-msgid "Cured by"
+msgid "Cooked up by"
 msgstr "Mantido por"
 
 #: templates/leaflet_storage/map_list.html:6
@@ -49,43 +58,47 @@ msgstr "Mais"
 msgid "Map settings"
 msgstr "Parâmetros"
 
-#: templates/leaflet_storage/map_update_tilelayers.html:2
-msgid "Choose your tilelayer"
-msgstr "Escolha o mapa de fundo"
-
 #: templates/leaflet_storage/upload_form.html:2
 msgid "Upload features"
 msgstr "Carregar objetos"
 
-#: templates/leaflet_storage/upload_form.html:11
+#: templates/leaflet_storage/upload_form.html:14
 msgid "Details on formats"
 msgstr "Detalhes nos formatos"
 
-#: templates/leaflet_storage/upload_form.html:13
+#: templates/leaflet_storage/upload_form.html:16
 msgid "GeoJSON"
 msgstr "GeoJSON"
 
-#: templates/leaflet_storage/upload_form.html:15
-msgid "Properties used: name or title, description, color"
-msgstr "Uso propriedade: name ou title, description, color"
+#: templates/leaflet_storage/upload_form.html:18
+#: templates/leaflet_storage/upload_form.html:25
+#: templates/leaflet_storage/upload_form.html:32
+#, fuzzy
+msgid "Properties used"
+msgstr "Uso propriedade: name, desc"
 
-#: templates/leaflet_storage/upload_form.html:20
+#: templates/leaflet_storage/upload_form.html:23
 msgid "KML"
 msgstr "KML"
 
-#: templates/leaflet_storage/upload_form.html:22
-msgid "Properties used: name, description"
-msgstr "Uso propriedade: name, description"
-
-#: templates/leaflet_storage/upload_form.html:27
+#: templates/leaflet_storage/upload_form.html:30
 msgid "GPX"
 msgstr "GPX"
 
-#: templates/leaflet_storage/upload_form.html:29
-msgid "Properties used: name, desc"
-msgstr "Uso propriedade: name, desc"
+#: templates/leaflet_storage/upload_form.html:37
+msgid "CSV"
+msgstr ""
 
-#: templates/registration/login.html:4
+#: templates/leaflet_storage/upload_form.html:39
+msgid ""
+"Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point "
+"geometries are imported. The import will look at the column headers for any "
+"mention of «lat», «latitude», «lng», «lon», «longitude» (at the end or the "
+"begining of the header, case insensitive). Also, column «title» or «name», "
+"«description» and «color» will be taken into account."
+msgstr ""
+
+#: templates/registration/login.html:3
 msgid "Please choose a provider"
 msgstr "Por favor escolha um provedor"
 
@@ -94,51 +107,61 @@ msgid "What is uMap"
 msgstr "O que é uMap"
 
 #: templates/umap/about_summary.html:5
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "uMap 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>!"
+"layers in a minute and embed them in your site."
+msgstr ""
+"uMap permita criar num instante mapas personalizados com <a href="
+"\"%(osm_url)s\" />OpenStreetMap</a> e mostrar-los no seu site.<br /> Aqui é "
+"uma demonstração, podes instalar este software no teu próprio site, é <a "
+"href=\"%(repo_url)s\">software livre</a>!"
+
+#: templates/umap/about_summary.html:7
+#, python-format
+msgid ""
+"This is a demo instance, you can host your own, it's <a href=\"%(repo_url)s"
+"\">open source</a>!"
 msgstr ""
-"uMap permita criar num instante mapas personalizados com "
-"<a href=\"%(osm_url)s\" />OpenStreetMap</a> e mostrar-los no seu site."
-"<br /> Aqui é uma demonstração, podes instalar este software no teu "
-"próprio site, é <a href=\"%(repo_url)s\">software livre</a>!"
 
 #: templates/umap/about_summary.html:9
+#, python-format
+msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
+msgstr ""
+
+#: templates/umap/about_summary.html:14
 msgid "What can you do?"
 msgstr "O que podes fazer"
 
-#: templates/umap/about_summary.html:11
+#: templates/umap/about_summary.html:16
 msgid "Choose the layers of your map"
 msgstr "Escolher o mapa de fundo"
 
-#: templates/umap/about_summary.html:12
+#: templates/umap/about_summary.html:17
 msgid "Add POIs: markers, lines, polygons..."
 msgstr "Adicionar objetos: marcos, linhas, polígonos..."
 
-#: templates/umap/about_summary.html:13
+#: templates/umap/about_summary.html:18
 msgid "Manage POIs colours and icons"
 msgstr "Modificar cor e ícone dos objetos"
 
-#: templates/umap/about_summary.html:14
+#: templates/umap/about_summary.html:19
 msgid "Manage map options: display a minimap, locate user on load…"
 msgstr "Gerir diversas opções: mostrar um minimapa, localizar o usuário..."
 
-#: templates/umap/about_summary.html:15
+#: templates/umap/about_summary.html:20
 msgid "Batch import geostructured data (GEOJson...)"
 msgstr "Carregar ficheiros georeferenciados (GEOJson...)"
 
-#: templates/umap/about_summary.html:16
+#: templates/umap/about_summary.html:21
 msgid "Choose the licence for your data"
 msgstr "Escolher uma licença para os seus dados"
 
-#: templates/umap/about_summary.html:17
+#: templates/umap/about_summary.html:22
 msgid "Embed and share your map"
 msgstr "Exportar e partilhar seu mapa"
 
-#: templates/umap/about_summary.html:23
+#: templates/umap/about_summary.html:28
 msgid "Play with the demo"
 msgstr "Testar a demo"
 
diff --git a/umap/templates/leaflet_storage/map_list.html b/umap/templates/leaflet_storage/map_list.html
index 2d8a70dd..d1a530cd 100644
--- a/umap/templates/leaflet_storage/map_list.html
+++ b/umap/templates/leaflet_storage/map_list.html
@@ -3,7 +3,7 @@
 {% for map_inst in maps %}
 <div class="col _35">
     {% map_fragment map_inst %}
-    <div class="tintbox"><strong>{{ map_inst.name }}</strong>{% if map_inst.description %} — «{{ map_inst.description }}» {% endif %}<em>{% if map_inst.owner %} {% trans "Cured by" %} <a href="{% url 'user_maps' map_inst.owner.username %}">{{ map_inst.owner }}</a></em>{% endif %} — <a href="{{ map_inst.get_absolute_url }}">{% trans "See this map!" %}</a></div>
+    <div class="tintbox"><strong>{{ map_inst.name }}</strong>{% if map_inst.description %} — «{{ map_inst.description }}» {% endif %}<em>{% if map_inst.owner %} {% trans "Cooked up by" %} <a href="{% url 'user_maps' map_inst.owner.username %}">{{ map_inst.owner }}</a></em>{% endif %} — <a href="{{ map_inst.get_absolute_url }}">{% trans "See this map!" %}</a></div>
 </div>
 {% endfor %}
 {% if maps.has_next %}