diff --git a/umap/locale/cs_CZ/LC_MESSAGES/django.mo b/umap/locale/cs_CZ/LC_MESSAGES/django.mo
index 7b5b4c3b..558dd5db 100644
Binary files a/umap/locale/cs_CZ/LC_MESSAGES/django.mo and b/umap/locale/cs_CZ/LC_MESSAGES/django.mo differ
diff --git a/umap/locale/cs_CZ/LC_MESSAGES/django.po b/umap/locale/cs_CZ/LC_MESSAGES/django.po
index 5ae006a5..27a56158 100644
--- a/umap/locale/cs_CZ/LC_MESSAGES/django.po
+++ b/umap/locale/cs_CZ/LC_MESSAGES/django.po
@@ -5,13 +5,14 @@
 # Translators:
 # Jakub A. Tesinsky, 2014
 # Jakub A. Tesinsky, 2014
+# J. Podhorecky <j.podhorecky@volny.cz>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-08 14:50+0000\n"
-"PO-Revision-Date: 2018-09-08 14:51+0000\n"
-"Last-Translator: yohanboniface <yohanboniface@free.fr>\n"
+"PO-Revision-Date: 2018-10-02 15:26+0000\n"
+"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/yohanboniface/umap/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +35,7 @@ msgstr "Lze upravovat jen pomocí tajného odkazu"
 
 #: umap/middleware.py:14
 msgid "Site is readonly for maintenance"
-msgstr ""
+msgstr "Stránka je jen ke čtení kvůli údržbě"
 
 #: umap/models.py:17
 msgid "name"
@@ -138,7 +139,7 @@ msgstr "Zobrazit tuto vrstvu na startu."
 
 #: umap/templates/404.html:7
 msgid "Take me to the home page"
-msgstr ""
+msgstr "Vezměte mě na domovskou stránku"
 
 #: umap/templates/auth/user_detail.html:7
 #, python-format
@@ -148,23 +149,23 @@ msgstr "Prohlížej si mapy uživatele %(current_user)s'"
 #: umap/templates/auth/user_detail.html:15
 #, python-format
 msgid "%(current_user)s has no maps."
-msgstr ""
+msgstr "%(current_user)s nemá mapy."
 
 #: umap/templates/registration/login.html:4
 msgid "Please log in with your account"
-msgstr ""
+msgstr "Přihlaste se prosím k účtu"
 
 #: umap/templates/registration/login.html:18
 msgid "Username"
-msgstr ""
+msgstr "Uživatelské jméno"
 
 #: umap/templates/registration/login.html:20
 msgid "Password"
-msgstr ""
+msgstr "Heslo"
 
 #: umap/templates/registration/login.html:21
 msgid "Login"
-msgstr ""
+msgstr "Přihlásit se"
 
 #: umap/templates/registration/login.html:27
 msgid "Please choose a provider"
@@ -270,7 +271,7 @@ msgstr "Napište nám"
 
 #: umap/templates/umap/navigation.html:18
 msgid "Change password"
-msgstr ""
+msgstr "Změnit heslo"
 
 #: umap/templates/umap/navigation.html:20
 msgid "Log out"
@@ -278,37 +279,37 @@ msgstr "Odhlásit se"
 
 #: umap/templates/umap/password_change.html:6
 msgid "Password change"
-msgstr ""
+msgstr "Změna hesla"
 
 #: umap/templates/umap/password_change.html:7
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new"
 " password twice so we can verify you typed it in correctly."
-msgstr ""
+msgstr "Z bezpečnostních důvodů zadejte své staré heslo a dvakrát zadejte nové heslo, abychom mohli ověřit, že jste jej zadali správně."
 
 #: umap/templates/umap/password_change.html:12
 msgid "Old password"
-msgstr ""
+msgstr "Staré heslo"
 
 #: umap/templates/umap/password_change.html:14
 msgid "New password"
-msgstr ""
+msgstr "Nové heslo"
 
 #: umap/templates/umap/password_change.html:16
 msgid "New password confirmation"
-msgstr ""
+msgstr "Potvrzení nového hesla"
 
 #: umap/templates/umap/password_change.html:18
 msgid "Change my password"
-msgstr ""
+msgstr "Změnit moje heslo"
 
 #: umap/templates/umap/password_change_done.html:6
 msgid "Password change successful"
-msgstr ""
+msgstr "Změna hesla byla úspěšná"
 
 #: umap/templates/umap/password_change_done.html:7
 msgid "Your password was changed."
-msgstr ""
+msgstr "Vaše heslo bylo změněno."
 
 #: umap/templates/umap/search.html:13
 msgid "Not map found."
diff --git a/umap/locale/el/LC_MESSAGES/django.po b/umap/locale/el/LC_MESSAGES/django.po
index dcdd67a4..40260f08 100644
--- a/umap/locale/el/LC_MESSAGES/django.po
+++ b/umap/locale/el/LC_MESSAGES/django.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Emmanuel Verigos <emverigos@teemail.gr>, 2018
-# Emmanuel Verigos <emverigos@teemail.gr>, 2017
+# Emmanuel Verigos <emverigos@geodev.gr>, 2018
+# Emmanuel Verigos <emverigos@geodev.gr>, 2018
+# Emmanuel Verigos <emverigos@geodev.gr>, 2017
 # prendi <prendi@openmailbox.org>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-08 14:50+0000\n"
-"PO-Revision-Date: 2018-09-08 14:51+0000\n"
-"Last-Translator: yohanboniface <yohanboniface@free.fr>\n"
+"PO-Revision-Date: 2018-09-27 10:23+0000\n"
+"Last-Translator: Emmanuel Verigos <emverigos@geodev.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/yohanboniface/umap/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,23 +24,23 @@ msgstr ""
 #: umap/forms.py:40
 #, python-format
 msgid "Secret edit link is %s"
-msgstr ""
+msgstr "Ο μυστικός σύνδεσμος επεξεργασίας είναι %s"
 
 #: umap/forms.py:44 umap/models.py:114
 msgid "Everyone can edit"
-msgstr ""
+msgstr "Επεξεργασία από όλους"
 
 #: umap/forms.py:45
 msgid "Only editable with secret edit link"
-msgstr ""
+msgstr "Επεξεργάσιμο μόνο με μυστικό σύνδεσμο "
 
 #: umap/middleware.py:14
 msgid "Site is readonly for maintenance"
-msgstr ""
+msgstr "Ο δικτυακός τόπος είναι μόνο για ανάγνωση λόγο επεξεργασίας"
 
 #: umap/models.py:17
 msgid "name"
-msgstr "όνομα"
+msgstr "'Ονομα"
 
 #: umap/models.py:48
 msgid "details"
@@ -51,91 +52,91 @@ msgstr "Σύνδεσμος σελίδας Αναλυτικής Άδειας Χρ
 
 #: umap/models.py:63
 msgid "URL template using OSM tile format"
-msgstr ""
+msgstr "URL υπόδειγμα με χρήση μορφή υποβάθρου  OSM "
 
 #: umap/models.py:71
 msgid "Order of the tilelayers in the edit box"
-msgstr ""
+msgstr "Σειρά υποβάθρων στο πλαίσιο επεξεργασίας "
 
 #: umap/models.py:115
 msgid "Only editors can edit"
-msgstr ""
+msgstr "Μόνο οι συντάκτες μπορούν να επεξεργαστούν"
 
 #: umap/models.py:116
 msgid "Only owner can edit"
-msgstr ""
+msgstr "Μόνο ο ιδιοκτήτης μπορεί να επεξεργαστεί"
 
 #: umap/models.py:119
 msgid "everyone (public)"
-msgstr ""
+msgstr "Όλοι (κοινό)"
 
 #: umap/models.py:120
 msgid "anyone with link"
-msgstr ""
+msgstr "Οποιοσδήποτε έχει τον σύνδεσμο "
 
 #: umap/models.py:121
 msgid "editors only"
-msgstr ""
+msgstr "Συντάκτες μόνο"
 
 #: umap/models.py:124 umap/models.py:252
 msgid "description"
-msgstr "περιγραφή"
+msgstr "Περιγραφή"
 
 #: umap/models.py:125
 msgid "center"
-msgstr ""
+msgstr "Κέντρο"
 
 #: umap/models.py:126
 msgid "zoom"
-msgstr ""
+msgstr "Μεγέθυνση "
 
 #: umap/models.py:127
 msgid "locate"
-msgstr ""
+msgstr "Εντοπισμός Θέσης"
 
 #: umap/models.py:127
 msgid "Locate user on load?"
-msgstr ""
+msgstr "Εντοπισμός θέσης κατά την φόρτωση ;"
 
 #: umap/models.py:130
 msgid "Choose the map licence."
-msgstr ""
+msgstr "Επιλογή άδειας χρήσης του χάρτη"
 
 #: umap/models.py:131
 msgid "licence"
-msgstr "άδεια"
+msgstr "Άδεια"
 
 #: umap/models.py:136
 msgid "owner"
-msgstr ""
+msgstr "Ιδιοκτήτης"
 
 #: umap/models.py:137
 msgid "editors"
-msgstr ""
+msgstr "Συντάκτες"
 
 #: umap/models.py:138
 msgid "edit status"
-msgstr ""
+msgstr "Επεξεργασία κατάστασης"
 
 #: umap/models.py:139
 msgid "share status"
-msgstr ""
+msgstr "Διαμοιρασμός κατάστασης"
 
 #: umap/models.py:140
 msgid "settings"
-msgstr "ρυθμίσεις"
+msgstr "Ρυθμίσεις"
 
 #: umap/models.py:206
 msgid "Clone of"
-msgstr ""
+msgstr "Κλωνοποίηση "
 
 #: umap/models.py:257
 msgid "display on load"
-msgstr ""
+msgstr "Εμφάνιση κατά την φόρτωση "
 
 #: umap/models.py:258
 msgid "Display this layer on load."
-msgstr ""
+msgstr "Εμφάνισε αυτό το επίπεδο κατά την φόρτωση "
 
 #: umap/templates/404.html:7
 msgid "Take me to the home page"
@@ -144,16 +145,16 @@ msgstr "Επιστροφή στην Αρχική "
 #: umap/templates/auth/user_detail.html:7
 #, python-format
 msgid "Browse %(current_user)s's maps"
-msgstr ""
+msgstr "Περιήγηση %(current_user)s χάρτη"
 
 #: umap/templates/auth/user_detail.html:15
 #, python-format
 msgid "%(current_user)s has no maps."
-msgstr ""
+msgstr "%(current_user)s δεν έχει χάρτη"
 
 #: umap/templates/registration/login.html:4
 msgid "Please log in with your account"
-msgstr ""
+msgstr "Παρακαλώ συνδεθείτε με τον λογαριασμό σας "
 
 #: umap/templates/registration/login.html:18
 msgid "Username"
@@ -169,14 +170,14 @@ msgstr "Σύνδεση "
 
 #: umap/templates/registration/login.html:27
 msgid "Please choose a provider"
-msgstr ""
+msgstr "Παρακαλώ επιλέξτε παροχέα"
 
 #: umap/templates/umap/about_summary.html:6
 #, 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 ""
+msgstr "Το uMap σου επιτρέπει να δημιουργήσεις χάρτες με <a href=\"%(osm_url)s\" /> OpenStreetMap </a> επίπεδα σε ένα λεπτό και να τα τα ενσωματώσεις στον ιστότοπο σου.  "
 
 #: umap/templates/umap/about_summary.html:11
 msgid "Choose the layers of your map"
@@ -184,19 +185,19 @@ msgstr "Διάλεξε το χαρτογραφικό επίπεδο "
 
 #: umap/templates/umap/about_summary.html:12
 msgid "Add POIs: markers, lines, polygons..."
-msgstr ""
+msgstr "Πρόσθεσε σημεία ενδιαφέροντος : δείκτες, γραμμές, πολύγωνα..."
 
 #: umap/templates/umap/about_summary.html:13
 msgid "Manage POIs colours and icons"
-msgstr ""
+msgstr "Διαχείριση χρωμάτων και συμβόλων σημείων ενδιαφέροντος "
 
 #: umap/templates/umap/about_summary.html:14
 msgid "Manage map options: display a minimap, locate user on load…"
-msgstr ""
+msgstr "Διαχείριση επιλογών χάρτη: εμφάνιση χάρτη προσανατολισμού, γεωεντοπισμός χρήστη κατά την φόρτωση "
 
 #: umap/templates/umap/about_summary.html:15
 msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
-msgstr ""
+msgstr "Ομαδική εισαγωγή γεωχωρικών δεδομένων (geojson, gpx, kml, osm...)"
 
 #: umap/templates/umap/about_summary.html:16
 msgid "Choose the license for your data"
@@ -209,16 +210,16 @@ msgstr " Ενσωμάτωσε και μοιράσου τον χάρτη "
 #: umap/templates/umap/about_summary.html:23
 #, python-format
 msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
-msgstr ""
+msgstr "Και είναι <a href=\"%(repo_url)s\">ανοικτού κώδικα </a>! "
 
 #: umap/templates/umap/about_summary.html:33
 #: umap/templates/umap/navigation.html:26
 msgid "Create a map"
-msgstr ""
+msgstr "Δημιουργία χάρτη"
 
 #: umap/templates/umap/about_summary.html:35
 msgid "Play with the demo"
-msgstr ""
+msgstr "Παίξε με το παράδειγμα "
 
 #: umap/templates/umap/home.html:9
 #, python-format
@@ -227,23 +228,23 @@ msgid ""
 "need a stable instance, please use <a "
 "href=\"%(stable_url)s\">%(stable_url)s</a>. You can also host your own "
 "instance, it's <a href=\"%(repo_url)s\">open source</a>!"
-msgstr ""
+msgstr "Αυτό η εκδοχή, χρησιμοποιήθηκε για δοκιμή και προκαταρκτικές εκδόσεις. Αν χρειάζεσαι μια σταθερή έκδοση, παρακαλώ χρησιμοποίησε <a href=\"%(stable_url)s\">%(stable_url)s</a>. Μπορείς επίσης φιλοξενήσεις την δική σου εκδοχή, είναι <a href=\"%(repo_url)s\">ανοικτού κώδικα</a>!"
 
 #: umap/templates/umap/home.html:17
 msgid "Map of the uMaps"
-msgstr ""
+msgstr "Χάρτης από τους uMaps"
 
 #: umap/templates/umap/home.html:24
 msgid "Get inspired, browse maps"
-msgstr ""
+msgstr "Εμπνεύσου, περιηγήσου στους χάρτες"
 
 #: umap/templates/umap/login_popup_end.html:2
 msgid "You are logged in. Continuing..."
-msgstr ""
+msgstr "Είστε συνδεδεμένοι. Συνέχεια..."
 
 #: umap/templates/umap/map_list.html:7 umap/views.py:212
 msgid "by"
-msgstr ""
+msgstr "Από"
 
 #: umap/templates/umap/map_list.html:11
 msgid "More"
@@ -267,11 +268,11 @@ msgstr "Σχετικά"
 
 #: umap/templates/umap/navigation.html:15
 msgid "Feedback"
-msgstr ""
+msgstr "Κρητική"
 
 #: umap/templates/umap/navigation.html:18
 msgid "Change password"
-msgstr "Αλλαγή κωδικού"
+msgstr "Αλλαγή κωδικού πρόσβασης "
 
 #: umap/templates/umap/navigation.html:20
 msgid "Log out"
@@ -279,41 +280,41 @@ msgstr "Αποσύνδεση"
 
 #: umap/templates/umap/password_change.html:6
 msgid "Password change"
-msgstr ""
+msgstr "Κωδικός πρόσβασης αλλαγή"
 
 #: umap/templates/umap/password_change.html:7
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new"
 " password twice so we can verify you typed it in correctly."
-msgstr ""
+msgstr "Παρακαλώ εισάγεται τον παλιό κωδικό πρόσβασης, για λόγους ασφαλείας, και μετά εισάγεται τον νέο κωδικό πρόσβασης δύο φορές ώστε να επιβεβαιώσουμε ότι πληκτρολογήθηκε σωστά."
 
 #: umap/templates/umap/password_change.html:12
 msgid "Old password"
-msgstr ""
+msgstr "Παλιός κωδικός πρόσβασης"
 
 #: umap/templates/umap/password_change.html:14
 msgid "New password"
-msgstr ""
+msgstr "Νέος κωδικός πρόσβασης"
 
 #: umap/templates/umap/password_change.html:16
 msgid "New password confirmation"
-msgstr ""
+msgstr "Νέα επιβεβαίωση κωδικού πρόσβασης"
 
 #: umap/templates/umap/password_change.html:18
 msgid "Change my password"
-msgstr ""
+msgstr "Αλλαγή κωδικού πρόσβασης "
 
 #: umap/templates/umap/password_change_done.html:6
 msgid "Password change successful"
-msgstr ""
+msgstr "Επιτυχής αλλαγή κωδικού πρόσβασης"
 
 #: umap/templates/umap/password_change_done.html:7
 msgid "Your password was changed."
-msgstr ""
+msgstr "Ο κωδικός πρόσβασης άλλαξε "
 
 #: umap/templates/umap/search.html:13
 msgid "Not map found."
-msgstr ""
+msgstr "Δεν βρέθηκε χάρτης"
 
 #: umap/templates/umap/search_bar.html:6
 msgid "Search maps"
@@ -325,42 +326,42 @@ msgstr "Ψάξε "
 
 #: umap/views.py:218
 msgid "View the map"
-msgstr ""
+msgstr "Προβολή του χάρτη"
 
 #: umap/views.py:519
 #, python-format
 msgid ""
 "Your map has been created! If you want to edit this map from another "
 "computer, please use this link: %(anonymous_url)s"
-msgstr ""
+msgstr "Ο χάρτης σου δημιουργήθηκε ! Αν επιθυμείς την επεξεργασία αυτού του χάρτη από άλλο υπολογιστή, παρακαλώ χρησιμοποίησε αυτόν τον σύνδεσμο:%(anonymous_url)s"
 
 #: umap/views.py:524
 msgid "Congratulations, your map has been created!"
-msgstr ""
+msgstr "Συγχαρητήρια, ο χάρτης σου δημιουργήθηκε !"
 
 #: umap/views.py:551
 msgid "Map has been updated!"
-msgstr ""
+msgstr "Ο χάρτης ανανεώθηκε !"
 
 #: umap/views.py:577
 msgid "Map editors updated with success!"
-msgstr ""
+msgstr "Ανανέωση συντακτών επιτυχείς !"
 
 #: umap/views.py:602
 msgid "Only its owner can delete the map."
-msgstr ""
+msgstr "Μονό ό ιδιοκτήτης μπορεί να διαγράψει αυτό τον χάρτη. "
 
 #: umap/views.py:631
 #, python-format
 msgid ""
 "Your map has been cloned! If you want to edit this map from another "
 "computer, please use this link: %(anonymous_url)s"
-msgstr ""
+msgstr "Ο χάρτης κλωνοποιήθηκε! Αν επιθυμείς την επεξεργασία αυτού του χάρτη από άλλο υπολογιστή, παρακαλώ χρησιμοποίησε αυτόν τον σύνδεσμο:%(anonymous_url)s"
 
 #: umap/views.py:636
 msgid "Congratulations, your map has been cloned!"
-msgstr ""
+msgstr "Συγχαρητήρια ο χάρτης σου κλωνοποιήθηκε ! "
 
 #: umap/views.py:803
 msgid "Layer successfully deleted."
-msgstr ""
+msgstr "Επίπεδο διαγράφηκε επιτυχώς."
diff --git a/umap/locale/zh_TW/LC_MESSAGES/django.mo b/umap/locale/zh_TW/LC_MESSAGES/django.mo
index 46d2f099..f4405962 100644
Binary files a/umap/locale/zh_TW/LC_MESSAGES/django.mo and b/umap/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/umap/locale/zh_TW/LC_MESSAGES/django.po b/umap/locale/zh_TW/LC_MESSAGES/django.po
index 79b8bb3c..2fe46a51 100644
--- a/umap/locale/zh_TW/LC_MESSAGES/django.po
+++ b/umap/locale/zh_TW/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 # Chia-liang Kao <clkao@clkao.org>, 2014
 # coop.shen <coop.shen@gmail.com>, 2014
 # Hsin-lin Cheng (lancetw) <lancetw@gmail.com>, 2014
-# Sean Young <assanges@icloud.com>, 2016
+# Sean Young <assanges@icloud.com>, 2016,2018
 # Supaplex <bejokeup@gmail.com>, 2014
 # Yuan CHAO <yuanchao@gmail.com>, 2014
 msgid ""
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-08 14:50+0000\n"
-"PO-Revision-Date: 2018-09-08 14:51+0000\n"
-"Last-Translator: yohanboniface <yohanboniface@free.fr>\n"
+"PO-Revision-Date: 2018-09-24 03:50+0000\n"
+"Last-Translator: Sean Young <assanges@icloud.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/yohanboniface/umap/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgstr "僅能由私密連結編輯"
 
 #: umap/middleware.py:14
 msgid "Site is readonly for maintenance"
-msgstr ""
+msgstr "網站目前因維護中設定為唯讀狀態"
 
 #: umap/models.py:17
 msgid "name"
@@ -152,7 +152,7 @@ msgstr "瀏覽 %(current_user)s 的地圖"
 #: umap/templates/auth/user_detail.html:15
 #, python-format
 msgid "%(current_user)s has no maps."
-msgstr ""
+msgstr "%(current_user)s 沒有任何地圖。"
 
 #: umap/templates/registration/login.html:4
 msgid "Please log in with your account"
diff --git a/umap/static/umap/locale/cs_CZ.js b/umap/static/umap/locale/cs_CZ.js
index b98f792c..d236b659 100644
--- a/umap/static/umap/locale/cs_CZ.js
+++ b/umap/static/umap/locale/cs_CZ.js
@@ -46,10 +46,10 @@ var locale = {
     "On the right": "On the right",
     "On the top": "On the top",
     "Popup content template": "Šablona obsahu bubliny",
-    "Set symbol": "Set symbol",
+    "Set symbol": "Nastavit symbol",
     "Side panel": "Boční panel",
     "Simplify": "Simplify",
-    "Symbol or url": "Symbol or url",
+    "Symbol or url": "Symbol nebo adresa URL",
     "Table": "Tabulka",
     "always": "always",
     "clear": "clear",
@@ -69,7 +69,7 @@ var locale = {
     "never": "never",
     "new window": "new window",
     "no": "ne",
-    "on hover": "on hover",
+    "on hover": "při přejetí myší",
     "opacity": "průhlednost",
     "parent window": "parent window",
     "stroke": "linka",
@@ -103,7 +103,7 @@ var locale = {
     "Are you sure you want to delete this map?": "Jste si jisti, že chcete vymazat tuto celou mapu?",
     "Are you sure you want to delete this property on all the features?": "Určitě chcete smazat tuto vlastnost na všech objektech?",
     "Are you sure you want to restore this version?": "Opravdu si přejete obnovit tuto verzi?",
-    "Attach the map to my account": "Attach the map to my account",
+    "Attach the map to my account": "Připojte mapu k mému účtu",
     "Auto": "Automatická",
     "Autostart when map is loaded": "Autostart when map is loaded",
     "Bring feature to center": "Centruj mapu na objektu",
@@ -151,8 +151,8 @@ var locale = {
     "Directions from here": "Navigovat odsud",
     "Disable editing": "Zakázat úpravy",
     "Display measure": "Display measure",
-    "Display on load": "Zobrazit na startu",
-    "Download": "Download",
+    "Display on load": "Zobrazit při startu",
+    "Download": "Stažení",
     "Download data": "Stáhnout data",
     "Drag to reorder": "Drag to reorder",
     "Draw a line": "Nakreslit jednoduchou čáru",
@@ -217,18 +217,18 @@ var locale = {
     "Make main shape": "Učinit hlavním tvarem",
     "Manage layers": "Manage layers",
     "Map background credits": "Autorství pozadí mapy",
-    "Map has been attached to your account": "Map has been attached to your account",
+    "Map has been attached to your account": "Mapa byla připojena k vašemu účtu",
     "Map has been saved!": "Mapa byla uložena",
     "Map user content has been published under licence": "Uživatelská data jsou zveřejněna pod licencí",
-    "Map's editors": "Map's editors",
-    "Map's owner": "Map's owner",
+    "Map's editors": "Mapoví editoři",
+    "Map's owner": "Majitel mapy",
     "Merge lines": "Spojit čáry",
     "More controls": "Více ovládacích prvků",
     "Must be a valid CSS value (eg.: DarkBlue or #123456)": "Platný název v CSS (např.: Red, Blue nebo #123456)",
     "No licence has been set": "Nebyla nastavena licence",
     "No results": "Žádné výsledky",
     "Only visible features will be downloaded.": "Budou staženy jen viditelné objekty",
-    "Open download panel": "Open download panel",
+    "Open download panel": "Otevřít panel na stahování",
     "Open link in…": "Open link in…",
     "Open this map extent in a map editor to provide more accurate data to OpenStreetMap": "Otevři tuto oblast v editoru OpenStreetMap. Toto vám umožní editovat přímo základní mapová data a přispět tak v tvorbě svobodné mapy pro všechny.",
     "Optional intensity property for heatmap": "Volitelná vlastnost pro výpočet intenzity v teplotní mapě",
@@ -259,11 +259,11 @@ var locale = {
     "Save current edits": "Ulož nedávné změny",
     "Save this center and zoom": "Ulož tuto pozici mapy a její přiblížení",
     "Save this location as new feature": "Save this location as new feature",
-    "Search a place name": "Search a place name",
+    "Search a place name": "Vyhledejte název místa",
     "Search location": "Search location",
-    "Secret edit link is:<br>{link}": "Secret edit link is:<br>{link}",
+    "Secret edit link is:<br>{link}": "Tajný odkaz na úpravy je: <br>{link}",
     "See all": "Zobraz vše",
-    "See data layers": "See data layers",
+    "See data layers": "Zobrazit datové vrstvy",
     "See full screen": "Na celou obrazovku",
     "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…",
     "Shape properties": "Shape properties",
@@ -283,7 +283,7 @@ var locale = {
     "Stop slideshow": "Zastavit prezentaci",
     "Supported scheme": "Podporované schéma",
     "Supported variables that will be dynamically replaced": "Podporované proměnné, které budou automaticky nahrazeny",
-    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.",
+    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "Symbol může mít buď znak unicode nebo URL. Vlastnosti můžete použít jako proměnné: např. Pomocí \"http://myserver.org/images/{name}.png\" bude proměnná {name} nahrazena hodnotou \"name\" každé značky.",
     "TMS format": "formát TMS",
     "Text color for the cluster label": "Barva textu popisku shluku",
     "Text formatting": "Formátování textu",
@@ -299,7 +299,7 @@ var locale = {
     "Unable to detect format of file {filename}": "Unable to detect format of file {filename}",
     "Untitled layer": "Nepojmenovaná vrstva",
     "Untitled map": "Mapa bez názvu",
-    "Update permissions": "Update permissions",
+    "Update permissions": "Aktualizace oprávnění",
     "Update permissions and editors": "Nastavení přístupu a práva editace",
     "Url": "Url",
     "Use current bounds": "Použít současné hranice",
@@ -311,8 +311,8 @@ var locale = {
     "Where do we go from here?": "Co všechno teď můžete udělat?",
     "Whether to display or not polygons paths.": "Whether to display or not polygons paths.",
     "Whether to fill polygons with color.": "Whether to fill polygons with color.",
-    "Who can edit": "Who can edit",
-    "Who can view": "Who can view",
+    "Who can edit": "Kdo může upravit",
+    "Who can view": "Kdo může zobrazit",
     "Will be displayed in the bottom right corner of the map": "Bude zobrazeno s mapou napravo dole",
     "Will be visible in the caption of the map": "Bude zobrazeno v popisu mapy",
     "Woops! Someone else seems to have edited the data. You can save anyway, but this will erase the changes made by others.": "Ojoj! Někdo jiný mezitím také upravil data. Můžete je uložit bez ohledu na to, ale smažete tak jeho změny.",
@@ -340,14 +340,14 @@ var locale = {
     "previous": "předchozí",
     "width": "šířka",
     "{count} errors during import: {message}": "{count} errors during import: {message}",
-    "Measure distances": "Measure distances",
+    "Measure distances": "Měření vzdáleností",
     "NM": "NM",
-    "kilometers": "kilometers",
+    "kilometers": "kilometry",
     "km": "km",
     "mi": "mi",
-    "miles": "miles",
-    "nautical miles": "nautical miles",
-    "{area} acres": "{area} acres",
+    "miles": "míle",
+    "nautical miles": "námořní míle",
+    "{area} acres": "{area} akry",
     "{area} ha": "{area} ha",
     "{area} m&sup2;": "{area} m&sup2;",
     "{area} mi&sup2;": "{area} mi&sup2;",
@@ -355,16 +355,16 @@ var locale = {
     "{distance} NM": "{distance} NM",
     "{distance} km": "{distance} km",
     "{distance} m": "{distance} m",
-    "{distance} miles": "{distance} miles",
+    "{distance} miles": "{distance} míle",
     "{distance} yd": "{distance} yd",
-    "1 day": "1 day",
-    "1 hour": "1 hour",
-    "5 min": "5 min",
-    "Cache proxied request": "Cache proxied request",
-    "No cache": "No cache",
+    "1 day": "1 den",
+    "1 hour": "1 hodina",
+    "5 min": "5 minut",
+    "Cache proxied request": "Požadavek na zástupnou mezipaměť",
+    "No cache": "Žádná mezipaměť",
     "Popup": "Popup",
-    "Popup (large)": "Popup (large)",
-    "Popup content style": "Popup content style",
+    "Popup (large)": "Popup (velký)",
+    "Popup content style": "Styl obsahu popupu",
     "Popup shape": "Popup shape"
 };
 L.registerLocale("cs_CZ", locale);
diff --git a/umap/static/umap/locale/cs_CZ.json b/umap/static/umap/locale/cs_CZ.json
index 3d362945..caa7b43a 100644
--- a/umap/static/umap/locale/cs_CZ.json
+++ b/umap/static/umap/locale/cs_CZ.json
@@ -46,10 +46,10 @@
     "On the right": "On the right",
     "On the top": "On the top",
     "Popup content template": "Šablona obsahu bubliny",
-    "Set symbol": "Set symbol",
+    "Set symbol": "Nastavit symbol",
     "Side panel": "Boční panel",
     "Simplify": "Simplify",
-    "Symbol or url": "Symbol or url",
+    "Symbol or url": "Symbol nebo adresa URL",
     "Table": "Tabulka",
     "always": "always",
     "clear": "clear",
@@ -69,7 +69,7 @@
     "never": "never",
     "new window": "new window",
     "no": "ne",
-    "on hover": "on hover",
+    "on hover": "při přejetí myší",
     "opacity": "průhlednost",
     "parent window": "parent window",
     "stroke": "linka",
@@ -103,7 +103,7 @@
     "Are you sure you want to delete this map?": "Jste si jisti, že chcete vymazat tuto celou mapu?",
     "Are you sure you want to delete this property on all the features?": "Určitě chcete smazat tuto vlastnost na všech objektech?",
     "Are you sure you want to restore this version?": "Opravdu si přejete obnovit tuto verzi?",
-    "Attach the map to my account": "Attach the map to my account",
+    "Attach the map to my account": "Připojte mapu k mému účtu",
     "Auto": "Automatická",
     "Autostart when map is loaded": "Autostart when map is loaded",
     "Bring feature to center": "Centruj mapu na objektu",
@@ -151,8 +151,8 @@
     "Directions from here": "Navigovat odsud",
     "Disable editing": "Zakázat úpravy",
     "Display measure": "Display measure",
-    "Display on load": "Zobrazit na startu",
-    "Download": "Download",
+    "Display on load": "Zobrazit při startu",
+    "Download": "Stažení",
     "Download data": "Stáhnout data",
     "Drag to reorder": "Drag to reorder",
     "Draw a line": "Nakreslit jednoduchou čáru",
@@ -217,18 +217,18 @@
     "Make main shape": "Učinit hlavním tvarem",
     "Manage layers": "Manage layers",
     "Map background credits": "Autorství pozadí mapy",
-    "Map has been attached to your account": "Map has been attached to your account",
+    "Map has been attached to your account": "Mapa byla připojena k vašemu účtu",
     "Map has been saved!": "Mapa byla uložena",
     "Map user content has been published under licence": "Uživatelská data jsou zveřejněna pod licencí",
-    "Map's editors": "Map's editors",
-    "Map's owner": "Map's owner",
+    "Map's editors": "Mapoví editoři",
+    "Map's owner": "Majitel mapy",
     "Merge lines": "Spojit čáry",
     "More controls": "Více ovládacích prvků",
     "Must be a valid CSS value (eg.: DarkBlue or #123456)": "Platný název v CSS (např.: Red, Blue nebo #123456)",
     "No licence has been set": "Nebyla nastavena licence",
     "No results": "Žádné výsledky",
     "Only visible features will be downloaded.": "Budou staženy jen viditelné objekty",
-    "Open download panel": "Open download panel",
+    "Open download panel": "Otevřít panel na stahování",
     "Open link in…": "Open link in…",
     "Open this map extent in a map editor to provide more accurate data to OpenStreetMap": "Otevři tuto oblast v editoru OpenStreetMap. Toto vám umožní editovat přímo základní mapová data a přispět tak v tvorbě svobodné mapy pro všechny.",
     "Optional intensity property for heatmap": "Volitelná vlastnost pro výpočet intenzity v teplotní mapě",
@@ -259,11 +259,11 @@
     "Save current edits": "Ulož nedávné změny",
     "Save this center and zoom": "Ulož tuto pozici mapy a její přiblížení",
     "Save this location as new feature": "Save this location as new feature",
-    "Search a place name": "Search a place name",
+    "Search a place name": "Vyhledejte název místa",
     "Search location": "Search location",
-    "Secret edit link is:<br>{link}": "Secret edit link is:<br>{link}",
+    "Secret edit link is:<br>{link}": "Tajný odkaz na úpravy je: <br>{link}",
     "See all": "Zobraz vše",
-    "See data layers": "See data layers",
+    "See data layers": "Zobrazit datové vrstvy",
     "See full screen": "Na celou obrazovku",
     "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…",
     "Shape properties": "Shape properties",
@@ -283,7 +283,7 @@
     "Stop slideshow": "Zastavit prezentaci",
     "Supported scheme": "Podporované schéma",
     "Supported variables that will be dynamically replaced": "Podporované proměnné, které budou automaticky nahrazeny",
-    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.",
+    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "Symbol může mít buď znak unicode nebo URL. Vlastnosti můžete použít jako proměnné: např. Pomocí \"http://myserver.org/images/{name}.png\" bude proměnná {name} nahrazena hodnotou \"name\" každé značky.",
     "TMS format": "formát TMS",
     "Text color for the cluster label": "Barva textu popisku shluku",
     "Text formatting": "Formátování textu",
@@ -299,7 +299,7 @@
     "Unable to detect format of file {filename}": "Unable to detect format of file {filename}",
     "Untitled layer": "Nepojmenovaná vrstva",
     "Untitled map": "Mapa bez názvu",
-    "Update permissions": "Update permissions",
+    "Update permissions": "Aktualizace oprávnění",
     "Update permissions and editors": "Nastavení přístupu a práva editace",
     "Url": "Url",
     "Use current bounds": "Použít současné hranice",
@@ -311,8 +311,8 @@
     "Where do we go from here?": "Co všechno teď můžete udělat?",
     "Whether to display or not polygons paths.": "Whether to display or not polygons paths.",
     "Whether to fill polygons with color.": "Whether to fill polygons with color.",
-    "Who can edit": "Who can edit",
-    "Who can view": "Who can view",
+    "Who can edit": "Kdo může upravit",
+    "Who can view": "Kdo může zobrazit",
     "Will be displayed in the bottom right corner of the map": "Bude zobrazeno s mapou napravo dole",
     "Will be visible in the caption of the map": "Bude zobrazeno v popisu mapy",
     "Woops! Someone else seems to have edited the data. You can save anyway, but this will erase the changes made by others.": "Ojoj! Někdo jiný mezitím také upravil data. Můžete je uložit bez ohledu na to, ale smažete tak jeho změny.",
@@ -340,14 +340,14 @@
     "previous": "předchozí",
     "width": "šířka",
     "{count} errors during import: {message}": "{count} errors during import: {message}",
-    "Measure distances": "Measure distances",
+    "Measure distances": "Měření vzdáleností",
     "NM": "NM",
-    "kilometers": "kilometers",
+    "kilometers": "kilometry",
     "km": "km",
     "mi": "mi",
-    "miles": "miles",
-    "nautical miles": "nautical miles",
-    "{area} acres": "{area} acres",
+    "miles": "míle",
+    "nautical miles": "námořní míle",
+    "{area} acres": "{area} akry",
     "{area} ha": "{area} ha",
     "{area} m&sup2;": "{area} m&sup2;",
     "{area} mi&sup2;": "{area} mi&sup2;",
@@ -355,15 +355,15 @@
     "{distance} NM": "{distance} NM",
     "{distance} km": "{distance} km",
     "{distance} m": "{distance} m",
-    "{distance} miles": "{distance} miles",
+    "{distance} miles": "{distance} míle",
     "{distance} yd": "{distance} yd",
-    "1 day": "1 day",
-    "1 hour": "1 hour",
-    "5 min": "5 min",
-    "Cache proxied request": "Cache proxied request",
-    "No cache": "No cache",
+    "1 day": "1 den",
+    "1 hour": "1 hodina",
+    "5 min": "5 minut",
+    "Cache proxied request": "Požadavek na zástupnou mezipaměť",
+    "No cache": "Žádná mezipaměť",
     "Popup": "Popup",
-    "Popup (large)": "Popup (large)",
-    "Popup content style": "Popup content style",
+    "Popup (large)": "Popup (velký)",
+    "Popup content style": "Styl obsahu popupu",
     "Popup shape": "Popup shape"
 }
\ No newline at end of file
diff --git a/umap/static/umap/locale/el.js b/umap/static/umap/locale/el.js
index 2e452ba6..d846dc68 100644
--- a/umap/static/umap/locale/el.js
+++ b/umap/static/umap/locale/el.js
@@ -1,144 +1,144 @@
 var locale = {
     "Add symbol": "Προσθήκη συμβόλου ",
     "Allow scroll wheel zoom?": "Επέτρεψε ζουμ κύλισης",
-    "Automatic": "Automatic",
-    "Ball": "Ball",
+    "Automatic": "Αυτόματα",
+    "Ball": "Καρφίτσα",
     "Cancel": "Άκυρο ",
-    "Caption": "Caption",
+    "Caption": "Υπόμνημα",
     "Change symbol": "Αλλαγή συμβόλου ",
-    "Choose the data format": "Choose the data format",
+    "Choose the data format": "Επιλογή μορφής δεδομένων",
     "Choose the layer of the feature": "Επιλέξτε το επίπεδο του στοιχείου",
     "Circle": "Κύκλος ",
-    "Clustered": "Clustered",
-    "Data browser": "Data browser",
+    "Clustered": "Σύμπλεγμα",
+    "Data browser": "Δεδομένα Περιήγησης ",
     "Default": "Προεπιλογή ",
-    "Default zoom level": "Default zoom level",
-    "Default: name": "Default: name",
-    "Display label": "Display label",
-    "Display the control to open OpenStreetMap editor": "Display the control to open OpenStreetMap editor",
-    "Display the data layers control": "Display the data layers control",
-    "Display the embed control": "Display the embed control",
-    "Display the fullscreen control": "Display the fullscreen control",
-    "Display the locate control": "Display the locate control",
-    "Display the measure control": "Display the measure control",
-    "Display the search control": "Display the search control",
-    "Display the tile layers control": "Display the tile layers control",
-    "Display the zoom control": "Display the zoom control",
-    "Do you want to display a caption bar?": "Do you want to display a caption bar?",
+    "Default zoom level": "Προεπιλεγμένο επίπεδο μεγέθυνσης",
+    "Default: name": "Προεπιλογή: 'Ονομα",
+    "Display label": "Εμφάνιση ετικέτας",
+    "Display the control to open OpenStreetMap editor": "Εμφάνιση εικονιδίου επεξεργασίας OpenStreetMap",
+    "Display the data layers control": "Εμφάνιση εικονιδίου δεδομένα επίπεδων ",
+    "Display the embed control": "Εμφάνιση εικονιδίου διαμοιρασμού",
+    "Display the fullscreen control": "Εμφάνιση εικονιδίου πλήρους οθόνης ",
+    "Display the locate control": "Εμφάνιση εικονιδίου γεωεντοπισμού ",
+    "Display the measure control": "Εμφάνιση εικονιδίου μέτρησης",
+    "Display the search control": "Εμφάνιση εικονιδίου αναζήτησης",
+    "Display the tile layers control": "Εμφάνιση εικονιδίου αλλαγής υποβάθρων",
+    "Display the zoom control": "Εμφάνιση εικονιδίου μεγέθυνσης/σμίκρυνσης ",
+    "Do you want to display a caption bar?": "Θα επιθυμούσες την εμφάνιση Λεζάντας ;",
     "Do you want to display a minimap?": "Επιθυμείτε την εμφάνιση χάρτη υπομνήματος ;",
-    "Do you want to display a panel on load?": "Do you want to display a panel on load?",
+    "Do you want to display a panel on load?": "Θα επιθυμούσες την εμφάνιση πινακίδας κατά την φόρτωση ;",
     "Do you want to display popup footer?": "Επιθυμείτε την εμφάνιση αναδυόμενης βάσης ;",
     "Do you want to display the scale control?": "Επιθυμείτε την εμφάνιση κλίμακας ;",
-    "Do you want to display the «more» control?": "Do you want to display the «more» control?",
+    "Do you want to display the «more» control?": "Επιθυμείτε την εμφάνιση \"περισσότερων\" επιλογών;",
     "Drop": "Ρίψη ",
-    "GeoRSS (only link)": "GeoRSS (only link)",
-    "GeoRSS (title + image)": "GeoRSS (title + image)",
-    "Heatmap": "Heatmap",
-    "Icon shape": "Icon shape",
-    "Icon symbol": "Icon symbol",
-    "Inherit": "Inherit",
-    "Label direction": "Label direction",
-    "Label key": "Label key",
-    "Labels are clickable": "Labels are clickable",
-    "None": "None",
-    "On the bottom": "On the bottom",
-    "On the left": "On the left",
-    "On the right": "On the right",
-    "On the top": "On the top",
-    "Popup content template": "Popup content template",
-    "Set symbol": "Set symbol",
-    "Side panel": "Side panel",
-    "Simplify": "Simplify",
-    "Symbol or url": "Symbol or url",
-    "Table": "Table",
-    "always": "always",
-    "clear": "clear",
-    "collapsed": "collapsed",
-    "color": "color",
+    "GeoRSS (only link)": "GeoRSS (μόνο σύνδεσμος)",
+    "GeoRSS (title + image)": "GeoRSS (τίτλος + εικόνα)",
+    "Heatmap": "Χάρτης εγγύτητας",
+    "Icon shape": "Σχήμα συμβόλου",
+    "Icon symbol": "Εικόνα συμβόλου",
+    "Inherit": "Μεταβίβαση",
+    "Label direction": "Κατεύθυνση ετικέτας ",
+    "Label key": "Κλειδί ετικέτας ",
+    "Labels are clickable": "Η ετικέτα έχει σύνδεσμο ",
+    "None": "Κανένα",
+    "On the bottom": "Στο κάτω μέρος",
+    "On the left": "Στο αριστερό μέρος",
+    "On the right": "Στο δεξί μέρος",
+    "On the top": "Στο πάνω μέρος",
+    "Popup content template": "Αναδυόμενο παράθυρο περιεχομένου ",
+    "Set symbol": "Ορισμός συμβόλου",
+    "Side panel": "Πλευρικός πίνακας",
+    "Simplify": "Απλοποίησε",
+    "Symbol or url": "Σύμβολο ή σύνδεσμος",
+    "Table": "Πίνακας",
+    "always": "πάντα",
+    "clear": "Εκκαθάριση",
+    "collapsed": "Κατέρρευσε ",
+    "color": "Χρώμα ",
     "dash array": "dash array",
-    "define": "define",
-    "description": "description",
-    "expanded": "expanded",
-    "fill": "fill",
-    "fill color": "fill color",
-    "fill opacity": "fill opacity",
-    "hidden": "hidden",
-    "iframe": "iframe",
-    "inherit": "inherit",
-    "name": "name",
-    "never": "never",
-    "new window": "new window",
+    "define": "Όρισε ",
+    "description": "Περιγραφή",
+    "expanded": "Ανεπτυγμένος",
+    "fill": "Γέμισμα ",
+    "fill color": "Χρώμα Γεμίσματος",
+    "fill opacity": "Αδιαφάνεια Γεμίσματος",
+    "hidden": "Απόκρυψη",
+    "iframe": "Παράθυρο εξωτερικού συνδέσμου",
+    "inherit": "Μετάβαση",
+    "name": "Όνομα",
+    "never": "Ποτέ",
+    "new window": "Νέο Παράθυρο",
     "no": "όχι",
-    "on hover": "on hover",
-    "opacity": "opacity",
-    "parent window": "parent window",
-    "stroke": "stroke",
-    "weight": "weight",
+    "on hover": "Με κατάδειξη",
+    "opacity": "Αδιαφάνεια",
+    "parent window": "Συγγενές παράθυρο ",
+    "stroke": "Πινέλο ",
+    "weight": "Βάρος",
     "yes": "ναι",
-    "{delay} seconds": "{delay} seconds",
-    "# one hash for main heading": "# one hash for main heading",
-    "## two hashes for second heading": "## two hashes for second heading",
-    "### three hashes for third heading": "### three hashes for third heading",
-    "**double star for bold**": "**double star for bold**",
-    "*simple star for italic*": "*simple star for italic*",
-    "--- for an horizontal rule": "--- for an horizontal rule",
-    "A comma separated list of numbers that defines the stroke dash pattern. Ex.: \"5, 10, 15\".": "A comma separated list of numbers that defines the stroke dash pattern. Ex.: \"5, 10, 15\".",
+    "{delay} seconds": "{καθυστέρηση} δευτερόλεπτα",
+    "# one hash for main heading": "# ένα hash για τίτλο ",
+    "## two hashes for second heading": "## δύο hash για επικεφαλίδα",
+    "### three hashes for third heading": "### τρία hash για κεφαλίδα ",
+    "**double star for bold**": "**διπλό αστερίσκο για έντονη**",
+    "*simple star for italic*": "*μονό αστερίσκο για πλάγια*",
+    "--- for an horizontal rule": "---για οριζόντιο διαχωριστικό ",
+    "A comma separated list of numbers that defines the stroke dash pattern. Ex.: \"5, 10, 15\".": "Το κόμμα χωρίζει λίστα αριθμών που ορίζονται από ένα διανυσματικό σύνολο πχ.: \"5, 10, 15\".",
     "About": "Σχετικά",
     "Action not allowed :(": "Μη επιτρεπόμενη ενέργεια :(",
-    "Activate slideshow mode": "Activate slideshow mode",
+    "Activate slideshow mode": "Ενεργοποίηση διαφανειών παρουσίασης ",
     "Add a layer": "Προσθήκη επιπέδου",
-    "Add a line to the current multi": "Add a line to the current multi",
-    "Add a new property": "Add a new property",
-    "Add a polygon to the current multi": "Add a polygon to the current multi",
+    "Add a line to the current multi": "Προσθήκη γραμμής στο παρόν πολυδεδομένο ",
+    "Add a new property": "Προσθήκη νέας ιδιότητας",
+    "Add a polygon to the current multi": "Προσθήκη πολυγώνου στο παρόν πολυδεδομένο ",
     "Advanced actions": "Εξειδικευμένες ενέργειες ",
     "Advanced properties": "Εξειδικευμένα ιδιότητες ",
-    "Advanced transition": "Advanced transition",
-    "All properties are imported.": "All properties are imported.",
-    "Allow interactions": "Allow interactions",
+    "Advanced transition": "Προχωρημένος μετασχηματισμός ",
+    "All properties are imported.": "Εισήχθησαν όλες οι ιδιότητες",
+    "Allow interactions": "Επέτρεψε αλληλεπιδράσεις ",
     "An error occured": "Παρουσιάστηκε σφάλμα ",
     "Are you sure you want to cancel your changes?": "Είστε βέβαιος για το ότι θέλετε να ακυρώσετε τις αλλαγές σας;",
     "Are you sure you want to clone this map and all its datalayers?": "Είστε βέβαιος ότι θέλετε να κλωνοποιηθεί  αυτός ο χάρτης και όλα τα επίπεδα δεδομένων του;",
     "Are you sure you want to delete the feature?": "Είστε βέβαιος ότι θέλετε να διαγράφει αυτό το στοιχείο;",
-    "Are you sure you want to delete this layer?": "Are you sure you want to delete this layer?",
+    "Are you sure you want to delete this layer?": "Είσαι σίγουρος για την διαγραφή αυτού του επιπέδου;",
     "Are you sure you want to delete this map?": "Είστε βέβαιος ότι θέλετε να διαγραφεί αυτός ο χάρτης ;",
-    "Are you sure you want to delete this property on all the features?": "Are you sure you want to delete this property on all the features?",
-    "Are you sure you want to restore this version?": "Are you sure you want to restore this version?",
-    "Attach the map to my account": "Attach the map to my account",
-    "Auto": "Auto",
-    "Autostart when map is loaded": "Autostart when map is loaded",
+    "Are you sure you want to delete this property on all the features?": "Είσαι σίγουρος για την διαγραφή αυτής της ιδιότητας από όλα τα στοιχεία; ",
+    "Are you sure you want to restore this version?": "Είσαι σίγουρος για την επαναφορά αυτής της εκδοχής ;",
+    "Attach the map to my account": "Επισύναψη αυτού του χάρτη στο λογαριασμό μου",
+    "Auto": "Αυτόματα",
+    "Autostart when map is loaded": "Αυτόματη έναρξη με την φόρτωση του χάρτη ",
     "Bring feature to center": "Κέντραρε το στοιχείο",
     "Browse data": "Περιήγηση δεδομένων ",
     "Cancel edits": "Ακύρωση επεξεργασίας ",
     "Center map on your location": "Κέντραρε τον χάρτη στη θέση σου ",
     "Change map background": "Αλλαγή χαρτογραφικού υποβάθρου ",
     "Change tilelayers": "Αλλαγή επιπέδου ",
-    "Choose a preset": "Choose a preset",
+    "Choose a preset": "Επιλογή τρέχοντος",
     "Choose the format of the data to import": "Επιλέξτε τη μορφή των δεδομένων για εισαγωγή",
     "Choose the layer to import in": "Επιλέξτε το επίπεδο που θα γίνει η εισαγωγή ",
-    "Click last point to finish shape": "Click last point to finish shape",
-    "Click to add a marker": "Click to add a marker",
-    "Click to continue drawing": "Click to continue drawing",
-    "Click to edit": "Click to edit",
-    "Click to start drawing a line": "Click to start drawing a line",
-    "Click to start drawing a polygon": "Click to start drawing a polygon",
-    "Clone": "Clone",
-    "Clone of {name}": "Clone of {name}",
-    "Clone this feature": "Clone this feature",
+    "Click last point to finish shape": "Πατήστε στο τελευταίο σημείο για την εισαγωγή του σχήματος",
+    "Click to add a marker": "Πατήστε για την εισαγωγή συμβόλου ",
+    "Click to continue drawing": "Πατήστε για συνέχεια σχεδίου",
+    "Click to edit": "Πατήστε για επεξεργασία",
+    "Click to start drawing a line": "Πατήστε για έναρξη σχεδιασμού γραμμής",
+    "Click to start drawing a polygon": "Πατήστε για έναρξη σχεδιασμού πολυγώνου ",
+    "Clone": "Κλωνοποίηση",
+    "Clone of {name}": "Κλωνοποίηση του  {ονόματος}",
+    "Clone this feature": "Κλωνοποίηση αυτού του στοιχείου",
     "Clone this map": "Κλωνοποίηση αυτού του χάρτη",
-    "Close": "Close",
-    "Clustering radius": "Clustering radius",
-    "Comma separated list of properties to use when filtering features": "Comma separated list of properties to use when filtering features",
+    "Close": "Κλείσιμο ",
+    "Clustering radius": "Ακτίνα συμπλέγματος",
+    "Comma separated list of properties to use when filtering features": "Διαχωρίστε με κόμμα την λίστα ιδιοτήτων για το φιλτράρισμα των στοιχείων ",
     "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» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.": "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» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.",
-    "Continue line": "Continue line",
-    "Continue line (Ctrl-click)": "Continue line (Ctrl-click)",
-    "Coordinates": "Coordinates",
-    "Credits": "Credits",
-    "Current view instead of default map view?": "Current view instead of default map view?",
-    "Custom background": "Custom background",
-    "Data is browsable": "Data is browsable",
-    "Default interaction options": "Default interaction options",
-    "Default properties": "Default properties",
-    "Default shape properties": "Default shape properties",
+    "Continue line": "Συνέχεια γραμμής ",
+    "Continue line (Ctrl-click)": "Συνέχεια γραμμής (Ctrl-click)",
+    "Coordinates": "Συντεταγμένες ",
+    "Credits": "Πιστοποιήσεις ",
+    "Current view instead of default map view?": "Αυτή τη προβολή χάρτη αντί της προ επιλεγμένης  ",
+    "Custom background": "Προσαρμοσμένο υπόβαθρο",
+    "Data is browsable": "Τα δεδομένα είναι περιήγησιμα ",
+    "Default interaction options": "Προεπιλεγμένες επιλογές αλληλεπίδρασης",
+    "Default properties": "Προεπιλεγμένες ιδιότητες",
+    "Default shape properties": "Προεπιλεγμένες ιδιότητες σχημάτων ",
     "Define link to open in a new window on polygon click.": "Define link to open in a new window on polygon click.",
     "Delay between two transitions when in play mode": "Delay between two transitions when in play mode",
     "Delete": "Διαγραφή ",
diff --git a/umap/static/umap/locale/el.json b/umap/static/umap/locale/el.json
index ee4a46d6..d67dcd51 100644
--- a/umap/static/umap/locale/el.json
+++ b/umap/static/umap/locale/el.json
@@ -1,144 +1,144 @@
 {
     "Add symbol": "Προσθήκη συμβόλου ",
     "Allow scroll wheel zoom?": "Επέτρεψε ζουμ κύλισης",
-    "Automatic": "Automatic",
-    "Ball": "Ball",
+    "Automatic": "Αυτόματα",
+    "Ball": "Καρφίτσα",
     "Cancel": "Άκυρο ",
-    "Caption": "Caption",
+    "Caption": "Υπόμνημα",
     "Change symbol": "Αλλαγή συμβόλου ",
-    "Choose the data format": "Choose the data format",
+    "Choose the data format": "Επιλογή μορφής δεδομένων",
     "Choose the layer of the feature": "Επιλέξτε το επίπεδο του στοιχείου",
     "Circle": "Κύκλος ",
-    "Clustered": "Clustered",
-    "Data browser": "Data browser",
+    "Clustered": "Σύμπλεγμα",
+    "Data browser": "Δεδομένα Περιήγησης ",
     "Default": "Προεπιλογή ",
-    "Default zoom level": "Default zoom level",
-    "Default: name": "Default: name",
-    "Display label": "Display label",
-    "Display the control to open OpenStreetMap editor": "Display the control to open OpenStreetMap editor",
-    "Display the data layers control": "Display the data layers control",
-    "Display the embed control": "Display the embed control",
-    "Display the fullscreen control": "Display the fullscreen control",
-    "Display the locate control": "Display the locate control",
-    "Display the measure control": "Display the measure control",
-    "Display the search control": "Display the search control",
-    "Display the tile layers control": "Display the tile layers control",
-    "Display the zoom control": "Display the zoom control",
-    "Do you want to display a caption bar?": "Do you want to display a caption bar?",
+    "Default zoom level": "Προεπιλεγμένο επίπεδο μεγέθυνσης",
+    "Default: name": "Προεπιλογή: 'Ονομα",
+    "Display label": "Εμφάνιση ετικέτας",
+    "Display the control to open OpenStreetMap editor": "Εμφάνιση εικονιδίου επεξεργασίας OpenStreetMap",
+    "Display the data layers control": "Εμφάνιση εικονιδίου δεδομένα επίπεδων ",
+    "Display the embed control": "Εμφάνιση εικονιδίου διαμοιρασμού",
+    "Display the fullscreen control": "Εμφάνιση εικονιδίου πλήρους οθόνης ",
+    "Display the locate control": "Εμφάνιση εικονιδίου γεωεντοπισμού ",
+    "Display the measure control": "Εμφάνιση εικονιδίου μέτρησης",
+    "Display the search control": "Εμφάνιση εικονιδίου αναζήτησης",
+    "Display the tile layers control": "Εμφάνιση εικονιδίου αλλαγής υποβάθρων",
+    "Display the zoom control": "Εμφάνιση εικονιδίου μεγέθυνσης/σμίκρυνσης ",
+    "Do you want to display a caption bar?": "Θα επιθυμούσες την εμφάνιση Λεζάντας ;",
     "Do you want to display a minimap?": "Επιθυμείτε την εμφάνιση χάρτη υπομνήματος ;",
-    "Do you want to display a panel on load?": "Do you want to display a panel on load?",
+    "Do you want to display a panel on load?": "Θα επιθυμούσες την εμφάνιση πινακίδας κατά την φόρτωση ;",
     "Do you want to display popup footer?": "Επιθυμείτε την εμφάνιση αναδυόμενης βάσης ;",
     "Do you want to display the scale control?": "Επιθυμείτε την εμφάνιση κλίμακας ;",
-    "Do you want to display the «more» control?": "Do you want to display the «more» control?",
+    "Do you want to display the «more» control?": "Επιθυμείτε την εμφάνιση \"περισσότερων\" επιλογών;",
     "Drop": "Ρίψη ",
-    "GeoRSS (only link)": "GeoRSS (only link)",
-    "GeoRSS (title + image)": "GeoRSS (title + image)",
-    "Heatmap": "Heatmap",
-    "Icon shape": "Icon shape",
-    "Icon symbol": "Icon symbol",
-    "Inherit": "Inherit",
-    "Label direction": "Label direction",
-    "Label key": "Label key",
-    "Labels are clickable": "Labels are clickable",
-    "None": "None",
-    "On the bottom": "On the bottom",
-    "On the left": "On the left",
-    "On the right": "On the right",
-    "On the top": "On the top",
-    "Popup content template": "Popup content template",
-    "Set symbol": "Set symbol",
-    "Side panel": "Side panel",
-    "Simplify": "Simplify",
-    "Symbol or url": "Symbol or url",
-    "Table": "Table",
-    "always": "always",
-    "clear": "clear",
-    "collapsed": "collapsed",
-    "color": "color",
+    "GeoRSS (only link)": "GeoRSS (μόνο σύνδεσμος)",
+    "GeoRSS (title + image)": "GeoRSS (τίτλος + εικόνα)",
+    "Heatmap": "Χάρτης εγγύτητας",
+    "Icon shape": "Σχήμα συμβόλου",
+    "Icon symbol": "Εικόνα συμβόλου",
+    "Inherit": "Μεταβίβαση",
+    "Label direction": "Κατεύθυνση ετικέτας ",
+    "Label key": "Κλειδί ετικέτας ",
+    "Labels are clickable": "Η ετικέτα έχει σύνδεσμο ",
+    "None": "Κανένα",
+    "On the bottom": "Στο κάτω μέρος",
+    "On the left": "Στο αριστερό μέρος",
+    "On the right": "Στο δεξί μέρος",
+    "On the top": "Στο πάνω μέρος",
+    "Popup content template": "Αναδυόμενο παράθυρο περιεχομένου ",
+    "Set symbol": "Ορισμός συμβόλου",
+    "Side panel": "Πλευρικός πίνακας",
+    "Simplify": "Απλοποίησε",
+    "Symbol or url": "Σύμβολο ή σύνδεσμος",
+    "Table": "Πίνακας",
+    "always": "πάντα",
+    "clear": "Εκκαθάριση",
+    "collapsed": "Κατέρρευσε ",
+    "color": "Χρώμα ",
     "dash array": "dash array",
-    "define": "define",
-    "description": "description",
-    "expanded": "expanded",
-    "fill": "fill",
-    "fill color": "fill color",
-    "fill opacity": "fill opacity",
-    "hidden": "hidden",
-    "iframe": "iframe",
-    "inherit": "inherit",
-    "name": "name",
-    "never": "never",
-    "new window": "new window",
+    "define": "Όρισε ",
+    "description": "Περιγραφή",
+    "expanded": "Ανεπτυγμένος",
+    "fill": "Γέμισμα ",
+    "fill color": "Χρώμα Γεμίσματος",
+    "fill opacity": "Αδιαφάνεια Γεμίσματος",
+    "hidden": "Απόκρυψη",
+    "iframe": "Παράθυρο εξωτερικού συνδέσμου",
+    "inherit": "Μετάβαση",
+    "name": "Όνομα",
+    "never": "Ποτέ",
+    "new window": "Νέο Παράθυρο",
     "no": "όχι",
-    "on hover": "on hover",
-    "opacity": "opacity",
-    "parent window": "parent window",
-    "stroke": "stroke",
-    "weight": "weight",
+    "on hover": "Με κατάδειξη",
+    "opacity": "Αδιαφάνεια",
+    "parent window": "Συγγενές παράθυρο ",
+    "stroke": "Πινέλο ",
+    "weight": "Βάρος",
     "yes": "ναι",
-    "{delay} seconds": "{delay} seconds",
-    "# one hash for main heading": "# one hash for main heading",
-    "## two hashes for second heading": "## two hashes for second heading",
-    "### three hashes for third heading": "### three hashes for third heading",
-    "**double star for bold**": "**double star for bold**",
-    "*simple star for italic*": "*simple star for italic*",
-    "--- for an horizontal rule": "--- for an horizontal rule",
-    "A comma separated list of numbers that defines the stroke dash pattern. Ex.: \"5, 10, 15\".": "A comma separated list of numbers that defines the stroke dash pattern. Ex.: \"5, 10, 15\".",
+    "{delay} seconds": "{καθυστέρηση} δευτερόλεπτα",
+    "# one hash for main heading": "# ένα hash για τίτλο ",
+    "## two hashes for second heading": "## δύο hash για επικεφαλίδα",
+    "### three hashes for third heading": "### τρία hash για κεφαλίδα ",
+    "**double star for bold**": "**διπλό αστερίσκο για έντονη**",
+    "*simple star for italic*": "*μονό αστερίσκο για πλάγια*",
+    "--- for an horizontal rule": "---για οριζόντιο διαχωριστικό ",
+    "A comma separated list of numbers that defines the stroke dash pattern. Ex.: \"5, 10, 15\".": "Το κόμμα χωρίζει λίστα αριθμών που ορίζονται από ένα διανυσματικό σύνολο πχ.: \"5, 10, 15\".",
     "About": "Σχετικά",
     "Action not allowed :(": "Μη επιτρεπόμενη ενέργεια :(",
-    "Activate slideshow mode": "Activate slideshow mode",
+    "Activate slideshow mode": "Ενεργοποίηση διαφανειών παρουσίασης ",
     "Add a layer": "Προσθήκη επιπέδου",
-    "Add a line to the current multi": "Add a line to the current multi",
-    "Add a new property": "Add a new property",
-    "Add a polygon to the current multi": "Add a polygon to the current multi",
+    "Add a line to the current multi": "Προσθήκη γραμμής στο παρόν πολυδεδομένο ",
+    "Add a new property": "Προσθήκη νέας ιδιότητας",
+    "Add a polygon to the current multi": "Προσθήκη πολυγώνου στο παρόν πολυδεδομένο ",
     "Advanced actions": "Εξειδικευμένες ενέργειες ",
     "Advanced properties": "Εξειδικευμένα ιδιότητες ",
-    "Advanced transition": "Advanced transition",
-    "All properties are imported.": "All properties are imported.",
-    "Allow interactions": "Allow interactions",
+    "Advanced transition": "Προχωρημένος μετασχηματισμός ",
+    "All properties are imported.": "Εισήχθησαν όλες οι ιδιότητες",
+    "Allow interactions": "Επέτρεψε αλληλεπιδράσεις ",
     "An error occured": "Παρουσιάστηκε σφάλμα ",
     "Are you sure you want to cancel your changes?": "Είστε βέβαιος για το ότι θέλετε να ακυρώσετε τις αλλαγές σας;",
     "Are you sure you want to clone this map and all its datalayers?": "Είστε βέβαιος ότι θέλετε να κλωνοποιηθεί  αυτός ο χάρτης και όλα τα επίπεδα δεδομένων του;",
     "Are you sure you want to delete the feature?": "Είστε βέβαιος ότι θέλετε να διαγράφει αυτό το στοιχείο;",
-    "Are you sure you want to delete this layer?": "Are you sure you want to delete this layer?",
+    "Are you sure you want to delete this layer?": "Είσαι σίγουρος για την διαγραφή αυτού του επιπέδου;",
     "Are you sure you want to delete this map?": "Είστε βέβαιος ότι θέλετε να διαγραφεί αυτός ο χάρτης ;",
-    "Are you sure you want to delete this property on all the features?": "Are you sure you want to delete this property on all the features?",
-    "Are you sure you want to restore this version?": "Are you sure you want to restore this version?",
-    "Attach the map to my account": "Attach the map to my account",
-    "Auto": "Auto",
-    "Autostart when map is loaded": "Autostart when map is loaded",
+    "Are you sure you want to delete this property on all the features?": "Είσαι σίγουρος για την διαγραφή αυτής της ιδιότητας από όλα τα στοιχεία; ",
+    "Are you sure you want to restore this version?": "Είσαι σίγουρος για την επαναφορά αυτής της εκδοχής ;",
+    "Attach the map to my account": "Επισύναψη αυτού του χάρτη στο λογαριασμό μου",
+    "Auto": "Αυτόματα",
+    "Autostart when map is loaded": "Αυτόματη έναρξη με την φόρτωση του χάρτη ",
     "Bring feature to center": "Κέντραρε το στοιχείο",
     "Browse data": "Περιήγηση δεδομένων ",
     "Cancel edits": "Ακύρωση επεξεργασίας ",
     "Center map on your location": "Κέντραρε τον χάρτη στη θέση σου ",
     "Change map background": "Αλλαγή χαρτογραφικού υποβάθρου ",
     "Change tilelayers": "Αλλαγή επιπέδου ",
-    "Choose a preset": "Choose a preset",
+    "Choose a preset": "Επιλογή τρέχοντος",
     "Choose the format of the data to import": "Επιλέξτε τη μορφή των δεδομένων για εισαγωγή",
     "Choose the layer to import in": "Επιλέξτε το επίπεδο που θα γίνει η εισαγωγή ",
-    "Click last point to finish shape": "Click last point to finish shape",
-    "Click to add a marker": "Click to add a marker",
-    "Click to continue drawing": "Click to continue drawing",
-    "Click to edit": "Click to edit",
-    "Click to start drawing a line": "Click to start drawing a line",
-    "Click to start drawing a polygon": "Click to start drawing a polygon",
-    "Clone": "Clone",
-    "Clone of {name}": "Clone of {name}",
-    "Clone this feature": "Clone this feature",
+    "Click last point to finish shape": "Πατήστε στο τελευταίο σημείο για την εισαγωγή του σχήματος",
+    "Click to add a marker": "Πατήστε για την εισαγωγή συμβόλου ",
+    "Click to continue drawing": "Πατήστε για συνέχεια σχεδίου",
+    "Click to edit": "Πατήστε για επεξεργασία",
+    "Click to start drawing a line": "Πατήστε για έναρξη σχεδιασμού γραμμής",
+    "Click to start drawing a polygon": "Πατήστε για έναρξη σχεδιασμού πολυγώνου ",
+    "Clone": "Κλωνοποίηση",
+    "Clone of {name}": "Κλωνοποίηση του  {ονόματος}",
+    "Clone this feature": "Κλωνοποίηση αυτού του στοιχείου",
     "Clone this map": "Κλωνοποίηση αυτού του χάρτη",
-    "Close": "Close",
-    "Clustering radius": "Clustering radius",
-    "Comma separated list of properties to use when filtering features": "Comma separated list of properties to use when filtering features",
+    "Close": "Κλείσιμο ",
+    "Clustering radius": "Ακτίνα συμπλέγματος",
+    "Comma separated list of properties to use when filtering features": "Διαχωρίστε με κόμμα την λίστα ιδιοτήτων για το φιλτράρισμα των στοιχείων ",
     "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» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.": "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» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.",
-    "Continue line": "Continue line",
-    "Continue line (Ctrl-click)": "Continue line (Ctrl-click)",
-    "Coordinates": "Coordinates",
-    "Credits": "Credits",
-    "Current view instead of default map view?": "Current view instead of default map view?",
-    "Custom background": "Custom background",
-    "Data is browsable": "Data is browsable",
-    "Default interaction options": "Default interaction options",
-    "Default properties": "Default properties",
-    "Default shape properties": "Default shape properties",
+    "Continue line": "Συνέχεια γραμμής ",
+    "Continue line (Ctrl-click)": "Συνέχεια γραμμής (Ctrl-click)",
+    "Coordinates": "Συντεταγμένες ",
+    "Credits": "Πιστοποιήσεις ",
+    "Current view instead of default map view?": "Αυτή τη προβολή χάρτη αντί της προ επιλεγμένης  ",
+    "Custom background": "Προσαρμοσμένο υπόβαθρο",
+    "Data is browsable": "Τα δεδομένα είναι περιήγησιμα ",
+    "Default interaction options": "Προεπιλεγμένες επιλογές αλληλεπίδρασης",
+    "Default properties": "Προεπιλεγμένες ιδιότητες",
+    "Default shape properties": "Προεπιλεγμένες ιδιότητες σχημάτων ",
     "Define link to open in a new window on polygon click.": "Define link to open in a new window on polygon click.",
     "Delay between two transitions when in play mode": "Delay between two transitions when in play mode",
     "Delete": "Διαγραφή ",
diff --git a/umap/static/umap/locale/zh_TW.js b/umap/static/umap/locale/zh_TW.js
index 5310a69b..5db5190f 100644
--- a/umap/static/umap/locale/zh_TW.js
+++ b/umap/static/umap/locale/zh_TW.js
@@ -46,10 +46,10 @@ var locale = {
     "On the right": "在右側",
     "On the top": "在頂部",
     "Popup content template": "彈出內文範本",
-    "Set symbol": "Set symbol",
+    "Set symbol": "設定標誌",
     "Side panel": "側邊框",
     "Simplify": "簡化",
-    "Symbol or url": "Symbol or url",
+    "Symbol or url": "標誌或URL地址",
     "Table": "表格",
     "always": "經常",
     "clear": "清除",
@@ -103,7 +103,7 @@ var locale = {
     "Are you sure you want to delete this map?": "您確定要刪除此地圖？",
     "Are you sure you want to delete this property on all the features?": "您確定要刪除所有圖徵中的此項屬性？",
     "Are you sure you want to restore this version?": "您確定要回復此一版本嗎？",
-    "Attach the map to my account": "Attach the map to my account",
+    "Attach the map to my account": "將地圖加入到我的帳號",
     "Auto": "自動",
     "Autostart when map is loaded": "當讀取地圖時自動啟動",
     "Bring feature to center": "將圖徵置中",
@@ -152,7 +152,7 @@ var locale = {
     "Disable editing": "停用編輯功能",
     "Display measure": "Display measure",
     "Display on load": "載入時顯示",
-    "Download": "Download",
+    "Download": "下載",
     "Download data": "下載資料",
     "Drag to reorder": "拖拽以排序",
     "Draw a line": "描繪線條",
@@ -217,18 +217,18 @@ var locale = {
     "Make main shape": "設為主要外形",
     "Manage layers": "管理圖層",
     "Map background credits": "地圖背景取自",
-    "Map has been attached to your account": "Map has been attached to your account",
+    "Map has been attached to your account": "地圖已經加入至你的帳號",
     "Map has been saved!": "地圖儲存已完成",
     "Map user content has been published under licence": "使用者地圖資訊內容已經以以下授權發佈",
-    "Map's editors": "Map's editors",
-    "Map's owner": "Map's owner",
+    "Map's editors": "地圖編輯者",
+    "Map's owner": "地圖擁有者",
     "Merge lines": "合併線段",
     "More controls": "更多控制項目",
     "Must be a valid CSS value (eg.: DarkBlue or #123456)": "必須是有效的 CSS 值 (例如：DarkBlue 或是 #123456)",
     "No licence has been set": "尚未設定授權條例",
     "No results": "沒有結果",
     "Only visible features will be downloaded.": "只有可見的圖徵會被下載",
-    "Open download panel": "Open download panel",
+    "Open download panel": "開啓下載管理界面",
     "Open link in…": "開啓連結於...",
     "Open this map extent in a map editor to provide more accurate data to OpenStreetMap": "在地圖編輯器中打開此地圖，提供更多準確資料給 OpenStreetMap",
     "Optional intensity property for heatmap": "選用的熱圖 heatmap 強度屬性",
@@ -259,11 +259,11 @@ var locale = {
     "Save current edits": "儲存近期的變更",
     "Save this center and zoom": "保存地圖中心點位置與縮放大小",
     "Save this location as new feature": "將地點存為新的圖徵",
-    "Search a place name": "Search a place name",
+    "Search a place name": "搜尋一個地名",
     "Search location": "搜尋地點",
     "Secret edit link is:<br>{link}": "Secret edit link is:<br>{link}",
     "See all": "觀看完整內容",
-    "See data layers": "See data layers",
+    "See data layers": "檢視資料圖層",
     "See full screen": "觀看全螢幕",
     "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "設定為假時，在幻燈片時、資料檢視器和彈出式導航中可將此圖層隱藏...",
     "Shape properties": "形狀屬性",
@@ -283,7 +283,7 @@ var locale = {
     "Stop slideshow": "中止投影片",
     "Supported scheme": "支援的模板",
     "Supported variables that will be dynamically replaced": "支援的物件將直接動態轉換",
-    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.",
+    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "屬性標誌 (symbol) 可以是任一Unicode字元或URL地址。你可以使用項目屬性 (feature properties) 作為變數，如：\"http://myserver.org/images/{name}.png\" 北一URL中，變數 {name} 將會由各標記 (marker) 的 \"name\" 數值取代。",
     "TMS format": "TMS 格式",
     "Text color for the cluster label": "叢集標籤的文字顏色",
     "Text formatting": "文字格式",
@@ -299,7 +299,7 @@ var locale = {
     "Unable to detect format of file {filename}": "無法偵測 {filename} 的檔案格式",
     "Untitled layer": "未命名圖層",
     "Untitled map": "未命名地圖",
-    "Update permissions": "Update permissions",
+    "Update permissions": "更新權限",
     "Update permissions and editors": "更新可編輯權限及編輯者",
     "Url": "網址",
     "Use current bounds": "使用目前範圍",
@@ -311,8 +311,8 @@ var locale = {
     "Where do we go from here?": "我們要去哪裡？",
     "Whether to display or not polygons paths.": "是否顯示多邊形的路徑。",
     "Whether to fill polygons with color.": "是否將多邊形填入色彩。",
-    "Who can edit": "Who can edit",
-    "Who can view": "Who can view",
+    "Who can edit": "誰可以編輯",
+    "Who can view": "誰可以檢視",
     "Will be displayed in the bottom right corner of the map": "將會顯示在地圖的右下角",
     "Will be visible in the caption of the map": "標題將出現在地圖上",
     "Woops! Someone else seems to have edited the data. You can save anyway, but this will erase the changes made by others.": "糟糕，好像有人正在進行編輯，您仍可儲存資料，但您做的變更將被他人修改取代。",
@@ -340,14 +340,14 @@ var locale = {
     "previous": "前一個",
     "width": "寬度",
     "{count} errors during import: {message}": "於匯入時發生 {count} 項錯誤: {message}",
-    "Measure distances": "Measure distances",
+    "Measure distances": "測量距離",
     "NM": "NM",
-    "kilometers": "kilometers",
+    "kilometers": "公里",
     "km": "km",
     "mi": "mi",
-    "miles": "miles",
-    "nautical miles": "nautical miles",
-    "{area} acres": "{area} acres",
+    "miles": "英里",
+    "nautical miles": "海里",
+    "{area} acres": "{area} ac",
     "{area} ha": "{area} ha",
     "{area} m&sup2;": "{area} m&sup2;",
     "{area} mi&sup2;": "{area} mi&sup2;",
@@ -355,17 +355,17 @@ var locale = {
     "{distance} NM": "{distance} NM",
     "{distance} km": "{distance} km",
     "{distance} m": "{distance} m",
-    "{distance} miles": "{distance} miles",
+    "{distance} miles": "{distance} mi",
     "{distance} yd": "{distance} yd",
-    "1 day": "1 day",
-    "1 hour": "1 hour",
-    "5 min": "5 min",
+    "1 day": "1日",
+    "1 hour": "1小時",
+    "5 min": "5分",
     "Cache proxied request": "Cache proxied request",
-    "No cache": "No cache",
-    "Popup": "Popup",
-    "Popup (large)": "Popup (large)",
-    "Popup content style": "Popup content style",
-    "Popup shape": "Popup shape"
+    "No cache": "沒有快取内容",
+    "Popup": "彈出式視窗",
+    "Popup (large)": "彈出式視窗 (大)",
+    "Popup content style": "彈出式視窗内容樣式",
+    "Popup shape": "彈出式視窗形狀"
 };
 L.registerLocale("zh_TW", locale);
 L.setLocale("zh_TW");
\ No newline at end of file
diff --git a/umap/static/umap/locale/zh_TW.json b/umap/static/umap/locale/zh_TW.json
index 76cda319..2baffeee 100644
--- a/umap/static/umap/locale/zh_TW.json
+++ b/umap/static/umap/locale/zh_TW.json
@@ -46,10 +46,10 @@
     "On the right": "在右側",
     "On the top": "在頂部",
     "Popup content template": "彈出內文範本",
-    "Set symbol": "Set symbol",
+    "Set symbol": "設定標誌",
     "Side panel": "側邊框",
     "Simplify": "簡化",
-    "Symbol or url": "Symbol or url",
+    "Symbol or url": "標誌或URL地址",
     "Table": "表格",
     "always": "經常",
     "clear": "清除",
@@ -103,7 +103,7 @@
     "Are you sure you want to delete this map?": "您確定要刪除此地圖？",
     "Are you sure you want to delete this property on all the features?": "您確定要刪除所有圖徵中的此項屬性？",
     "Are you sure you want to restore this version?": "您確定要回復此一版本嗎？",
-    "Attach the map to my account": "Attach the map to my account",
+    "Attach the map to my account": "將地圖加入到我的帳號",
     "Auto": "自動",
     "Autostart when map is loaded": "當讀取地圖時自動啟動",
     "Bring feature to center": "將圖徵置中",
@@ -152,7 +152,7 @@
     "Disable editing": "停用編輯功能",
     "Display measure": "Display measure",
     "Display on load": "載入時顯示",
-    "Download": "Download",
+    "Download": "下載",
     "Download data": "下載資料",
     "Drag to reorder": "拖拽以排序",
     "Draw a line": "描繪線條",
@@ -217,18 +217,18 @@
     "Make main shape": "設為主要外形",
     "Manage layers": "管理圖層",
     "Map background credits": "地圖背景取自",
-    "Map has been attached to your account": "Map has been attached to your account",
+    "Map has been attached to your account": "地圖已經加入至你的帳號",
     "Map has been saved!": "地圖儲存已完成",
     "Map user content has been published under licence": "使用者地圖資訊內容已經以以下授權發佈",
-    "Map's editors": "Map's editors",
-    "Map's owner": "Map's owner",
+    "Map's editors": "地圖編輯者",
+    "Map's owner": "地圖擁有者",
     "Merge lines": "合併線段",
     "More controls": "更多控制項目",
     "Must be a valid CSS value (eg.: DarkBlue or #123456)": "必須是有效的 CSS 值 (例如：DarkBlue 或是 #123456)",
     "No licence has been set": "尚未設定授權條例",
     "No results": "沒有結果",
     "Only visible features will be downloaded.": "只有可見的圖徵會被下載",
-    "Open download panel": "Open download panel",
+    "Open download panel": "開啓下載管理界面",
     "Open link in…": "開啓連結於...",
     "Open this map extent in a map editor to provide more accurate data to OpenStreetMap": "在地圖編輯器中打開此地圖，提供更多準確資料給 OpenStreetMap",
     "Optional intensity property for heatmap": "選用的熱圖 heatmap 強度屬性",
@@ -259,11 +259,11 @@
     "Save current edits": "儲存近期的變更",
     "Save this center and zoom": "保存地圖中心點位置與縮放大小",
     "Save this location as new feature": "將地點存為新的圖徵",
-    "Search a place name": "Search a place name",
+    "Search a place name": "搜尋一個地名",
     "Search location": "搜尋地點",
     "Secret edit link is:<br>{link}": "Secret edit link is:<br>{link}",
     "See all": "觀看完整內容",
-    "See data layers": "See data layers",
+    "See data layers": "檢視資料圖層",
     "See full screen": "觀看全螢幕",
     "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "設定為假時，在幻燈片時、資料檢視器和彈出式導航中可將此圖層隱藏...",
     "Shape properties": "形狀屬性",
@@ -283,7 +283,7 @@
     "Stop slideshow": "中止投影片",
     "Supported scheme": "支援的模板",
     "Supported variables that will be dynamically replaced": "支援的物件將直接動態轉換",
-    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.",
+    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "屬性標誌 (symbol) 可以是任一Unicode字元或URL地址。你可以使用項目屬性 (feature properties) 作為變數，如：\"http://myserver.org/images/{name}.png\" 北一URL中，變數 {name} 將會由各標記 (marker) 的 \"name\" 數值取代。",
     "TMS format": "TMS 格式",
     "Text color for the cluster label": "叢集標籤的文字顏色",
     "Text formatting": "文字格式",
@@ -299,7 +299,7 @@
     "Unable to detect format of file {filename}": "無法偵測 {filename} 的檔案格式",
     "Untitled layer": "未命名圖層",
     "Untitled map": "未命名地圖",
-    "Update permissions": "Update permissions",
+    "Update permissions": "更新權限",
     "Update permissions and editors": "更新可編輯權限及編輯者",
     "Url": "網址",
     "Use current bounds": "使用目前範圍",
@@ -311,8 +311,8 @@
     "Where do we go from here?": "我們要去哪裡？",
     "Whether to display or not polygons paths.": "是否顯示多邊形的路徑。",
     "Whether to fill polygons with color.": "是否將多邊形填入色彩。",
-    "Who can edit": "Who can edit",
-    "Who can view": "Who can view",
+    "Who can edit": "誰可以編輯",
+    "Who can view": "誰可以檢視",
     "Will be displayed in the bottom right corner of the map": "將會顯示在地圖的右下角",
     "Will be visible in the caption of the map": "標題將出現在地圖上",
     "Woops! Someone else seems to have edited the data. You can save anyway, but this will erase the changes made by others.": "糟糕，好像有人正在進行編輯，您仍可儲存資料，但您做的變更將被他人修改取代。",
@@ -340,14 +340,14 @@
     "previous": "前一個",
     "width": "寬度",
     "{count} errors during import: {message}": "於匯入時發生 {count} 項錯誤: {message}",
-    "Measure distances": "Measure distances",
+    "Measure distances": "測量距離",
     "NM": "NM",
-    "kilometers": "kilometers",
+    "kilometers": "公里",
     "km": "km",
     "mi": "mi",
-    "miles": "miles",
-    "nautical miles": "nautical miles",
-    "{area} acres": "{area} acres",
+    "miles": "英里",
+    "nautical miles": "海里",
+    "{area} acres": "{area} ac",
     "{area} ha": "{area} ha",
     "{area} m&sup2;": "{area} m&sup2;",
     "{area} mi&sup2;": "{area} mi&sup2;",
@@ -355,15 +355,15 @@
     "{distance} NM": "{distance} NM",
     "{distance} km": "{distance} km",
     "{distance} m": "{distance} m",
-    "{distance} miles": "{distance} miles",
+    "{distance} miles": "{distance} mi",
     "{distance} yd": "{distance} yd",
-    "1 day": "1 day",
-    "1 hour": "1 hour",
-    "5 min": "5 min",
+    "1 day": "1日",
+    "1 hour": "1小時",
+    "5 min": "5分",
     "Cache proxied request": "Cache proxied request",
-    "No cache": "No cache",
-    "Popup": "Popup",
-    "Popup (large)": "Popup (large)",
-    "Popup content style": "Popup content style",
-    "Popup shape": "Popup shape"
+    "No cache": "沒有快取内容",
+    "Popup": "彈出式視窗",
+    "Popup (large)": "彈出式視窗 (大)",
+    "Popup content style": "彈出式視窗内容樣式",
+    "Popup shape": "彈出式視窗形狀"
 }
\ No newline at end of file