diff --git a/scripts/render.py b/scripts/render.py
index d98900f8..f8822fb0 100755
--- a/scripts/render.py
+++ b/scripts/render.py
@@ -505,7 +505,7 @@ class JobRenderer(threading.Thread):
             output_formats = \
                 list(set(compatible_output_formats) & set(RENDERING_RESULT_FORMATS))
 
-            renderer.render(config, self.job.layout,
+            output_count = renderer.render(config, self.job.layout,
                             output_formats, result_file_prefix)
 
             # Create thumbnail
@@ -515,8 +515,14 @@ class JobRenderer(threading.Thread):
             except:
                 pass
 
-            self.result = RESULT_SUCCESS
-            LOG.info("Finished rendering of job #%d." % self.job.id)
+            if output_count > 0:
+                self.result = RESULT_SUCCESS
+                LOG.info("Finished rendering of job #%d." % self.job.id)
+                # TODO log if some formats failed
+            else:
+                self.result = RESULT_RENDERING_EXCEPTION
+                LOG.exception("Rendering of job #%d faild, no output files generated" % self.job.id)
+                return self.result
         except KeyboardInterrupt:
             self.result = RESULT_KEYBOARD_INTERRUPT
             LOG.info("Rendering of job #%d interrupted!" % self.job.id)
diff --git a/www/locale/ast/LC_MESSAGES/django.po b/www/locale/ast/LC_MESSAGES/django.po
index f9c5f300..19870138 100644
--- a/www/locale/ast/LC_MESSAGES/django.po
+++ b/www/locale/ast/LC_MESSAGES/django.po
@@ -1853,7 +1853,7 @@ msgstr "El dibuxáu foi correutu."
 #| msgid ""
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
-msgstr "¡Falló'l dibuxáu! Comunícate con hartmut@php.net pa más información."
+msgstr "¡Falló'l dibuxáu! Comunícate con %(email)s pa más información."
 
 #: www/maposmatic/templatetags/extratags.py:51
 #, fuzzy
diff --git a/www/locale/be/LC_MESSAGES/django.po b/www/locale/be/LC_MESSAGES/django.po
index b7bc9a46..fbaa517e 100644
--- a/www/locale/be/LC_MESSAGES/django.po
+++ b/www/locale/be/LC_MESSAGES/django.po
@@ -1824,7 +1824,7 @@ msgstr "Мапа паспяхова створана."
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
-"Не ўдалося стварыць мапу! Калі ласка, звяжыцеся з hartmut@php.net каб "
+"Не ўдалося стварыць мапу! Калі ласка, звяжыцеся з %(email)s каб "
 "атрымаць дадатковыя звесткі."
 
 #: www/maposmatic/templatetags/extratags.py:51
diff --git a/www/locale/de/LC_MESSAGES/django.po b/www/locale/de/LC_MESSAGES/django.po
index a796ec37..27b4eed1 100644
--- a/www/locale/de/LC_MESSAGES/django.po
+++ b/www/locale/de/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-06-13 14:34+0200\n"
-"PO-Revision-Date: 2021-06-13 13:55+0000\n"
+"PO-Revision-Date: 2021-09-21 21:18+0000\n"
 "Last-Translator: Hartmut Holzgraefe <hartmut@php.net>\n"
 "Language-Team: German <https://translate.get-map.org/projects/maposmatic/"
 "maposmatic/de/>\n"
@@ -71,10 +71,8 @@ msgid "Full-page layout with the street index at the bottom"
 msgstr "Ganzseitig mit Straßenverzeichnis unten"
 
 #: www/maposmatic/forms.py:112
-#, fuzzy
-#| msgid "Full-page layout with the street index on the side"
 msgid "Full-page layout with the street index on extra page (PDF only)"
-msgstr "Ganzseitig mit Straßenverzeichnis seitlich"
+msgstr "Ganzseitig mit Straßenverzeichnis auf einer eigenen Seite (nur PDF)"
 
 #: www/maposmatic/forms.py:114
 msgid "Multi-page layout"
@@ -231,8 +229,8 @@ msgstr ""
 "Gilles' Idee Leben ein,\n"
 " indem sie den Code schrieben und das Projekt <strong>MapOSMatic</strong> "
 "nannten.\n"
-" Die Gruppe der <em>Hacker</em> möchte Gilles dafür danken, dass er seine "
-"geniale Idee mit ihnen teilte!"
+" Die Gruppe der Hacker möchte Gilles dafür danken, dass er seine geniale "
+"Idee mit ihnen teilte!"
 
 #: www/maposmatic/templates/maposmatic/about.html:84
 msgid ""
@@ -481,18 +479,16 @@ msgid "Contributors"
 msgstr "Mitwirkende"
 
 #: www/maposmatic/templates/maposmatic/about.html:200
-#, fuzzy
-#| msgid "Core team"
 msgid "Current team"
-msgstr "Kernteam"
+msgstr "Aktuelles Team"
 
 #: www/maposmatic/templates/maposmatic/about.html:203
 msgid "Developer, running instance on https://print.get-map-org/"
-msgstr ""
+msgstr "Entwickler, Betreiber der Instanz auf https://print.get-map.org/"
 
 #: www/maposmatic/templates/maposmatic/about.html:208
 msgid "Original team"
-msgstr ""
+msgstr "Original-Team"
 
 #: www/maposmatic/templates/maposmatic/about.html:211
 #: www/maposmatic/templates/maposmatic/about.html:212
@@ -1202,10 +1198,8 @@ msgid "File upload"
 msgstr "Datei(en) hochladen"
 
 #: www/maposmatic/templates/maposmatic/new.html:195
-#, fuzzy
-#| msgid "Umap data file"
 msgid "Upload files"
-msgstr "Umap Datei"
+msgstr "Dateien hochlanden"
 
 #: www/maposmatic/templates/maposmatic/new.html:204
 msgid ""
@@ -1213,6 +1207,10 @@ msgid ""
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
+"Laden Sie hier GPX-, Umap- oder allgemeine GeoJSON-Dateien hoch. <br/> Sie "
+"können mehrere Dateien gleichzeitig auswählen. Wenn Sie den "
+"Dateiauswahldialog erneut öffnen, um Dateien auszuwählen, ersetzt Ihre "
+"Auswahl die vorherige."
 
 #: www/maposmatic/templates/maposmatic/new.html:216
 msgid ""
@@ -1312,6 +1310,9 @@ msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
+"Sie können aus den vorgeschlagenen Standardgrößen die am \"besten geeignete\""
+" Größe für den ausgewählten Kartenbereich auswählen oder eine Breite und "
+"Höhe Ihrer Wahl angeben."
 
 #: www/maposmatic/templates/maposmatic/new.html:408
 msgid "Map title"
@@ -1327,7 +1328,7 @@ msgstr "Ihre Email-Adresse (für Benachrichtigungen, optional)"
 
 #: www/maposmatic/templates/maposmatic/new.html:436
 msgid "will be deleted after"
-msgstr ""
+msgstr "wird gelöscht nach"
 
 #: www/maposmatic/templates/maposmatic/new.html:436
 msgid "hours"
@@ -1490,9 +1491,9 @@ msgid ""
 "  "
 msgstr ""
 "\n"
-"  Wenn Sie eine Email-Adresse angeben unter der sie benachrichtigt werden "
-"wollen wenn der Kartenauftrag ausgeführt worde ist so wird diese Adresse "
-"gespeichert\n"
+"  Wenn Sie eine Email-Adresse angeben unter der Sie benachrichtigt werden "
+"wollen sobald ein Kartenauftrag vollständig ausgeführt wurde wird diese "
+"Adresse gespeichert\n"
 "  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:96
@@ -1524,8 +1525,8 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    Diese Seite benutzt <a href=\"https://matomo.org/\">Matomo</a> ("
-"ursprünglich bekannt als Piwik) für statistische Analysen.\n"
+"    Diese Seite benutzt <a href=\"https://matomo.org/\">Matomo</a>\n"
+" (ursprünglich bekannt als Piwik) für statistische Analysen.\n"
 "    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:116
@@ -1536,8 +1537,8 @@ msgid ""
 "  "
 msgstr ""
 "\n"
-"  Diese Seite führt weder selbst Benutzer-Tracking durch, noch nutzt sie "
-"dafür externe Tracking-Dienste.\n"
+"  Diese Seite führt weder selbst Benutzer-Tracking durch, \n"
+"noch nutzt sie dafür externe Tracking-Dienste.\n"
 "  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:126
@@ -1593,7 +1594,7 @@ msgid ""
 "      "
 msgstr ""
 "\n"
-"      Wenn Sie dieses Cookie nicht akzeptieren wird die Cookie-Warning bei "
+"      Wenn Sie dieses Cookie nicht akzeptieren wird die Cookie-Warnung bei "
 "jedem weiteren Zugriff auf diesen Webauftritt angezeigt, bis auf den dafür "
 "nötigen Bildschirm-Platz wird das aber keine funktionalen Einschränkungen "
 "mit sich bringen.\n"
@@ -1609,7 +1610,7 @@ msgid ""
 msgstr ""
 "\n"
 "      Dieses Cookie stellt eine Verbindung zwischen Ihrer aktuellen Browser-"
-"Sitzung und einigen Sitzungsspezifischen Inormationen auf dem Server her.\n"
+"Sitzung und einigen sitzungsspezifischen Informationen auf dem Server her.\n"
 "      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:169
@@ -1720,10 +1721,10 @@ msgid ""
 "      "
 msgstr ""
 "\n"
-"      Wenn Sie sich entscheiden dieses Cookie nicht anzunehen kann es "
+"      Wenn Sie sich entscheiden dieses Cookie nicht anzunehmen kann es "
 "vorkommen, dass die Kartenkacheln in der interaktiven Karte deutlich "
 "langsamer geladen werden, aber davon abgesehen wird die Funktionalität "
-"dieser Website dadurch nicht weiter beeinrächtigt.\n"
+"dieser Website dadurch nicht weiter beeinträchtigt.\n"
 "      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:235
@@ -1825,9 +1826,9 @@ msgid ""
 msgstr ""
 "\n"
 "  Sollten Sie solche Dateien irrtümlich hochgeladen haben, so "
-"benachrichtigen Sie bitte %(CONTACT_EMAIL) via Email und bitten Sie um die "
+"benachrichtigen Sie bitte %(CONTACT_EMAIL)s via Email und bitten Sie um die "
 "Entfernung der hochgeladenen Dateien und der daraus generierten Karten. "
-"Bitte geben Sie entweder die URL oder Kennummer der generierten Karte an, "
+"Bitte geben Sie entweder die URL oder Kennnummer der generierten Karte an, "
 "oder die Dateinamen der hochgeladenen Dateien und den ungefähren Zeitpunkt "
 "des Hochladens auf diese Seite.\n"
 "  "
@@ -1868,7 +1869,7 @@ msgstr ""
 
 #: www/maposmatic/templates/maposmatic/suggest.js:41
 msgid "Start typing for suggestions..."
-msgstr "Tippen Sie, um Vorschläge zu erhalten... "
+msgstr "Tippen Sie, um Vorschläge zu erhalten..."
 
 #: www/maposmatic/templatetags/extratags.py:41
 msgid "Waiting for rendering to begin..."
@@ -2038,16 +2039,14 @@ msgstr "Akzeptieren"
 #: www/templates/render_email_failure.txt:1
 #: www/templates/render_email_success.txt:1
 #: www/templates/render_email_timeout.txt:1
-#, fuzzy
-#| msgid "Rendering daemon: "
 msgid "MapOSMatic rendering daemon"
-msgstr "Render-Daemon: "
+msgstr "MapOSMatic Render-Daemon"
 
 #: www/templates/render_email_exception.txt:7
 #: www/templates/render_email_failure.txt:7
 #, python-format
 msgid "Rendering of job #%(jobid)s failed"
-msgstr "Rendervorgang  für Auftrag #%(jobid)s fehlgeschlagen!"
+msgstr "Rendervorgang für Auftrag #%(jobid)s fehlgeschlagen"
 
 #: www/templates/render_email_exception.txt:10
 #, python-format
diff --git a/www/locale/el/LC_MESSAGES/django.po b/www/locale/el/LC_MESSAGES/django.po
index 693597ce..6f72bb53 100644
--- a/www/locale/el/LC_MESSAGES/django.po
+++ b/www/locale/el/LC_MESSAGES/django.po
@@ -1889,7 +1889,7 @@ msgstr "Η επεξεργασία ολοκληρώθηκε."
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
-"Η επεξεργασια απετυχε! Επικοινωνηστε στην διευθυνση hartmut@php.net για "
+"Η επεξεργασια απετυχε! Επικοινωνηστε στην διευθυνση %(email)s για "
 "περισσοτερες πληροφοριες."
 
 #: www/maposmatic/templatetags/extratags.py:51
diff --git a/www/locale/eo/LC_MESSAGES/django.po b/www/locale/eo/LC_MESSAGES/django.po
index 8d37c4a0..fde5064f 100644
--- a/www/locale/eo/LC_MESSAGES/django.po
+++ b/www/locale/eo/LC_MESSAGES/django.po
@@ -1797,7 +1797,7 @@ msgstr "La mapo sukcese finkreiĝis."
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
-"La mapkreado malsukcesis! Bv. kontakti hartmut@php.net por pli da informoj."
+"La mapkreado malsukcesis! Bv. kontakti %(email)s por pli da informoj."
 
 #: www/maposmatic/templatetags/extratags.py:51
 #, fuzzy
diff --git a/www/locale/es/LC_MESSAGES/django.po b/www/locale/es/LC_MESSAGES/django.po
index c0a405c0..db3b998e 100644
--- a/www/locale/es/LC_MESSAGES/django.po
+++ b/www/locale/es/LC_MESSAGES/django.po
@@ -1677,7 +1677,7 @@ msgstr "Renderización exitosa."
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
-"¡Renderización fallida! Contacte con hartmut@php.net for para más "
+"¡Renderización fallida! Contacte con %(email)s for para más "
 "información."
 
 #: www/maposmatic/templatetags/extratags.py:51
diff --git a/www/locale/et/LC_MESSAGES/django.po b/www/locale/et/LC_MESSAGES/django.po
index 6ae274b6..73965550 100644
--- a/www/locale/et/LC_MESSAGES/django.po
+++ b/www/locale/et/LC_MESSAGES/django.po
@@ -1614,7 +1614,7 @@ msgstr "Renderdus oli edukas."
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
-"Renderdus ebaõnnestus! Palun kontakteeru hartmut@php.net et saada enam infot."
+"Renderdus ebaõnnestus! Palun kontakteeru %(email)s et saada enam infot."
 
 #: www/maposmatic/templatetags/extratags.py:51
 #, fuzzy
diff --git a/www/locale/eu/LC_MESSAGES/django.po b/www/locale/eu/LC_MESSAGES/django.po
index 4e92a72c..c34a06b3 100644
--- a/www/locale/eu/LC_MESSAGES/django.po
+++ b/www/locale/eu/LC_MESSAGES/django.po
@@ -2,21 +2,22 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Gari Araolaza <garaolaza@codesyntax.com>, 2019.
+# Mikel Larreategi <larreategi@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-06-13 14:34+0200\n"
-"PO-Revision-Date: 2019-04-16 19:13+0000\n"
-"Last-Translator: Gari Araolaza <garaolaza@codesyntax.com>\n"
-"Language-Team: Basque <http://translate.get-map.org/projects/maposmatic/"
+"PO-Revision-Date: 2021-11-08 04:38+0000\n"
+"Last-Translator: Mikel Larreategi <larreategi@gmail.com>\n"
+"Language-Team: Basque <https://translate.get-map.org/projects/maposmatic/"
 "maposmatic/eu/>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.5.1\n"
+"X-Generator: Weblate 4.6.2\n"
 
 #: www/maposmatic/feeds.py:45
 msgid "maps"
@@ -28,7 +29,7 @@ msgstr "[DEV]"
 
 #: www/maposmatic/feeds.py:49
 msgid "The latest rendered maps on MapOSMatic."
-msgstr ""
+msgstr "MapOSMaticen sortutako azken mapak."
 
 #: www/maposmatic/feeds.py:102
 msgid "errors"
@@ -36,134 +37,136 @@ msgstr "erroreak"
 
 #: www/maposmatic/feeds.py:106
 msgid "The latest render failures on MapOSMatic."
-msgstr ""
+msgstr "MapOSMaticen eman diren azken sorkuntza erroreak."
 
 #: www/maposmatic/forms.py:48
 msgid "Search for a map"
-msgstr ""
+msgstr "Bilatu mapa bat"
 
 #: www/maposmatic/forms.py:71
 msgid "Area"
-msgstr ""
+msgstr "Ingurua"
 
 #: www/maposmatic/forms.py:106
 msgid "Full-page layout without street index"
-msgstr ""
+msgstr "Orrialde osoa kale-indize gabe"
 
 #: www/maposmatic/forms.py:108
 msgid "Full-page layout with the street index on the side"
-msgstr ""
+msgstr "Orrialde osoa aldamenean kale-indizearekin"
 
 #: www/maposmatic/forms.py:110
 msgid "Full-page layout with the street index at the bottom"
-msgstr ""
+msgstr "Orrialde osoa azpian kale-indizearekin"
 
 #: www/maposmatic/forms.py:112
 msgid "Full-page layout with the street index on extra page (PDF only)"
-msgstr ""
+msgstr "Orrialde osoa kale-indizea beste orrialde baten duela (PDFa bakarrik)"
 
 #: www/maposmatic/forms.py:114
 msgid "Multi-page layout"
-msgstr ""
+msgstr "Hainbat orrialde"
 
 #: www/maposmatic/forms.py:128
 #, python-format
 msgid "The <i>%(stylesheet_name)s</i> stylesheet"
-msgstr ""
+msgstr "Estilo-orria <i>%(stylesheet_name)s</i>"
 
 #: www/maposmatic/forms.py:131 www/maposmatic/forms.py:158
 msgid "more info"
-msgstr ""
+msgstr "informazio gehiago"
 
 #: www/maposmatic/forms.py:155
 #, python-format
 msgid "The <i>%(stylesheet_name)s</i> overlay"
-msgstr ""
+msgstr "Estilo orria <i>%(stylesheet_name)s</i>"
 
 #: www/maposmatic/forms.py:196
 msgid "Layout required"
-msgstr ""
+msgstr "Diseinua aukeratzea derrigorrezkoa da"
 
 #: www/maposmatic/forms.py:201
 msgid "Stylesheet required"
-msgstr ""
+msgstr "Estilo-orria aukeratzea derrigorrezkoa da"
 
 #: www/maposmatic/forms.py:207
 msgid "Administrative city required"
-msgstr ""
+msgstr "Hiria adieraztea derrigorrezkoa da"
 
 #: www/maposmatic/forms.py:221
 #, python-format
 msgid "Error with osm city: %s"
-msgstr ""
+msgstr "Errorea gertatu da hiriarekin osm-n: %s"
 
 #: www/maposmatic/forms.py:231
 msgid "Required"
-msgstr ""
+msgstr "Beharrezkoa"
 
 #: www/maposmatic/forms.py:239
 msgid "Same latitude"
-msgstr ""
+msgstr "Latitude bera"
 
 #: www/maposmatic/forms.py:246
 msgid "Same longitude"
-msgstr ""
+msgstr "Longitude bera"
 
 #: www/maposmatic/forms.py:270
 msgid "Bounding Box too large"
-msgstr ""
+msgstr "Muga-kutxa handiegia da"
 
 #: www/maposmatic/models.py:222
 #, python-format
 msgid "%(title)s %(format)s Map"
-msgstr ""
+msgstr "%(title)s %(format)s mapa"
 
 #: www/maposmatic/models.py:230
 #, python-format
 msgid "%(title)s %(format)s Index"
-msgstr ""
+msgstr "%(title)s %(format)s maparen indizea"
 
 #: www/maposmatic/models.py:340
 #, python-format
 msgid "Invalid layout '%s'"
-msgstr ""
+msgstr "Diseinua ez da zuzena '%s'"
 
 #: www/maposmatic/models.py:344
 #, python-format
 msgid "Invalid style '%s'"
-msgstr ""
+msgstr "Estiloa ez da zuzena '%s'"
 
 #: www/maposmatic/nominatim.py:245 www/maposmatic/views.py:511
 msgid "Administrative area too big for rendering"
-msgstr ""
+msgstr "Ingurua handiegia da mapa sortzeko"
 
 #: www/maposmatic/nominatim.py:301
 msgid "No administrative boundary details from GIS"
-msgstr ""
+msgstr "GIS sistemak ez du inguruaren mugarik eman"
 
 #: www/maposmatic/nominatim.py:315
 msgid "No administrative boundary"
-msgstr ""
+msgstr "Mugarik gabe"
 
 #: www/maposmatic/templates/maposmatic/about.html:36
 #: www/maposmatic/templates/maposmatic/about.html:39
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:30
 msgid "About"
-msgstr ""
+msgstr "Honi buruz"
 
 #: www/maposmatic/templates/maposmatic/about.html:43
 msgid ""
 "This is a fork of the original <a href=\"http://maposmatic.org\">MapOSMatic</"
 "a> service. The source for this fork can be found on GitHub:"
 msgstr ""
+"Hau jatorrizko <a href=\"http://maposmatic.org\">MapOSMatic</a> zerbitzuaren "
+"'fork' bat da. Iturburu-kodea GitHuben dago:"
 
 #: www/maposmatic/templates/maposmatic/about.html:50
 msgid "The forked MapOSMatic web frontend"
-msgstr ""
+msgstr "Zatitutako MapOSMatic web frontenda"
 
 #: www/maposmatic/templates/maposmatic/about.html:51
 msgid "The forked Ocitysmap rendering backend"
-msgstr ""
+msgstr "Zatitutako Ocitysmap sortzailearen backenda"
 
 #: www/maposmatic/templates/maposmatic/about.html:54
 msgid ""
@@ -171,15 +174,19 @@ msgid ""
 "href='https://github.com/hholzgra/maposmatic-vagrant'>Vagrant test setup</a> "
 "as a starting point"
 msgstr ""
+"Zure instantzia martxan jarri nahi baduzu erabiliz <a href='https://github."
+"com/hholzgra/maposmatic-vagrant'>Vagrant instalazioa</a>"
 
 #: www/maposmatic/templates/maposmatic/about.html:61
 msgid ""
 "Below you'll find the \"About\" text of the original MapOSMatic project."
 msgstr ""
+"Jarraian jatorrizko MapOSMatic zerbitzuaren \"Honi buruz\" testua irakurri "
+"dezakezu."
 
 #: www/maposmatic/templates/maposmatic/about.html:67
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #: www/maposmatic/templates/maposmatic/about.html:70
 msgid ""
@@ -206,7 +213,7 @@ msgstr ""
 
 #: www/maposmatic/templates/maposmatic/about.html:91
 msgid "How does it work?"
-msgstr ""
+msgstr "Nola dabil?"
 
 #: www/maposmatic/templates/maposmatic/about.html:94
 msgid ""
@@ -240,6 +247,8 @@ msgid ""
 "Renders the map using OpenStreetMap data and the\n"
 "  OpenStreetMap Mapnik stylesheet;"
 msgstr ""
+"Mapa OpenStreetMapen datuak erabiliz\n"
+"eta OpenStreetMapen Mapnik estiloa erabiliz sortzen du;"
 
 #: www/maposmatic/templates/maposmatic/about.html:120
 msgid ""
@@ -248,12 +257,18 @@ msgid ""
 "  information on the map (copyright, scale,\n"
 "  etc.);"
 msgstr ""
+"Maparen goialdea, Mapnik erabiliz, 500 metro\n"
+"koadroko sareta, saretaren etiketak, eta maparen beste informazio\n"
+"bat sortzen du (copyrighta, eskala, \n"
+"etab.);"
 
 #: www/maposmatic/templates/maposmatic/about.html:124
 msgid ""
 "Greys out all the area outside the city if we find\n"
 "  its administrative boundary;"
 msgstr ""
+"Hiriaren mugak aurkitzen baditugu, hiritik kanpoko\n"
+"ingurua grisez;"
 
 #: www/maposmatic/templates/maposmatic/about.html:126
 msgid ""
@@ -261,6 +276,9 @@ msgid ""
 "  OpenStreetMap data and the intersection of the streets with the\n"
 "  squares on the map."
 msgstr ""
+"Kaleen indizea sortzen du, OpenStreetMapeko datuetan\n"
+"oinarrtituta eta kaleak non dauden, mapako saretarekin\n"
+"bat etorriz."
 
 #: www/maposmatic/templates/maposmatic/about.html:132
 msgid ""
@@ -293,10 +311,15 @@ msgid ""
 "allows to select between multiple cities of the same name, by\n"
 "providing information on the city location."
 msgstr ""
+"Hiriak bilatzeko, <a href=\"http://nominatim.openstreetmap.org\">Nominatim</"
+"a> zerbitzua darabilgu.\n"
+"Zerbitzu honek izen bereko bi hiriren artean aukera egiten uzte du, "
+"hiriaren\n"
+"kokalekuaren inguruko informazioa eskainiz."
 
 #: www/maposmatic/templates/maposmatic/about.html:161
 msgid "Contributing"
-msgstr ""
+msgstr "Lagundu"
 
 #: www/maposmatic/templates/maposmatic/about.html:164
 msgid ""
@@ -305,6 +328,10 @@ msgid ""
 "contribute. Here are the few starting points to help\n"
 "us:"
 msgstr ""
+"Goian esan bezala <i>OCitySMap</i> eta \n"
+"<i>MapOSMatic</i> software librea dira, eta laguntzera gonbidatu\n"
+"nahi zaitugu. Hemen daude hasierako laguntza\n"
+"puntuak:"
 
 #: www/maposmatic/templates/maposmatic/about.html:171
 msgid ""
@@ -313,6 +340,10 @@ msgid ""
 "  which contains valuable technical information and documents about\n"
 "  MapOSMatic;"
 msgstr ""
+"<a href=\"http://wiki.maposmatic.org\">MapOsMatic Wikia</a>,\n"
+"\n"
+"MapOSMatic zerbitzuaren inguruko informazio teknikoa,\n"
+"eta dokumentuak ematen dituena;"
 
 #: www/maposmatic/templates/maposmatic/about.html:175
 msgid ""
@@ -320,6 +351,9 @@ msgid ""
 "  href=\"https://savannah.nongnu.org/projects/maposmatic/\">project on\n"
 "  Savannah</a>;"
 msgstr ""
+"<a\n"
+"  href=\"https://savannah.nongnu.org/projects/maposmatic/\">Proiektua \n"
+"Savannah-n</a>;"
 
 #: www/maposmatic/templates/maposmatic/about.html:178
 msgid ""
@@ -328,12 +362,18 @@ msgid ""
 "\">development\n"
 "  mailing-list</a>;"
 msgstr ""
+"Garapeneko <a \n"
+" href=\"http://lists.nongnu.org/mailman/listinfo/maposmatic-dev\">posta-"
+"zerrenda\n"
+"</a>;"
 
 #: www/maposmatic/templates/maposmatic/about.html:181
 msgid ""
 "The IRC channel <tt>#maposmatic</tt> on\n"
 "  Freenode;"
 msgstr ""
+"<tt>#maposmatic</tt> IRC\n"
+"kanala Freenoden;"
 
 #: www/maposmatic/templates/maposmatic/about.html:183
 msgid ""
@@ -343,6 +383,12 @@ msgid ""
 "  Git repository</a>, which can be cloned using <tt>git clone\n"
 "  git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt>;"
 msgstr ""
+"<a  \n"
+"href=\"http://git.savannah.gnu.org/cgit/maposmatic/ocitysmap.git\">OCitySMap "
+"git repositorioa\n"
+"</a>, <tt>git clone  git://git.sv.gnu.org/maposmatic/ocitysmap.git</tt> "
+"erabiliz\n"
+"lortu daitekeena;"
 
 #: www/maposmatic/templates/maposmatic/about.html:187
 msgid ""
@@ -351,6 +397,11 @@ msgid ""
 "  Git repository</a>, which can be cloned using\n"
 "  <tt>git clone git://git.sv.gnu.org/maposmatic.git</tt>;"
 msgstr ""
+"<a  \n"
+"href=\"http://git.savannah.gnu.org/cgit/maposmatic.git\">MapOSMatic\n"
+"git repositorioa</a>,   <tt>git clone git://git.sv.gnu.org/maposmatic.git</"
+"tt> \n"
+"erabiliz lortu daitekeena;"
 
 #: www/maposmatic/templates/maposmatic/about.html:191
 msgid ""
@@ -358,22 +409,26 @@ msgid ""
 "  href=\"https://savannah.nongnu.org/task/?group=maposmatic\">TODO-list\n"
 "  and ideas</a>."
 msgstr ""
+"<a \n"
+" href=\"https://savannah.nongnu.org/task/?group=maposmatic\">egiteko "
+"zerrenda\n"
+"eta ideiak</a>."
 
 #: www/maposmatic/templates/maposmatic/about.html:196
 msgid "Contributors"
-msgstr ""
+msgstr "Laguntzaileak"
 
 #: www/maposmatic/templates/maposmatic/about.html:200
 msgid "Current team"
-msgstr ""
+msgstr "Gaur-egungo lantaldea"
 
 #: www/maposmatic/templates/maposmatic/about.html:203
 msgid "Developer, running instance on https://print.get-map-org/"
-msgstr ""
+msgstr "Garatzailea, https://print.get-map-org/ instantzia martxan duena"
 
 #: www/maposmatic/templates/maposmatic/about.html:208
 msgid "Original team"
-msgstr ""
+msgstr "Jatorrizko taldea"
 
 #: www/maposmatic/templates/maposmatic/about.html:211
 #: www/maposmatic/templates/maposmatic/about.html:212
@@ -381,184 +436,190 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/about.html:215
 #: www/maposmatic/templates/maposmatic/about.html:218
 msgid "Developer"
-msgstr ""
+msgstr "Garatzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:214
 msgid "Developer and Mapnik stylesheets"
-msgstr ""
+msgstr "Garatzailea eta Mapnik estilo-orriak"
 
 #: www/maposmatic/templates/maposmatic/about.html:216
 msgid ""
 "Developer, system administration, GIS database maintenance and site design"
 msgstr ""
+"Garatzailea, sistemen kudeatzailea, GIS datu-basearen mantentzea eta "
+"webgunearen diseinua"
 
 #: www/maposmatic/templates/maposmatic/about.html:217
 msgid "Developer, treasurer"
-msgstr ""
+msgstr "Garatzailea, diruzaian"
 
 #: www/maposmatic/templates/maposmatic/about.html:224
 msgid "Other contributors"
-msgstr ""
+msgstr "Beste laguntzaile batzuk"
 
 #: www/maposmatic/templates/maposmatic/about.html:227
 msgid "German translation"
-msgstr ""
+msgstr "Alemanierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:228
 msgid "Italian translation"
-msgstr ""
+msgstr "Italierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:229
 msgid "Catalan translation"
-msgstr ""
+msgstr "Katalaneko itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:230
 msgid "Russian translation"
-msgstr ""
+msgstr "Errusierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:231
 msgid "Arabic translation"
-msgstr ""
+msgstr "Arabierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:232
 #: www/maposmatic/templates/maposmatic/about.html:233
 msgid "Brasilian portuguese translation"
-msgstr ""
+msgstr "Brasilego portugalerako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:234
 msgid "Danish translation"
-msgstr ""
+msgstr "Danierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:235
 msgid "Dutch translation"
-msgstr ""
+msgstr "Neerlanderako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:236
 msgid "Croatian translation"
-msgstr ""
+msgstr "Kroazierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:237
 msgid "Polish translation"
-msgstr ""
+msgstr "Polonierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:238
 msgid "Indonesian translation"
-msgstr ""
+msgstr "Indonesierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:239
 #: www/maposmatic/templates/maposmatic/about.html:240
 msgid "Norwegian bokmål translation"
-msgstr ""
+msgstr "Bokmål norvegierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:240
 msgid "Norwegian nynorsk translation"
-msgstr ""
+msgstr "Nynorsk norvegierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:241
 msgid "Turkish translation"
-msgstr ""
+msgstr "Turkierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:241
 msgid "Translation automation"
-msgstr ""
+msgstr "Itzultzaile automatikoa"
 
 #: www/maposmatic/templates/maposmatic/about.html:242
 msgid "Kirgyz translation"
-msgstr ""
+msgstr "Krigyzierako itzultzailea"
 
 #: www/maposmatic/templates/maposmatic/about.html:243
 msgid "Printable stylesheet"
-msgstr ""
+msgstr "Inprimatzeko estilo-orria"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:12
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:6
 msgid "Platform status"
-msgstr ""
+msgstr "Plataformaren egoera"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:14
 msgid "Rendering daemon: "
-msgstr ""
+msgstr "Sortzailea: "
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:15
 msgid "GIS database: "
-msgstr ""
+msgstr "GIS datu-basea: "
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:16
 msgid "WayMarked database: "
-msgstr ""
+msgstr "WayMarked datu-basea: "
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:19
 msgid "Toggle navigation"
-msgstr ""
+msgstr "Nabigazioa erakutsi/ezkutatu"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:25
 msgid "Home"
-msgstr ""
+msgstr "Hasiera"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:26
 #: www/maposmatic/templates/maposmatic/new.html:36
 msgid "Create map"
-msgstr ""
+msgstr "Sortu mapa"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:27
 #: www/maposmatic/templates/maposmatic/maps.html:36
 #: www/maposmatic/templates/maposmatic/maps.html:46
 msgid "Maps"
-msgstr ""
+msgstr "Mapak"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:32
 msgid "About Maposmatic"
-msgstr ""
+msgstr "Maposmatic-i buruz"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:34
 #: www/maposmatic/templates/maposmatic/documentation-api.html:36
 #: www/maposmatic/templates/maposmatic/documentation-user-guide.html:36
 msgid "User Guide"
-msgstr ""
+msgstr "Erabiltzaile-gida"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:35
 msgid "API Docs"
-msgstr ""
+msgstr "API dokumentazioa"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:41
 #: www/maposmatic/templates/maposmatic/base.html:42
 msgid "Maps feed"
-msgstr ""
+msgstr "Mapen jarioa"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:42
 msgid "Errors feed"
-msgstr ""
+msgstr "Erroreen jarioa"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:47
 #: www/maposmatic/templates/maposmatic/donate.html:36
 #: www/maposmatic/templates/maposmatic/donate.html:38
 #: www/maposmatic/templates/maposmatic/index.html:87
 msgid "Donate"
-msgstr ""
+msgstr "Dirua eman"
 
 #: www/maposmatic/templates/maposmatic/base.html:110
 msgid ""
 "MapOSMatic is a free software webservice to generate maps of cities using "
 "OpenStreetMap data."
 msgstr ""
+"MapOSMatic OpenStreetMap datuekin hirietako mapak sortzeko software libreko "
+"zerbitzua da."
 
 #: www/maposmatic/templates/maposmatic/base.html:126
 msgid "Privacy statement"
-msgstr ""
+msgstr "Pribatutasun politika"
 
 #: www/maposmatic/templates/maposmatic/donate-thanks.html:36
 msgid "Thanks!"
-msgstr ""
+msgstr "Eskerrik asko!"
 
 #: www/maposmatic/templates/maposmatic/donate-thanks.html:39
 msgid "Thanks for your donation!"
-msgstr ""
+msgstr "Eskerrik asko zure dohaintzagatik!"
 
 #: www/maposmatic/templates/maposmatic/donate-thanks.html:42
 msgid ""
 "<i class=\"fas fa-check\"></i> We have received your donation.\n"
 "Thank you for your support to the MapOSMatic project!"
 msgstr ""
+"<i class=\"fas fa-check\"></i>Zure dohaintza jaso dugu.\n"
+"Eskerrik asko MapOSMatic proiektua laguntzeagatik!"
 
 #: www/maposmatic/templates/maposmatic/donate-thanks.html:47
 msgid ""
@@ -570,10 +631,15 @@ msgid ""
 "have\n"
 "not (yet) created a non-profit organization to support the project."
 msgstr ""
+"Zure dohaintzaren inguruko posta elektroniko bat jasoko duzu.\n"
+"Bertan, dohaintza <i>Thomas Petazzonik</i> jaso duela esango du, bera da\n"
+"dohaintzen ardura daraman MapOSMatic-en garatzailea. MapOSMatic lagunarte\n"
+"bat besterik ez da, eta ez dugu irabazi asmorik gabeko elkarterik\n"
+"sortu oraindik."
 
 #: www/maposmatic/templates/maposmatic/donate.html:39
 msgid "Why are donations useful?"
-msgstr ""
+msgstr "Zergatik dira dohaintzak hain erabilgarriak?"
 
 #: www/maposmatic/templates/maposmatic/donate.html:44
 #, python-format
@@ -626,27 +692,31 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:10
 #, python-format
 msgid "%(queued)s job%(qp)s in the rendering queue."
-msgstr ""
+msgstr "%(queued)s lan %(qp)s sorrera-kolan."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:16
 msgid "All systems are operational."
-msgstr ""
+msgstr "Sistema guztiak martxan daude."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:19
 msgid ""
 "Systems are operational but renderings may not reflect the latest available "
 "OpenStreetMap data."
 msgstr ""
+"Sistemak martxan daude, baina mapetan agian ez daude OpenStreetMapek azken "
+"datuak."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:25
 msgid "The rendering daemon is running."
-msgstr ""
+msgstr "Mapa-sortzailea martxan dago."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:29
 msgid ""
 "The rendering daemon is not running: jobs will be queued until the rendering "
 "daemon is back up."
 msgstr ""
+"Mapa-sortzailea geldi dago: lanak kolan geldituko dira mapa-sortzailea "
+"berriz martxan egon arte."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:35
 #, python-format
@@ -654,6 +724,9 @@ msgid ""
 "The GIS database is online and up to date, <span class=\"tooltipped\" data-"
 "original-title=\"%(gis_lastupdate)s\">updated %(date)s ago</span>."
 msgstr ""
+"GIS datu-basea martxan eta eguneratuta dago, <span class=\"tooltipped\" data-"
+"original-title=\"%(gis_lastupdate)s\">orain dela %(date)s eguneratu "
+"da</span>."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:41
 #, python-format
@@ -661,12 +734,15 @@ msgid ""
 "The GIS database is not up to date and was only <span class=\"tooltipped\" "
 "data-original-title=\"%(gis_lastupdate)s\">updated %(date)s ago</span>."
 msgstr ""
+"GIS datu-basea ez dago eguneratuta eta <span class=\"tooltipped\" data-"
+"original-title=\"%(gis_lastupdate)s\">orain dela %(date)s</span> eguneratu "
+"zen."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:45
 msgid ""
 "The GIS database is not available. Renderings cannot be processed at this "
 "time."
-msgstr ""
+msgstr "GIS datu-basea ez dago martxan. Mapak ezin dira sortu."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:52
 #, python-format
@@ -675,6 +751,9 @@ msgid ""
 "\"tooltipped\" data-original-title=\"%(waymarked_lastupdate)s\">updated "
 "%(date)s ago</span>."
 msgstr ""
+"Waymarked ibilbideen datu-basea martxan eta eguneratuta dago, <span class="
+"\"tooltipped\" data-original-title=\"%(waymarked_lastupdate)s\">orain dela "
+"%(date)s eguneratuta</span>."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:57
 #, python-format
@@ -683,16 +762,21 @@ msgid ""
 "\"tooltipped\" data-original-title=\"%(waymarked_lastupdate)s\">updated "
 "%(date)s ago</span>."
 msgstr ""
+"Waymarked ibilbideen datu-basea ez dago eguneratuta eta <span class="
+"\"tooltipped\" data-original-title=\"%(waymarked_lastupdate)s\">orain dela "
+"%(date)s eguneratu zen</span>."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:61
 msgid ""
 "The Waymarked route database is not available. Route overlays cannot be "
 "processed at this time."
 msgstr ""
+"Waymarked ibilbideen datu-basea ez dago martxan. Ibilbideen geruzak ezin "
+"dira prozesatu."
 
 #: www/maposmatic/templates/maposmatic/index.html:38
 msgid "Welcome to"
-msgstr ""
+msgstr "Ongi etorri"
 
 #: www/maposmatic/templates/maposmatic/index.html:43
 msgid ""
@@ -701,6 +785,9 @@ msgid ""
 "data. The generated maps are available in PNG, PDF and SVG formats and are "
 "ready to be printed."
 msgstr ""
+"<a href=\"http://www.openstreetmap.org\">OpenStreetMapeko</a> datuak "
+"erabiliz mapak sortzeko aukera ematen duen zerbitzua da. Mapa hauek PNG, PDF "
+"eta SVG formatuan daude eta berehala inprimatzeko bezalakoak dira."
 
 #: www/maposmatic/templates/maposmatic/index.html:47
 msgid ""
@@ -708,23 +795,26 @@ msgid ""
 "freely reuse, sell, or modify the generated maps under the <a href=\"http://"
 "wiki.openstreetmap.org/wiki/License\">terms of the OpenStreetMap license</a>."
 msgstr ""
+"Mapak sortzeko datuak OpenStreetMapetik datozenez, sortutako mapak nahierara "
+"berrerabili, saldu edo aldatu ditzakezu, <a href=\"http://wiki.openstreetmap."
+"org/wiki/License\">OpenStreetMapen lizentziarekin bat etorriz</a>."
 
 #: www/maposmatic/templates/maposmatic/index.html:51
 msgid "Learn more"
-msgstr ""
+msgstr "Informazioa gehiago"
 
 #: www/maposmatic/templates/maposmatic/index.html:52
 msgid "Create a map &raquo;"
-msgstr ""
+msgstr "Sortu mapa bat &raquo;"
 
 #: www/maposmatic/templates/maposmatic/index.html:69
 msgid "Latest news"
-msgstr ""
+msgstr "Azken berriak"
 
 #: www/maposmatic/templates/maposmatic/index.html:76
 #, python-format
 msgid "published %(date)s ago"
-msgstr ""
+msgstr "Orain dela %(date)s argitaratuta"
 
 #: www/maposmatic/templates/maposmatic/index.html:90
 msgid ""
@@ -732,17 +822,19 @@ msgid ""
 "\">donation</a> page for more information on how donations are processed and "
 "how they help us keep MapOSMatic free (and ad-free!)."
 msgstr ""
+"Zerbitzua hobetzeko dohaintza bat egin dezakezu. Ikusi gure <a href=\"/"
+"donate\">dohaintzen</a> orrialdea informazio gehiago lortzeko."
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:10
 #: www/maposmatic/templates/maposmatic/map-full.html:69
 #: www/maposmatic/templates/maposmatic/maps.html:62
 msgid "City"
-msgstr ""
+msgstr "Hiria"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:13
 #: www/maposmatic/templates/maposmatic/map-full.html:72
 msgid "Bounding box"
-msgstr ""
+msgstr "Muga-kutxa"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:81
@@ -750,282 +842,282 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/new.html:121
 #: www/maposmatic/templates/maposmatic/new.html:247
 msgid "Layout"
-msgstr ""
+msgstr "Maketazioa"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:83
 #: www/maposmatic/templates/maposmatic/maps.html:75
 #: www/maposmatic/templates/maposmatic/new.html:278
 msgid "Stylesheet"
-msgstr ""
+msgstr "Estilo-orria"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:86
 #: www/maposmatic/templates/maposmatic/new.html:131
 #: www/maposmatic/templates/maposmatic/new.html:307
 msgid "Overlays"
-msgstr ""
+msgstr "Geruzak"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:90
 msgid "GPX Track"
-msgstr ""
+msgstr "GPX Arrastoa"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:35
 #: www/maposmatic/templates/maposmatic/map-full.html:94
 msgid "UMAP File"
-msgstr ""
+msgstr "UMAP fitxategia"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:38
 #: www/maposmatic/templates/maposmatic/map-full.html:97
 #: www/maposmatic/templates/maposmatic/maps.html:85
 msgid "Paper format"
-msgstr ""
+msgstr "Paper-formatua"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:40
 #: www/maposmatic/templates/maposmatic/map-full.html:99
 #: www/maposmatic/templates/maposmatic/maps.html:86
 msgid "Map locale"
-msgstr ""
+msgstr "Maparen hitzkuntza"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:48
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:10
 #, python-format
 msgid "Request submitted: %(date)s"
-msgstr ""
+msgstr "Eskaera bidalita: %(date)s"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:52
 #, python-format
 msgid "Rendering started: %(date)s"
-msgstr ""
+msgstr "Mapa sortzen hasi da: %(date)s"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:56
 #, python-format
 msgid "Rendering completed: %(date)s"
-msgstr ""
+msgstr "Mapa sortu da: %(date)s"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:15
 #, python-format
 msgid "Rendering started at %(date)s "
-msgstr ""
+msgstr "Maparen sorreraren hasiera: %(date)s "
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:16
 #: www/maposmatic/templates/maposmatic/maps.html:94
 #: www/maposmatic/templates/maposmatic/maps.html:100
 #, python-format
 msgid "after %(duration)s in the queue"
-msgstr ""
+msgstr "kolan %(duration)s egon ostean"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:22
 #, python-format
 msgid "Rendering completed at %(date)s "
-msgstr ""
+msgstr "Mapa sorrera amaitu da %(date)s "
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:23
 #: www/maposmatic/templates/maposmatic/maps.html:103
 #, python-format
 msgid "after %(duration)s "
-msgstr ""
+msgstr "%(duration)s ostean "
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:29
 #, python-format
 msgid "Rendering cancelled: %(date)s"
-msgstr ""
+msgstr "Maparen sorrera bertan behera utzi da: %(date)s"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:51
 #: www/maposmatic/templates/maposmatic/maps.html:132
 #, python-format
 msgid "Pending, submitted %(date)s ago"
-msgstr ""
+msgstr "Zain, orain dela %(date)s bidalita"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:53
 #: www/maposmatic/templates/maposmatic/maps.html:134
 msgid "Pending..."
-msgstr ""
+msgstr "Zain..."
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:64
 #, python-format
 msgid "Cancel this queued request (position %(pos)s in the queue)"
-msgstr ""
+msgstr "Bertan behera utzi eskaera hau (kolako %(pos)s postuan)"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:65
 msgid "<i class=\"fas fa-times\"></i> Cancel"
-msgstr ""
+msgstr "<i class=\"fas fa-times\"></i>Utzi"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:77
 #: www/maposmatic/templates/maposmatic/maps.html:142
 #, python-format
 msgid "Rendering is in progress, started %(date)s ago"
-msgstr ""
+msgstr "Mapa sortzen ari da, orain dela %(date)s hasita"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:79
 #: www/maposmatic/templates/maposmatic/maps.html:144
 msgid "Rendering..."
-msgstr ""
+msgstr "Sortzen..."
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:87
 #: www/maposmatic/templates/maposmatic/maps.html:193
 msgid "Recreate map"
-msgstr ""
+msgstr "Berriz sortu mapa bat"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:195
 msgid "Recreate"
-msgstr ""
+msgstr "Berriz sortu"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:98
 msgid "Downloads"
-msgstr ""
+msgstr "Deskargak"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:138
 #: www/maposmatic/templates/maposmatic/maps.html:177
 msgid "Something went wrong while processing this job."
-msgstr ""
+msgstr "Errore bat gertatu da lan hau prozesatzean."
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:139
 #: www/maposmatic/templates/maposmatic/maps.html:178
 msgid "Error log"
-msgstr ""
+msgstr "Erroreen erregistroa"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:144
 msgid "The generated files are no longer available."
-msgstr ""
+msgstr "Sortutako fitxategiak ezin dira eskuratu."
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:145
 #: www/maposmatic/templates/maposmatic/maps.html:151
 #: www/maposmatic/templates/maposmatic/maps.html:184
 msgid "Download"
-msgstr ""
+msgstr "Deskargatu"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:152
 #, python-format
 msgid "Updating in <span>%(refresh)s</span>s..."
-msgstr ""
+msgstr "<span>%(refresh)s</span> segundotan eguneratzen..."
 
 #: www/maposmatic/templates/maposmatic/map-full.html:43
 msgid "Updating now..."
-msgstr ""
+msgstr "Orain eguneratzen..."
 
 #: www/maposmatic/templates/maposmatic/map-full.html:56
 msgid "Rendering status"
-msgstr ""
+msgstr "Sorreraren egoera"
 
 #: www/maposmatic/templates/maposmatic/map-full.html:63
 msgid "Map details"
-msgstr ""
+msgstr "Maparen xehetasunak"
 
 #: www/maposmatic/templates/maposmatic/map-full.html:107
 msgid "Map preview"
-msgstr ""
+msgstr "Maparen aurrebista"
 
 #: www/maposmatic/templates/maposmatic/maps.html:53
 msgid "(*** untitled map ***)"
-msgstr ""
+msgstr "(*** izenburu gabeko mapa ***)"
 
 #: www/maposmatic/templates/maposmatic/maps.html:65
 msgid "Bounding Box"
-msgstr ""
+msgstr "Muga-kutxa"
 
 #: www/maposmatic/templates/maposmatic/maps.html:77
 msgid "Overlay(s)"
-msgstr ""
+msgstr "Geruza(k)"
 
 #: www/maposmatic/templates/maposmatic/maps.html:80
 msgid "GPX track"
-msgstr ""
+msgstr "GPX arrastoa"
 
 #: www/maposmatic/templates/maposmatic/maps.html:83
 msgid "UMAP file"
-msgstr ""
+msgstr "UMAP fitxategia"
 
 #: www/maposmatic/templates/maposmatic/maps.html:89
 msgid "Request submitted"
-msgstr ""
+msgstr "Eskaera ondo bidali da"
 
 #: www/maposmatic/templates/maposmatic/maps.html:94
 #: www/maposmatic/templates/maposmatic/maps.html:100
 msgid "Rendering started"
-msgstr ""
+msgstr "Sorrera hasi da"
 
 #: www/maposmatic/templates/maposmatic/maps.html:103
 msgid "Rendering completed"
-msgstr ""
+msgstr "Sorrera amaitu da"
 
 #: www/maposmatic/templates/maposmatic/maps.html:109
 msgid "Rendering cancelled"
-msgstr ""
+msgstr "Sorrera bertan behera utzi da"
 
 #: www/maposmatic/templates/maposmatic/maps.html:156
 msgid "Download other formats and map indeces"
-msgstr ""
+msgstr "Deskargatu beste formatu eta mapa-indize batzuk"
 
 #: www/maposmatic/templates/maposmatic/maps.html:161
 msgid "map"
-msgstr ""
+msgstr "Mapa"
 
 #: www/maposmatic/templates/maposmatic/maps.html:166
 msgid "index"
-msgstr ""
+msgstr "Indizea"
 
 #: www/maposmatic/templates/maposmatic/maps.html:207
 msgid "Our database does not contain any rendered maps for the moment."
-msgstr ""
+msgstr "Gure datu-basean ez dago sortutako maparik."
 
 #: www/maposmatic/templates/maposmatic/maps.html:209
 msgid "No map matches your query."
-msgstr ""
+msgstr "Mapa bat ere ez dator zure kontsultarekin bat."
 
 #: www/maposmatic/templates/maposmatic/maps.html:209
 msgid "Create a new map!"
-msgstr ""
+msgstr "Sortu mapa berria!"
 
 #: www/maposmatic/templates/maposmatic/new.html:103
 msgid "Generate your own map"
-msgstr ""
+msgstr "Sortu zure mapa"
 
 #: www/maposmatic/templates/maposmatic/new.html:109
 msgid "Back"
-msgstr ""
+msgstr "Atzera"
 
 #: www/maposmatic/templates/maposmatic/new.html:116
 msgid "Map area"
-msgstr ""
+msgstr "Maparen ingurunea"
 
 #: www/maposmatic/templates/maposmatic/new.html:126
 msgid "Style"
-msgstr ""
+msgstr "Estiloa"
 
 #: www/maposmatic/templates/maposmatic/new.html:136
 msgid "Paper"
-msgstr ""
+msgstr "Papera"
 
 #: www/maposmatic/templates/maposmatic/new.html:141
 msgid "Submit"
-msgstr ""
+msgstr "Bidali"
 
 #: www/maposmatic/templates/maposmatic/new.html:146
 msgid "Next"
-msgstr ""
+msgstr "Hurrengoa"
 
 #: www/maposmatic/templates/maposmatic/new.html:148
 msgid "Generate"
-msgstr ""
+msgstr "Sortu"
 
 #: www/maposmatic/templates/maposmatic/new.html:162
 msgid "Geographic area"
-msgstr ""
+msgstr "Ingurune geografikoa"
 
 #: www/maposmatic/templates/maposmatic/new.html:165
 msgid "City search"
-msgstr ""
+msgstr "Hiria bilatu"
 
 #: www/maposmatic/templates/maposmatic/new.html:168
 msgid "File upload"
-msgstr ""
+msgstr "Fitxategia kargatu"
 
 #: www/maposmatic/templates/maposmatic/new.html:195
 msgid "Upload files"
-msgstr ""
+msgstr "Fitxategiak kargatu"
 
 #: www/maposmatic/templates/maposmatic/new.html:204
 msgid ""
@@ -1033,6 +1125,9 @@ msgid ""
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
+"Kargatu GPX, Umap edo GeoJSON fitxtegiak.<br/>Fitxategi bat baino gehiago "
+"ere aukeratu dezakezu. Fitxategiak aukeratzeko leihoa berriz irekitzen "
+"baduzu, aurrez aukeratutakoak galdu egingo dituzu."
 
 #: www/maposmatic/templates/maposmatic/new.html:216
 msgid ""
@@ -1040,10 +1135,13 @@ msgid ""
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
+"<b>Oharra:</b> Kargatutako fitxategiak edonorentzat deskargatzeko moduan "
+"egongo dira, fitxategi hau erabiliz sortutako mapa <b>publikoa izango "
+"da</b>.<br/><b>Ez</b> kargatu publikoa izan nahi ez duzun fitxategirik."
 
 #: www/maposmatic/templates/maposmatic/new.html:228
 msgid "Geographic area selection"
-msgstr ""
+msgstr "Aukeratu ingurune geografikoa"
 
 #: www/maposmatic/templates/maposmatic/new.html:230
 msgid ""
@@ -1053,10 +1151,14 @@ msgid ""
 "select the <em>Geographic area</em> tab and use the mini-map to set the "
 "limits of the rendered area."
 msgstr ""
+"Aukeratu sortu nahi duzun ingurua. Idazten hasten zarenean aholkuak agertuko "
+"zaizkizu. Bila ari zaren tokia ez baduzu aurkitzen edo ingurua eskuz "
+"aukeratu nahi baduzu aukeratu <em>Inguru geografikoa</em> fitxa eta erabili "
+"mapa txikia ingurua aukeratzeko."
 
 #: www/maposmatic/templates/maposmatic/new.html:259
 msgid "Map layout"
-msgstr ""
+msgstr "Maparen formatua"
 
 #: www/maposmatic/templates/maposmatic/new.html:261
 msgid ""
@@ -1064,20 +1166,25 @@ msgid ""
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
+"Maparen formatuak, mapa eta indizea nola agertzen diren ezartzen du. "
+"<em>Orrialde anitzeko formatuak</em> inprimatu eta grapatzeko egokia den "
+"formatua sortzen du."
 
 #: www/maposmatic/templates/maposmatic/new.html:290
 msgid "Map stylesheet"
-msgstr ""
+msgstr "Maparen estilo-orria"
 
 #: www/maposmatic/templates/maposmatic/new.html:292
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
+"Maparen estilo-orriak maparen itxura zehazten du. Estilo-orriak mapan "
+"ikusiko diren xehetasunak zehazten ditu."
 
 #: www/maposmatic/templates/maposmatic/new.html:319
 msgid "Map overlays"
-msgstr ""
+msgstr "Maparen geruzak"
 
 #: www/maposmatic/templates/maposmatic/new.html:321
 msgid ""
@@ -1085,99 +1192,105 @@ msgid ""
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
+"Geruzetan aukeratutako maparen gainean informazio gehigarria zehazten da. "
+"Hainbat geruza aukeratu ditzakezu horrela informazio gehiago edukitzeko."
 
 #: www/maposmatic/templates/maposmatic/new.html:337
 msgid "Paper size"
-msgstr ""
+msgstr "Paperaren tamaina"
 
 #: www/maposmatic/templates/maposmatic/new.html:337
 msgid "(width x height)"
-msgstr ""
+msgstr "(zabalera x altuera)"
 
 #: www/maposmatic/templates/maposmatic/new.html:370
 msgid "An error occured while retrieving compatible paper sizes."
-msgstr ""
+msgstr "Errore bat gertatu da paper tamainak lortzean."
 
 #: www/maposmatic/templates/maposmatic/new.html:379
 msgid "Calculating available paper formats for your map..."
-msgstr ""
+msgstr "Zure maparentzat eskuragarri dauden paper formatuak kalkulatzen..."
 
 #: www/maposmatic/templates/maposmatic/new.html:387
 msgid "Paper format and size"
-msgstr ""
+msgstr "Paperaren formatu eta tamaina"
 
 #: www/maposmatic/templates/maposmatic/new.html:389
 msgid "Select the desired format, size and orientation for your map."
-msgstr ""
+msgstr "Aukeratu maparen formatu, tamaina eta paperaren orientazioa."
 
 #: www/maposmatic/templates/maposmatic/new.html:392
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
+"Aukeratutako tamaina estandarrak aukeratu ditzakezu, mapako inguru onenaren "
+"zatia, edo zuk nahi duzun tamaina ere aukeratu dezakezu."
 
 #: www/maposmatic/templates/maposmatic/new.html:408
 msgid "Map title"
-msgstr ""
+msgstr "Maparen izenburua"
 
 #: www/maposmatic/templates/maposmatic/new.html:414
 msgid "Locale"
-msgstr ""
+msgstr "Hizkuntza"
 
 #: www/maposmatic/templates/maposmatic/new.html:433
 msgid "Your Email address (for notifications, optional)"
-msgstr ""
+msgstr "Zure posta elektronikoa (jakinarazpenak bidaltzeko, hautazkoa)"
 
 #: www/maposmatic/templates/maposmatic/new.html:436
 msgid "will be deleted after"
-msgstr ""
+msgstr "denbora honen ostean ezabatuko da"
 
 #: www/maposmatic/templates/maposmatic/new.html:436
 msgid "hours"
-msgstr ""
+msgstr "ordu"
 
 #: www/maposmatic/templates/maposmatic/new.html:445
 msgid "Summary"
-msgstr ""
+msgstr "Laburpena"
 
 #: www/maposmatic/templates/maposmatic/new.html:448
 msgid "Location:"
-msgstr ""
+msgstr "Kokalekua:"
 
 #: www/maposmatic/templates/maposmatic/new.html:449
 msgid "Layout:"
-msgstr ""
+msgstr "Itxura:"
 
 #: www/maposmatic/templates/maposmatic/new.html:450
 msgid "Stylesheet:"
-msgstr ""
+msgstr "Estilo-orriak:"
 
 #: www/maposmatic/templates/maposmatic/new.html:451
 msgid "Overlay:"
-msgstr ""
+msgstr "Geruza:"
 
 #: www/maposmatic/templates/maposmatic/new.html:452
 msgid "Paper format:"
-msgstr ""
+msgstr "Paperaren formatua:"
 
 #: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Almost there!"
-msgstr ""
+msgstr "Ia prest!"
 
 #: www/maposmatic/templates/maposmatic/new.html:463
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
 msgstr ""
+"Maparen sorkuntza eskatzeko prest zaude! Aukeratu maparen hizkuntza, ezarri "
+"izenburua eta hasi!"
 
 #: www/maposmatic/templates/maposmatic/privacy.html:33
 #: www/maposmatic/templates/maposmatic/privacy.html:36
 msgid "Privacy Statement"
-msgstr ""
+msgstr "Pribatutasun adierazpena"
 
 #: www/maposmatic/templates/maposmatic/privacy.html:38
 msgid "Encryption"
-msgstr ""
+msgstr "Zifratzea"
 
 #: www/maposmatic/templates/maposmatic/privacy.html:41
 msgid ""
@@ -1254,6 +1367,11 @@ msgid ""
 "  be stored\n"
 "  "
 msgstr ""
+"\n"
+"  Jakinarazpenerako posta elektronikoko helbidea ematen baduzu\n"
+"zure eskaera osatzen denean mezua bidaliko dizugu, helbide hau\n"
+"gorde egingo da\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:96
 #, python-format
@@ -1262,6 +1380,9 @@ msgid ""
 "    for %(SUBMITTER_MAIL_LIFETIME)s hours.\n"
 "    "
 msgstr ""
+"\n"
+"    %(SUBMITTER_MAIL_LIFETIME)s orduan\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:100
 msgid ""
@@ -1269,6 +1390,9 @@ msgid ""
 "    until removed manually.\n"
 "    "
 msgstr ""
+"\n"
+"    eskuz ezabatu arte.\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:109
 msgid ""
diff --git a/www/locale/fa/LC_MESSAGES/django.po b/www/locale/fa/LC_MESSAGES/django.po
index 06efd0f2..34f261b9 100644
--- a/www/locale/fa/LC_MESSAGES/django.po
+++ b/www/locale/fa/LC_MESSAGES/django.po
@@ -1847,7 +1847,7 @@ msgstr "ساخت نقشه موفقیت‌آمیز بود."
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
-"ساخت نقشه ناموفق بود! لطفاً برای اطلاعات بیشتر با hartmut@php.net تماس بگیرید."
+"ساخت نقشه ناموفق بود! لطفاً برای اطلاعات بیشتر با %(email)s تماس بگیرید."
 
 #: www/maposmatic/templatetags/extratags.py:51
 #, fuzzy
diff --git a/www/locale/fi_FI/LC_MESSAGES/django.po b/www/locale/fi_FI/LC_MESSAGES/django.po
index d2da16fa..0fd83611 100644
--- a/www/locale/fi_FI/LC_MESSAGES/django.po
+++ b/www/locale/fi_FI/LC_MESSAGES/django.po
@@ -1630,7 +1630,7 @@ msgstr "Renderointi onnistui."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
 "Renderointi epäonnistui! Lisätietoja varten ota yhteys osoitteeseen "
-"hartmut@php.net ."
+"%(email)s."
 
 #: www/maposmatic/templatetags/extratags.py:51
 #, fuzzy
diff --git a/www/locale/fr/LC_MESSAGES/django.po b/www/locale/fr/LC_MESSAGES/django.po
index e158cf90..60296104 100644
--- a/www/locale/fr/LC_MESSAGES/django.po
+++ b/www/locale/fr/LC_MESSAGES/django.po
@@ -6,21 +6,22 @@
 # Jeroen van Rijn <jvrnix@gmail.com>, 2013
 # Maxime Petazzoni <maxime.petazzoni@bulix.org>, 2013
 # nom complet <weblate.sanspourriel@spamgourmet.com>, 2019.
+# Loïc LE METAYER <loic.lemetayer@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-06-13 14:34+0200\n"
-"PO-Revision-Date: 2019-04-20 21:05+0000\n"
-"Last-Translator: nom complet <weblate.sanspourriel@spamgourmet.com>\n"
-"Language-Team: French <http://translate.get-map.org/projects/maposmatic/"
+"PO-Revision-Date: 2021-11-06 02:59+0000\n"
+"Last-Translator: Loïc LE METAYER <loic.lemetayer@gmail.com>\n"
+"Language-Team: French <https://translate.get-map.org/projects/maposmatic/"
 "maposmatic/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.5.1\n"
+"X-Generator: Weblate 4.6.2\n"
 
 #: www/maposmatic/feeds.py:45
 msgid "maps"
@@ -63,10 +64,10 @@ msgid "Full-page layout with the street index at the bottom"
 msgstr "Disposition pleine page avec index des rues en dessous"
 
 #: www/maposmatic/forms.py:112
-#, fuzzy
-#| msgid "Full-page layout with the street index on the side"
 msgid "Full-page layout with the street index on extra page (PDF only)"
-msgstr "Disposition pleine page avec l'index des rues sur le coté"
+msgstr ""
+"Disposition pleine page avec l'index des rues sur une page dédiée ("
+"uniquement en PDF)"
 
 #: www/maposmatic/forms.py:114
 msgid "Multi-page layout"
@@ -455,18 +456,17 @@ msgid "Contributors"
 msgstr "Contributeurs"
 
 #: www/maposmatic/templates/maposmatic/about.html:200
-#, fuzzy
-#| msgid "Core team"
 msgid "Current team"
-msgstr "Équipe principale"
+msgstr "Équipe actuelle"
 
 #: www/maposmatic/templates/maposmatic/about.html:203
 msgid "Developer, running instance on https://print.get-map-org/"
 msgstr ""
+"Développeur, possède une instance accessible sur https://print.get-map-org/"
 
 #: www/maposmatic/templates/maposmatic/about.html:208
 msgid "Original team"
-msgstr ""
+msgstr "Équipe originelle"
 
 #: www/maposmatic/templates/maposmatic/about.html:211
 #: www/maposmatic/templates/maposmatic/about.html:212
@@ -640,7 +640,7 @@ msgstr ""
 
 #: www/maposmatic/templates/maposmatic/base.html:126
 msgid "Privacy statement"
-msgstr ""
+msgstr "Déclaration de confidentialité"
 
 #: www/maposmatic/templates/maposmatic/donate-thanks.html:36
 msgid "Thanks!"
@@ -651,16 +651,12 @@ msgid "Thanks for your donation!"
 msgstr "Merci pour votre don !"
 
 #: www/maposmatic/templates/maposmatic/donate-thanks.html:42
-#, fuzzy
-#| msgid ""
-#| "<i class=\"fa fa-check\"></i> We have received your donation.\n"
-#| "Thank you for your support to the MapOSMatic project!"
 msgid ""
 "<i class=\"fas fa-check\"></i> We have received your donation.\n"
 "Thank you for your support to the MapOSMatic project!"
 msgstr ""
-"<i class=\"fa-fa-check\"></i> Nous avons bien reçu votre don, merci pour "
-"votre soutien au projet MapOSMatic !"
+"<i class=\"fas fa-check\"></i> Nous avons bien reçu votre don.\n"
+"Merci pour votre soutien au projet MapOSMatic !"
 
 #: www/maposmatic/templates/maposmatic/donate-thanks.html:47
 msgid ""
@@ -1002,10 +998,8 @@ msgid "Cancel this queued request (position %(pos)s in the queue)"
 msgstr "Annuler cette requête (position %(pos)s dans la file d'attente)"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:65
-#, fuzzy
-#| msgid "<i class=\"fa fa-times\"></i> Cancel"
 msgid "<i class=\"fas fa-times\"></i> Cancel"
-msgstr "<i class=\"fa fa-times\"></i> Annuler"
+msgstr "<i class=\"fas fa-times\"></i> Annuler"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:77
 #: www/maposmatic/templates/maposmatic/maps.html:142
@@ -1063,7 +1057,7 @@ msgstr "Mise à jour en cours ..."
 
 #: www/maposmatic/templates/maposmatic/map-full.html:56
 msgid "Rendering status"
-msgstr "Status du rendu"
+msgstr "Statut du rendu"
 
 #: www/maposmatic/templates/maposmatic/map-full.html:63
 msgid "Map details"
@@ -1176,13 +1170,11 @@ msgstr "Recherche par ville"
 
 #: www/maposmatic/templates/maposmatic/new.html:168
 msgid "File upload"
-msgstr ""
+msgstr "Importer un fichier"
 
 #: www/maposmatic/templates/maposmatic/new.html:195
-#, fuzzy
-#| msgid "Umap data file"
 msgid "Upload files"
-msgstr "fichier de données Umap"
+msgstr "Import de fichiers"
 
 #: www/maposmatic/templates/maposmatic/new.html:204
 msgid ""
@@ -1190,21 +1182,19 @@ msgid ""
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
+"Importer ici un fichier au format GPX, Umap, ou GeoJSON. <br/>Vous pouvez "
+"sélectionner plusieurs fichiers simultanément. La réouverture de la fenêtre "
+"de sélection remplacera la liste précédemment sélectionnée."
 
 #: www/maposmatic/templates/maposmatic/new.html:216
-#, fuzzy
-#| msgid ""
-#| "<b>Note:</b> The uploaded file will not be made available to anyone, the "
-#| "map created using this file <b>will be publicly visible</b> though.<br/"
-#| ">Do <b>NOT</b> upload any data you don't want to be publicly visible."
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
-"<b>Note :</b> Le fichier téléversé ne sera pas visible de tous. <b>Mais</b> "
-"la carte utilisant ce fichier le sera .<br/><b>NE</b> téléversez <b>PAS</b> "
-"de données si vous ne voulez pas qu'elles soient visibles de tous."
+"<b>Note :</b> Les fichiers téléversés ne seront pas visible de tous. "
+"<b>Mais</b> la carte utilisant ce fichier le sera.<br/><b>NE</b> téléversez "
+"<b>PAS</b> de données si vous ne voulez pas qu'elles soient visibles de tous."
 
 #: www/maposmatic/templates/maposmatic/new.html:228
 msgid "Geographic area selection"
@@ -1272,7 +1262,7 @@ msgstr "Taille du papier"
 
 #: www/maposmatic/templates/maposmatic/new.html:337
 msgid "(width x height)"
-msgstr ""
+msgstr "(largeur × hauteur)"
 
 #: www/maposmatic/templates/maposmatic/new.html:370
 msgid "An error occured while retrieving compatible paper sizes."
@@ -1291,7 +1281,7 @@ msgstr "Format et taille du papier"
 #: www/maposmatic/templates/maposmatic/new.html:389
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
-"Selectionnez le format, la taille et l'orientation de papier désirée pour "
+"Sélectionnez le format, la taille et l'orientation de papier désirée pour "
 "votre carte."
 
 #: www/maposmatic/templates/maposmatic/new.html:392
@@ -1299,6 +1289,9 @@ msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
+"Vous pouvez choisir parmi les tailles standards suggérées, la taille \"la "
+"plus adaptée\" à la zone de carte sélectionnée, ou spécifier la hauteur et "
+"la largeur de votre choix."
 
 #: www/maposmatic/templates/maposmatic/new.html:408
 msgid "Map title"
@@ -1313,14 +1306,12 @@ msgid "Your Email address (for notifications, optional)"
 msgstr "Votre adresse mail (pour les notifications, facultatif)"
 
 #: www/maposmatic/templates/maposmatic/new.html:436
-#, fuzzy
-#| msgid "Clear selected area"
 msgid "will be deleted after"
-msgstr "Enlever la zone sélectionée"
+msgstr "sera supprimée après"
 
 #: www/maposmatic/templates/maposmatic/new.html:436
 msgid "hours"
-msgstr ""
+msgstr "heure(s)"
 
 #: www/maposmatic/templates/maposmatic/new.html:445
 msgid "Summary"
@@ -1362,11 +1353,11 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/privacy.html:33
 #: www/maposmatic/templates/maposmatic/privacy.html:36
 msgid "Privacy Statement"
-msgstr ""
+msgstr "Déclaration de confidentialité"
 
 #: www/maposmatic/templates/maposmatic/privacy.html:38
 msgid "Encryption"
-msgstr ""
+msgstr "Chiffrement"
 
 #: www/maposmatic/templates/maposmatic/privacy.html:41
 msgid ""
@@ -1375,6 +1366,10 @@ msgid ""
 "  provided by <a href=\"https://letsencrypt.org/\">LetsEncrypt</a>.\n"
 "  "
 msgstr ""
+"\n"
+"  L'intégralité du trafic web est chiffré par des certificates TLS/SSL\n"
+"  fournis de <a href=\"https://letsencrypt.org/\">LetsEncrypt</a>.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:48
 msgid ""
@@ -1384,6 +1379,12 @@ msgid ""
 "  URL counterparts.\n"
 "  "
 msgstr ""
+"\n"
+"  Les tentatives d'accès au site par des URLs en <tt>http:</tt> non-"
+"chiffrées \n"
+"   seront redirigées automatiquement vers les URLs en <tt>https:</tt> \n"
+"chiffrées correspondantes.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:58
 msgid ""
@@ -1398,6 +1399,18 @@ msgid ""
 "  additional access logs will be removed again within 24 hours.\n"
 "  "
 msgstr ""
+"\n"
+"  Le serveur web ne consigne dans son journal que la date et l'heure, l'URL "
+"demandée et le statut HTTP, \n"
+"  il n'enregistre ni l'adresse IP, la valeur de l'<em>user agent</em> ou "
+"l'URL de provenance (<em>referer</em>).\n"
+"  C'est champs additionnels peuvent toutefois être enregistrés dans les "
+"journaux quand \n"
+"  l'analyse des problèmes le requiert to analyze problems (bien que cela "
+"n'ait jamais été nécessaire jusqu'à présent),\n"
+"  mais alors ces journaux d'accès supplémentaires seraient supprimés dans "
+"les 24 heures.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:68
 msgid ""
@@ -1405,6 +1418,9 @@ msgid ""
 "  When submitting an actual map rendering job, your IP address will\n"
 "  "
 msgstr ""
+"\n"
+"  Lorsque vous soumettez une tâche de rendu de carte, votre adresse IP\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:72
 msgid ""
@@ -1412,6 +1428,9 @@ msgid ""
 "    be stored until removed manually\n"
 "    "
 msgstr ""
+"\n"
+"    sera stocker jusqu'à sa suppression manuelle\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:76
 msgid ""
@@ -1419,6 +1438,9 @@ msgid ""
 "    not be stored\n"
 "    "
 msgstr ""
+"\n"
+"    ne sera pas stockée\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:80
 #, python-format
@@ -1427,6 +1449,9 @@ msgid ""
 "    stored for %(SUBMITTER_IP_LIFETIME)s hours\n"
 "    "
 msgstr ""
+"\n"
+"    sera stockée pour une durée de %(SUBMITTER_IP_LIFETIME)s heures\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:84
 msgid ""
@@ -1434,6 +1459,9 @@ msgid ""
 "  along with the actual map request.\n"
 "  "
 msgstr ""
+"\n"
+"  en même temps que la requête de génération de carte.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:90
 msgid ""
@@ -1443,6 +1471,12 @@ msgid ""
 "  be stored\n"
 "  "
 msgstr ""
+"\n"
+"  Si vous choisissez de fournir une adresse email pour être notifié quand\n"
+"  le traitement de votre requête sera terminé, alors cette adresse email "
+"sera\n"
+"  enregistrée\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:96
 #, python-format
@@ -1451,6 +1485,9 @@ msgid ""
 "    for %(SUBMITTER_MAIL_LIFETIME)s hours.\n"
 "    "
 msgstr ""
+"\n"
+"    pour une durée de %(SUBMITTER_MAIL_LIFETIME)s heures.\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:100
 msgid ""
@@ -1458,6 +1495,9 @@ msgid ""
 "    until removed manually.\n"
 "    "
 msgstr ""
+"\n"
+"    jusqu'à sa suppression manuelle.\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:109
 msgid ""
@@ -1466,6 +1506,11 @@ msgid ""
 "    (formerly known as Piwik) for analytics.\n"
 "    "
 msgstr ""
+"\n"
+"    Ce site utilise <a href=\"https://matomo.org/\">Matomo</a>\n"
+"    (auparavant nommé Piwik) pour l'analyse des données (<em>analytics</em>)."
+"\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:116
 msgid ""
@@ -1474,6 +1519,11 @@ msgid ""
 "  nor by use of any external tracking services.\n"
 "  "
 msgstr ""
+"\n"
+"  Ce site ne procède d'aucune manière au suivi des utilisateurs, ni de lui-"
+"même,\n"
+"  ni en recourant à un service de suivi externe.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:126
 msgid ""
@@ -1481,6 +1531,10 @@ msgid ""
 "  This site may use up to three cookies to store information about you:\n"
 "  "
 msgstr ""
+"\n"
+"  Ce site peut utiliser jusqu'à trois cookies pour stocker les informations "
+"vous concernant :\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:135
 msgid ""
@@ -1493,6 +1547,15 @@ msgid ""
 "      ten years.\n"
 "      "
 msgstr ""
+"\n"
+"      Ces cookies sont créés dès que vous cliquez sur \n"
+"      <span class=\"badge badge-success\">Accepter</span>\n"
+"      dans le message d'avertissement sur l'utilisation des cookies. Après "
+"cela, vous ne verrez plus\n"
+"      cette avertissement dans ce navigateur web jusqu'à\n"
+"      ce que les cookies soient supprimés par vous, ou expirent après\n"
+"      dix ans.\n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:145
 msgid ""
@@ -1501,6 +1564,10 @@ msgid ""
 "      remember your acceptance.\n"
 "      "
 msgstr ""
+"\n"
+"      Le cookie ne contient qu'une donnée statique de valeur \"1\" pour\n"
+"      se souvenir de votre consentement.\n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:151
 msgid ""
@@ -1512,6 +1579,13 @@ msgid ""
 "      screen space taken.\n"
 "      "
 msgstr ""
+"\n"
+"      Si vous n'acceptez pas l'utilisation de ce cookie\n"
+"      le message d'avertissement apparaîtra à chaque chargement\n"
+"      d'une page sur le site, mais ne devrait cependant pas\n"
+"      affecter les fonctionnalités du site, en dehors de\n"
+"      l'espace utilisé à l'écran pour afficher l'avertissement.\n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:162
 msgid ""
@@ -1521,6 +1595,11 @@ msgid ""
 "      side.\n"
 "      "
 msgstr ""
+"\n"
+"      Ce cookie est utilisé pour lier la session de votre navigateur web à\n"
+"      certaines informations propres à la session et stockées côté\n"
+"      serveur.\n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:169
 msgid ""
@@ -1533,6 +1612,17 @@ msgid ""
 "      a map.\n"
 "      "
 msgstr ""
+"\n"
+"      Jusqu'à présent nous n'utilisons les sessions que pour stocker et "
+"mémoriser\n"
+"      certains choix que vous avez fait dans le formulaire \n"
+"      <span class=\"badge badge-success\">Créer une carte</span>\n"
+"      , pour que nous puissions pré-sélectionner ou pré-remplir les "
+"éléments\n"
+"      du formulaire en accord avec vos choix lors de votre prochaine "
+"utilisation du formulaire pour créer\n"
+"      une carte.\n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:179
 msgid ""
@@ -1546,6 +1636,15 @@ msgid ""
 "      form.      \n"
 "      "
 msgstr ""
+"\n"
+"      Les informations stockées en session ne sont donc là que\n"
+"      pour votre confort d'utilisation, elles ne sont pas tracées\n"
+"      d'aucune manière, et elles n'incluent pas de données personnelles\n"
+"      vous concernant, et ces informations seront supprimées\n"
+"      complètement deux semaines après votre dernier avez au formulaire\n"
+"      <span class=\"badge badge-success\">Créer une carte</span>\n"
+"      .      \n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:190
 msgid ""
@@ -1555,6 +1654,11 @@ msgid ""
 "      the form prefill convenice.\n"
 "      "
 msgstr ""
+"\n"
+"      Si vous décidez de ne pas accepter ce cookie, les fonctionnalités\n"
+"      de ce site ne sont pas affectées, vous perdrez juste la commodité\n"
+"      de pré-remplissage du formulaire.\n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:200
 msgid ""
@@ -1564,6 +1668,12 @@ msgid ""
 "      <span class=\"badge badge-success\">Create Map</span> form.\n"
 "      "
 msgstr ""
+"\n"
+"      Ce cookie peut être défini par le serveur de tuiles OpenStreetMap\n"
+"      qui fourni les tuiles utilisées dans la carte interactive du "
+"formulaire\n"
+"      <span class=\"badge badge-success\">Créer une carte</span>.\n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:207
 msgid ""
@@ -1576,6 +1686,15 @@ msgid ""
 "      and so can improve tile access performance. \n"
 "      "
 msgstr ""
+"\n"
+"      Ce cookie stocke\n"
+"      <a href=\"https://operations.osmfoundation.org/2017/01/31/january."
+"html\"\n"
+"\t >un jeton de mot de passe unique basé sur le temps\n"
+"      qui peut être vérifier par les serveurs de cache de tuiles "
+"OpenStreetMap</a>\n"
+"      et qui peut améliorer les performances d'accès aux tuiles. \n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:216
 msgid ""
@@ -1584,6 +1703,10 @@ msgid ""
 "      OpenStreetMap to perform tracking of any kind.\n"
 "      "
 msgstr ""
+"\n"
+"      À notre connaissance, ce cookie n'est pas utilisé par\n"
+"      OpenStreetMap pour effectuer un suivi de quelque manière que ce soit.\n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:222
 msgid ""
@@ -1594,6 +1717,13 @@ msgid ""
 "      any way.\n"
 "      "
 msgstr ""
+"\n"
+"      Si vous refusez ce cookie les tuiles\n"
+"      de la carte interactive peuvent charger plus lentement, mais "
+"autrement\n"
+"      les fonctionnalités de notre site ne sont pas limitées\n"
+"      d'aucune manière.\n"
+"      "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:235
 msgid ""
@@ -1604,6 +1734,13 @@ msgid ""
 "  service, with one exception:\n"
 "  "
 msgstr ""
+"\n"
+"  Toutes les images, les feuilles de style, les polices et l'ensemble du "
+"code JavaScript\n"
+"  sont stockés localement sur ce serveur. Il n'y a pas de\n"
+"   requêtes vers d'autres sites web lors de l'accès à ce \n"
+"  service, avec une unique exception :\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:244
 msgid ""
@@ -1616,6 +1753,15 @@ msgid ""
 "  subdomain by your browser directly.\n"
 "  "
 msgstr ""
+"\n"
+"  Le site utilise les tuiles de carte fournies par OpenStreetMap visible "
+"dans la \n"
+"  carte interactive du formulaire\n"
+"  <span class=\"badge badge-success\">Créer une carte</span>\n"
+"  . Elles sont chargées depuis les serveurs de tuiles d'OpenStreetMap\n"
+"  du sous-domaine <tt>tiles.openstreetmap.org</tt>\n"
+"  par votre navigateur directement.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:255
 msgid ""
@@ -1628,6 +1774,15 @@ msgid ""
 "  map tile images.\n"
 "  "
 msgstr ""
+"\n"
+"  Merci de consulter\n"
+"  <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy#"
+"Where_do_we_store_the_data\"\n"
+"  >la Politique de Confidentialité de la Fondation OpenStreetMap (en "
+"anglais)</a>\n"
+"  pour connaître les détails relatifs à l'accès de ces \n"
+"images de tuiles de carte.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:267
 msgid ""
@@ -1637,6 +1792,13 @@ msgid ""
 "  incorporate information stored in them into generated maps.\n"
 "  "
 msgstr ""
+"\n"
+"  Le site vous permet de téléverser des pistes GPX, ou des fichiers Geo JSON "
+"et des exports de carte\n"
+"  <a href=\"umap.openstreetmap.fr\">Umap</a> pour\n"
+"  incorporer des informations stockées dans ces fichiers au sein des cartes "
+"générées.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:275
 msgid ""
@@ -1648,6 +1810,17 @@ msgid ""
 "  for privacy, security, copyright, or other legal reasons.\n"
 "  "
 msgstr ""
+"\n"
+"  Veuillez noter que toutes les cartes générées par ce service sont "
+"visibles\n"
+"  publiquement, <strong>NE</strong> téléversez donc <strong>PAS</strong> de "
+"fichiers\n"
+"  qui contiendraient des informations qui ne devraient pas être vues par "
+"tous, \n"
+"  que ce soit pour des raisons\n"
+"  d'atteinte de la vie privée, de sécurité, de droits d'auteurs ou d'autres "
+"raisons juridiques.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:285
 #, python-format
@@ -1660,6 +1833,14 @@ msgid ""
 "  uploaded file and the date it was uploaded to this site.\n"
 "  "
 msgstr ""
+"\n"
+"  Si vous avez téléversez par accident un tel fichier, veuillez contacter "
+"par email \n"
+"  %(CONTACT_EMAIL)s et demander la suppression du fichier\n"
+"  téléversé ainsi que la carte générée associée. Fournissez soit\n"
+"  l'URL de la page de la carte générée, ou le nom du fichier\n"
+"  téléversé ainsi que la date d'envoi sur le site.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:297
 msgid ""
@@ -1671,6 +1852,13 @@ msgid ""
 "  at any time. \n"
 "  "
 msgstr ""
+"\n"
+"  Les cartes générées sont stockées sur le serveur un certain temps\n"
+"  avant d'être supprimées afin de libérer de l'espace de stockage.\n"
+"  Les données et options de la tâche de rendu de la carte sont\n"
+"  cependant conservées, permettant ainsi de regénérer les cartes\n"
+"  à tout moment. \n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:307
 #, python-format
@@ -1682,6 +1870,12 @@ msgid ""
 "  of the rendering job you want to have removed.\n"
 "  "
 msgstr ""
+"\n"
+"  Si vous estimez qu'une tâche de rendu doit être supprimé\n"
+"  complètement pour quelques raisons qu'il soit, veuillez informer\n"
+"  %(CONTACT_EMAIL)s par email et fournir l'URL\n"
+"  de la tâche de rendu que vous souhaiteriez supprimer.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/suggest.js:41
 msgid "Start typing for suggestions..."
@@ -1783,7 +1977,7 @@ msgstr "Service indisponible"
 
 #: www/templates/cookielaw/banner.html:7
 msgid "Cookie information"
-msgstr ""
+msgstr "Informations sur les cookies"
 
 #: www/templates/cookielaw/banner.html:10
 msgid ""
@@ -1819,26 +2013,57 @@ msgid ""
 "\t</p>\n"
 "        "
 msgstr ""
+"\n"
+"\t<p>\n"
+"\tCe site n'utilise aucun cookie de suivi d'aucune sorte.\n"
+"\tIl utilise cependant jusqu'à trois cookies pour d'autres usages, à savoir :"
+"\n"
+"\t</p>\n"
+"\t<ul>\n"
+"\t  <li>Un cookie pour retenir que vous avez vu et accepté l'avertissement "
+"sur l'usage des cookies (valable pour 10 ans)</li>\n"
+"\t  <li>Un cookie de session pour faire le lien avec les informations de "
+"session stocké côté serveur</li>\n"
+"\t  <li>Le serveur de tuiles de carte sur openstreetmap.org peut également "
+"définir un cookie de son côté</li>\n"
+"\t</ul>\n"
+"\t<p>\n"
+"\tLe informations de session stockées côté serveur et liée au cookie de "
+"session est uniquement utilisé pour mémoriser\n"
+"\tles options précédemment saisies dans le formulaire <em>Créer une carte</"
+"em>. La session\n"
+"\tne stocke aucune sorte d'information personnelle.\n"
+"\t</p>\n"
+"\tLe site continue de fonctionner même si vous refusez l'usage\n"
+"\tdes cookies, mais vous verrez malheureusement cet avertissement sur "
+"l'usage des cookies encore et\n"
+"\tencore jusqu'à ce que vous acceptiez le stockage du cookie nommé "
+"<tt>cookielaw_accepted</tt> \n"
+"\ten cliquant sur le bouton \"OK\" ci-dessous\n"
+"\t<p>\n"
+"\t</p>\n"
+"\t<p>\n"
+"\tPour plus d'informations, consultez la <a href=\"/privacy/#cookies\""
+">Politique de Confidentialité</a> du site\n"
+"\t</p>\n"
+"        "
 
 #: www/templates/cookielaw/banner.html:37
 msgid "Accept"
-msgstr ""
+msgstr "Accepter"
 
 #: www/templates/render_email_exception.txt:1
 #: www/templates/render_email_failure.txt:1
 #: www/templates/render_email_success.txt:1
 #: www/templates/render_email_timeout.txt:1
-#, fuzzy
-#| msgid "Rendering daemon: "
 msgid "MapOSMatic rendering daemon"
-msgstr "Démon de rendu : "
+msgstr "Démon de rendu MapOSMatic"
 
 #: www/templates/render_email_exception.txt:7
 #: www/templates/render_email_failure.txt:7
-#, fuzzy, python-format
-#| msgid "Rendering failed!"
+#, python-format
 msgid "Rendering of job #%(jobid)s failed"
-msgstr "Échec du rendu !"
+msgstr "Le rendu de la tâche #%(jobid)s a échoué"
 
 #: www/templates/render_email_exception.txt:10
 #, python-format
@@ -1856,6 +2081,18 @@ msgid ""
 "-- \n"
 "MapOSMatic\n"
 msgstr ""
+"\n"
+"Une erreur s'est produite pendant le rendu de la tâche %(jobid)s !\n"
+"\n"
+"%(tb)s\n"
+"\n"
+"Informations sur la tâche :\n"
+"\n"
+"%%(jobinfo)s\n"
+"\n"
+"Vous pouvez voir la page de cette tâche à l'adresse <%%(url)s>.\n"
+"-- \n"
+"MapOSMatic\n"
 
 #: www/templates/render_email_failure.txt:10
 #, python-format
@@ -1876,11 +2113,27 @@ msgid ""
 "-- \n"
 "MapOSMatic\n"
 msgstr ""
+"\n"
+"Bonjour %(to)s,\n"
+"\n"
+"malheureusement votre demande de rendu pour la carte\n"
+"\n"
+"  %(title)s\n"
+"\n"
+"a échoué.\n"
+"\n"
+"Vous pouvez consulter la raison de l'erreur sur la page de détail de la "
+"demande :\n"
+"\n"
+"  %(url)s\n"
+"\n"
+"-- \n"
+"MapOSMatic\n"
 
 #: www/templates/render_email_success.txt:7
 #, python-format
 msgid "Rendering of job #%(jobid)s succeeded"
-msgstr ""
+msgstr "Le rendu de la tâche #%(jobid)s s'est terminé avec succès"
 
 #: www/templates/render_email_success.txt:10
 #, python-format
@@ -1900,11 +2153,25 @@ msgid ""
 "-- \n"
 "MapOSMatic\n"
 msgstr ""
+"\n"
+"Bonjour %(to)s,\n"
+"\n"
+"votre demande de rendu pour la carte\n"
+"\n"
+"  %(title)s\n"
+"\n"
+"a été traité avec succès et le résultat peut maintenant être téléchargé\n"
+"depuis la page de détail de la tâche de rendu :\n"
+"\n"
+"  %(url)s\n"
+"\n"
+"-- \n"
+"MapOSMatic\n"
 
 #: www/templates/render_email_timeout.txt:7
 #, python-format
 msgid "Rendering of job #%(jobid)s timed out"
-msgstr ""
+msgstr "Délai maximum dépassé pour le rendu de la tâche #%(jobid)s"
 
 #: www/templates/render_email_timeout.txt:10
 #, python-format
@@ -1925,6 +2192,22 @@ msgid ""
 "-- \n"
 "MapOSMatic\n"
 msgstr ""
+"\n"
+"Bonjour %(to)s,\n"
+"\n"
+"malheureusement votre demande de rendu de la carte\n"
+"\n"
+"  %(title)s\n"
+"\n"
+"a dû être annulé, car sa génération s'est exécuté durant plus de %(timeout)s "
+"minutes sans aboutir.\n"
+"\n"
+"Vous devriez réessayer avec une carte s'étendant sur une plus petite zone, "
+"en utilisant un style de carte moins complexe\n"
+"ou en utilisant moins de surcouches.\n"
+"\n"
+"-- \n"
+"MapOSMatic\n"
 
 #~ msgid "Portrait"
 #~ msgstr "Portrait"
diff --git a/www/locale/hu/LC_MESSAGES/django.po b/www/locale/hu/LC_MESSAGES/django.po
index 550be109..7cfa53d8 100644
--- a/www/locale/hu/LC_MESSAGES/django.po
+++ b/www/locale/hu/LC_MESSAGES/django.po
@@ -2,22 +2,22 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Translators:
-# Gábor Babos <gabor.babos@gmail.com>, 2017, 2019.
+# Gábor Babos <gabor.babos@gmail.com>, 2017, 2019, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-06-13 14:34+0200\n"
-"PO-Revision-Date: 2019-04-12 09:38+0000\n"
+"PO-Revision-Date: 2021-12-08 12:47+0000\n"
 "Last-Translator: Gábor Babos <gabor.babos@gmail.com>\n"
-"Language-Team: Hungarian <http://translate.get-map.org/projects/maposmatic/"
+"Language-Team: Hungarian <https://translate.get-map.org/projects/maposmatic/"
 "maposmatic/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.5.1\n"
+"X-Generator: Weblate 4.6.2\n"
 
 #: www/maposmatic/feeds.py:45
 msgid "maps"
@@ -60,10 +60,8 @@ msgid "Full-page layout with the street index at the bottom"
 msgstr "Teljes oldalas elrendezés utcanévmutatóval alul"
 
 #: www/maposmatic/forms.py:112
-#, fuzzy
-#| msgid "Full-page layout with the street index on the side"
 msgid "Full-page layout with the street index on extra page (PDF only)"
-msgstr "Teljes oldalas elrendezés utcanévmutatóval oldalt"
+msgstr "Teljes oldalas elrendezés, az utcanévmutató külön oldalon (csak PDF)"
 
 #: www/maposmatic/forms.py:114
 msgid "Multi-page layout"
@@ -446,18 +444,16 @@ msgid "Contributors"
 msgstr "Közreműködők"
 
 #: www/maposmatic/templates/maposmatic/about.html:200
-#, fuzzy
-#| msgid "Core team"
 msgid "Current team"
-msgstr "Belső csoport"
+msgstr "Jelenlegi csoport"
 
 #: www/maposmatic/templates/maposmatic/about.html:203
 msgid "Developer, running instance on https://print.get-map-org/"
-msgstr ""
+msgstr "Fejlesztő, a példány futtatója itt: https://print.get-map.org/"
 
 #: www/maposmatic/templates/maposmatic/about.html:208
 msgid "Original team"
-msgstr ""
+msgstr "Eredeti team"
 
 #: www/maposmatic/templates/maposmatic/about.html:211
 #: www/maposmatic/templates/maposmatic/about.html:212
@@ -632,7 +628,7 @@ msgstr ""
 
 #: www/maposmatic/templates/maposmatic/base.html:126
 msgid "Privacy statement"
-msgstr ""
+msgstr "Adatvédelmi nyilatkozat"
 
 #: www/maposmatic/templates/maposmatic/donate-thanks.html:36
 msgid "Thanks!"
@@ -643,15 +639,11 @@ msgid "Thanks for your donation!"
 msgstr "Köszönjük a támogatást!"
 
 #: www/maposmatic/templates/maposmatic/donate-thanks.html:42
-#, fuzzy
-#| msgid ""
-#| "<i class=\"fa fa-check\"></i> We have received your donation.\n"
-#| "Thank you for your support to the MapOSMatic project!"
 msgid ""
 "<i class=\"fas fa-check\"></i> We have received your donation.\n"
 "Thank you for your support to the MapOSMatic project!"
 msgstr ""
-"<i class=\"fa fa-check\"></i> Megkaptuk az adományt.\n"
+"<i class=\"fas fa-check\"></i> Megkaptuk az adományt.\n"
 "Köszönjük, hogy támogatja a MapOSMatic projektet!"
 
 #: www/maposmatic/templates/maposmatic/donate-thanks.html:47
@@ -994,10 +986,8 @@ msgid "Cancel this queued request (position %(pos)s in the queue)"
 msgstr "Ennek a kérésnek a megszakítása (jelenleg %(pos)s. a sorban)"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:65
-#, fuzzy
-#| msgid "<i class=\"fa fa-times\"></i> Cancel"
 msgid "<i class=\"fas fa-times\"></i> Cancel"
-msgstr "<i class=\"fa fa-times\"></i> Megszakítás"
+msgstr "<i class=\"fas fa-times\"></i> Megszakítás"
 
 #: www/maposmatic/templates/maposmatic/map-full-parts/rendering-status.html:77
 #: www/maposmatic/templates/maposmatic/maps.html:142
@@ -1168,13 +1158,11 @@ msgstr "Település keresése"
 
 #: www/maposmatic/templates/maposmatic/new.html:168
 msgid "File upload"
-msgstr ""
+msgstr "Fájl feltöltése"
 
 #: www/maposmatic/templates/maposmatic/new.html:195
-#, fuzzy
-#| msgid "Umap data file"
 msgid "Upload files"
-msgstr "uMap adatfájl"
+msgstr "Fájlok feltöltése"
 
 #: www/maposmatic/templates/maposmatic/new.html:204
 msgid ""
@@ -1182,20 +1170,18 @@ msgid ""
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
+"Töltsön fel GPX, Umap vagy általános GeoJSON fájlokat itt. <br/> Egyszerre "
+"több fájlt is kijelölhet. Ha újra megnyitja a fájlkijelölő párbeszédpanelt, "
+"az új kijelölés felváltja az előzőt."
 
 #: www/maposmatic/templates/maposmatic/new.html:216
-#, fuzzy
-#| msgid ""
-#| "<b>Note:</b> The uploaded file will not be made available to anyone, the "
-#| "map created using this file <b>will be publicly visible</b> though.<br/"
-#| ">Do <b>NOT</b> upload any data you don't want to be publicly visible."
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
-"<b>Megjegyzés:</b> A feltöltött fájl senkinek sem lesz elérhető, azonban a "
-"fájl segítségével létrehozott térkép <b>nyilvános</b> lesz.<br/><b>Ne "
+"<b>Megjegyzés:</b> A feltöltött fájlok senkinek sem lesz elérhetők, azonban "
+"a fájl segítségével létrehozott térkép <b>nyilvános</b> lesz.<br/><b>Ne "
 "töltsön fel</b> olyan adatot, amelyről nem szeretné, hogy bárki láthassa."
 
 #: www/maposmatic/templates/maposmatic/new.html:228
@@ -1263,7 +1249,7 @@ msgstr "Lap mérete"
 
 #: www/maposmatic/templates/maposmatic/new.html:337
 msgid "(width x height)"
-msgstr ""
+msgstr "(szélesség × magasság)"
 
 #: www/maposmatic/templates/maposmatic/new.html:370
 msgid "An error occured while retrieving compatible paper sizes."
@@ -1286,6 +1272,9 @@ msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
+"Választhat a javasolt szabványos méretek közül, a kiválasztott "
+"térképterülethez legjobban illeszkedő méretből, vagy megadhatja az Ön által "
+"kiválasztott szélességet és magasságot."
 
 #: www/maposmatic/templates/maposmatic/new.html:408
 msgid "Map title"
@@ -1300,14 +1289,12 @@ msgid "Your Email address (for notifications, optional)"
 msgstr "E-mail cím (értesítésekhez, nem kötelező)"
 
 #: www/maposmatic/templates/maposmatic/new.html:436
-#, fuzzy
-#| msgid "Clear selected area"
 msgid "will be deleted after"
-msgstr "Kijelölt terület törlése"
+msgstr "törlődik ennyi idő után:"
 
 #: www/maposmatic/templates/maposmatic/new.html:436
 msgid "hours"
-msgstr ""
+msgstr "óra"
 
 #: www/maposmatic/templates/maposmatic/new.html:445
 msgid "Summary"
@@ -1348,11 +1335,11 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/privacy.html:33
 #: www/maposmatic/templates/maposmatic/privacy.html:36
 msgid "Privacy Statement"
-msgstr ""
+msgstr "Adatvédelmi nyilatkozat"
 
 #: www/maposmatic/templates/maposmatic/privacy.html:38
 msgid "Encryption"
-msgstr ""
+msgstr "Titkosítás"
 
 #: www/maposmatic/templates/maposmatic/privacy.html:41
 msgid ""
@@ -1361,6 +1348,12 @@ msgid ""
 "  provided by <a href=\"https://letsencrypt.org/\">LetsEncrypt</a>.\n"
 "  "
 msgstr ""
+"\n"
+"  Minden webes adatforgalom TLS/SSL titkosítással, tanúsítványok "
+"használatával történik,\n"
+"  a <a href=\"https://letsencrypt.org/\">LetsEncrypt</a> által biztosított "
+"tanúsítványokkal.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:48
 msgid ""
@@ -1370,6 +1363,11 @@ msgid ""
 "  URL counterparts.\n"
 "  "
 msgstr ""
+"\n"
+"  Ha a webhelyet titkosítatlan <tt>http://</tt> URL-lel próbálja elérni,\n"
+" automatikusan átirányítjuk a megfelelő titkosított <tt>https://</tt>  URL-"
+"re.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:58
 msgid ""
@@ -1384,6 +1382,16 @@ msgid ""
 "  additional access logs will be removed again within 24 hours.\n"
 "  "
 msgstr ""
+"\n"
+"  A webkiszolgáló csak a dátumot és az időt, a kért URL-címet és a HTTP-"
+"státuszt naplózza,\n"
+" általában nem naplózza az IP-címeket, a felhasználóiügynök-karakterláncokat "
+"vagy a hivatkozó URL-címeket.\n"
+" Problémák elemézése végett szükség esetén a naplóbejegyzésekhez\n"
+" ideiglenesen ezek a további mezők is hozzáadhatók (bár erre eddig még soha "
+"nem volt szükség),\n"
+" de az ilyen a további hozzáférési naplók 24 órán belül ismét törlődnek.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:68
 msgid ""
@@ -1391,6 +1399,9 @@ msgid ""
 "  When submitting an actual map rendering job, your IP address will\n"
 "  "
 msgstr ""
+"\n"
+"  Egy tényleges térképmegjelenítési feladat beküldésekor az Ön IP-címe\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:72
 msgid ""
@@ -1398,6 +1409,9 @@ msgid ""
 "    be stored until removed manually\n"
 "    "
 msgstr ""
+"\n"
+"    addig tárolódik, amíg kézzel nem törlik\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:76
 msgid ""
@@ -1405,6 +1419,9 @@ msgid ""
 "    not be stored\n"
 "    "
 msgstr ""
+"\n"
+"    nem tárolódik\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:80
 #, python-format
@@ -1413,6 +1430,9 @@ msgid ""
 "    stored for %(SUBMITTER_IP_LIFETIME)s hours\n"
 "    "
 msgstr ""
+"\n"
+"    %(SUBMITTER_IP_LIFETIME)s óra időtartamra tárolódik\n"
+"    "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:84
 msgid ""
@@ -1420,6 +1440,9 @@ msgid ""
 "  along with the actual map request.\n"
 "  "
 msgstr ""
+"\n"
+"  a tényleges térképkérelemmel együtt.\n"
+"  "
 
 #: www/maposmatic/templates/maposmatic/privacy.html:90
 msgid ""
@@ -1814,17 +1837,14 @@ msgstr ""
 #: www/templates/render_email_failure.txt:1
 #: www/templates/render_email_success.txt:1
 #: www/templates/render_email_timeout.txt:1
-#, fuzzy
-#| msgid "Rendering daemon: "
 msgid "MapOSMatic rendering daemon"
-msgstr "Megjelenítő háttérfolyamat (daemon): "
+msgstr "MapOSMatic megjelenítő háttérfolyamat (daemon)"
 
 #: www/templates/render_email_exception.txt:7
 #: www/templates/render_email_failure.txt:7
-#, fuzzy, python-format
-#| msgid "Rendering failed!"
+#, python-format
 msgid "Rendering of job #%(jobid)s failed"
-msgstr "Nem sikerült a megjelenítés."
+msgstr "#%(jobid)s megjelenítése nem sikerült"
 
 #: www/templates/render_email_exception.txt:10
 #, python-format
diff --git a/www/locale/nl/LC_MESSAGES/django.po b/www/locale/nl/LC_MESSAGES/django.po
index 21ea790a..8ded3f04 100644
--- a/www/locale/nl/LC_MESSAGES/django.po
+++ b/www/locale/nl/LC_MESSAGES/django.po
@@ -1853,7 +1853,7 @@ msgstr "Reproductie was succesvol."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
 "De reproductie van uw kaart is mislukt, gelieve contact op te nemen met "
-"hartmut@php.net voor meer informatie."
+"%(email)s voor meer informatie."
 
 #: www/maposmatic/templatetags/extratags.py:51
 #, fuzzy
diff --git a/www/locale/pl/LC_MESSAGES/django.po b/www/locale/pl/LC_MESSAGES/django.po
index c0fcb9b5..fe84cfa5 100644
--- a/www/locale/pl/LC_MESSAGES/django.po
+++ b/www/locale/pl/LC_MESSAGES/django.po
@@ -1602,7 +1602,7 @@ msgstr "Wyrenderowano pomyślnie."
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
-"Renderowanie nieudane! Proszę skontaktuj się z hartmut@php.net po więcej "
+"Renderowanie nieudane! Proszę skontaktuj się z %(email)s po więcej "
 "informacji."
 
 #: www/maposmatic/templatetags/extratags.py:51
diff --git a/www/locale/pt_BR/LC_MESSAGES/django.po b/www/locale/pt_BR/LC_MESSAGES/django.po
index 4c12d480..52601728 100644
--- a/www/locale/pt_BR/LC_MESSAGES/django.po
+++ b/www/locale/pt_BR/LC_MESSAGES/django.po
@@ -6,23 +6,23 @@
 # Rodrigo de Avila <rodrigo@avila.net.br>, 2013
 # Rodrigo de Avila <rodrigo@avila.net.br>, 2013,2015
 # Thiago Vieira <thipvieira@gmail.com>, 2014
-# André Marcelo Alvarenga <andrealvarenga@gmx.net>, 2019.
+# André Marcelo Alvarenga <andrealvarenga@gmx.net>, 2019, 2021.
 # Andre Luis Lourenço Raposo <andreluiz09444@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-06-13 14:34+0200\n"
-"PO-Revision-Date: 2019-08-16 17:41+0000\n"
-"Last-Translator: Andre Luis Lourenço Raposo <andreluiz09444@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) <http://translate.get-map.org/projects/"
+"PO-Revision-Date: 2021-12-27 00:34+0000\n"
+"Last-Translator: André Marcelo Alvarenga <andrealvarenga@gmx.net>\n"
+"Language-Team: Portuguese (Brazil) <https://translate.get-map.org/projects/"
 "maposmatic/maposmatic/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.5.1\n"
+"X-Generator: Weblate 4.6.2\n"
 
 #: www/maposmatic/feeds.py:45
 msgid "maps"
@@ -65,10 +65,9 @@ msgid "Full-page layout with the street index at the bottom"
 msgstr "Layout de página inteira com índice de ruas embaixo"
 
 #: www/maposmatic/forms.py:112
-#, fuzzy
-#| msgid "Full-page layout with the street index on the side"
 msgid "Full-page layout with the street index on extra page (PDF only)"
-msgstr "Layout de página inteira com índice de ruas na lateral"
+msgstr ""
+"Layout de página inteira com índice de ruas em página extra (apenas PDF)"
 
 #: www/maposmatic/forms.py:114
 msgid "Multi-page layout"
@@ -477,14 +476,12 @@ msgid "Contributors"
 msgstr "Colaboradores"
 
 #: www/maposmatic/templates/maposmatic/about.html:200
-#, fuzzy
-#| msgid "Core team"
 msgid "Current team"
-msgstr "Time principal"
+msgstr "Time atual"
 
 #: www/maposmatic/templates/maposmatic/about.html:203
 msgid "Developer, running instance on https://print.get-map-org/"
-msgstr ""
+msgstr "Desenvolvedor, executando a instância em https://print.get-map-org/"
 
 #: www/maposmatic/templates/maposmatic/about.html:208
 msgid "Original team"
@@ -793,7 +790,7 @@ msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:25
 msgid "The rendering daemon is running."
-msgstr "O serviço de renderização está em andamento."
+msgstr "O serviço de renderização está funcionando."
 
 #: www/maposmatic/templates/maposmatic/index-parts/status.html:29
 msgid ""
@@ -1828,7 +1825,7 @@ msgstr "Renderização concluída com sucesso."
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
-"A renderização falhou! Por favor, contate hartmut@php.net para mais "
+"A renderização falhou! Por favor, contate %(email)s para mais "
 "informações."
 
 #: www/maposmatic/templatetags/extratags.py:51
diff --git a/www/locale/pt_PT/LC_MESSAGES/django.po b/www/locale/pt_PT/LC_MESSAGES/django.po
index f3e405d4..31e5df0a 100644
--- a/www/locale/pt_PT/LC_MESSAGES/django.po
+++ b/www/locale/pt_PT/LC_MESSAGES/django.po
@@ -1864,7 +1864,7 @@ msgstr "A renderização foi concluída com sucesso."
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
-"A renderização falhou! Por favor contacte hartmut@php.net para obter mais "
+"A renderização falhou! Por favor contacte %(email)s para obter mais "
 "informações."
 
 #: www/maposmatic/templatetags/extratags.py:51
diff --git a/www/locale/tr/LC_MESSAGES/django.po b/www/locale/tr/LC_MESSAGES/django.po
index e7933218..a52e698c 100644
--- a/www/locale/tr/LC_MESSAGES/django.po
+++ b/www/locale/tr/LC_MESSAGES/django.po
@@ -1604,7 +1604,7 @@ msgstr "İşlenme başarılı"
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
 msgstr ""
-"İşlenme başarısız oldu! Daha fazla bilgi için hartmut@php.net ile irtibata "
+"İşlenme başarısız oldu! Daha fazla bilgi için %(email)s ile irtibata "
 "geçiniz."
 
 #: www/maposmatic/templatetags/extratags.py:51
diff --git a/www/locale/zh_TW/LC_MESSAGES/django.po b/www/locale/zh_TW/LC_MESSAGES/django.po
index ad5cf4a9..7766f4a5 100644
--- a/www/locale/zh_TW/LC_MESSAGES/django.po
+++ b/www/locale/zh_TW/LC_MESSAGES/django.po
@@ -1798,7 +1798,7 @@ msgstr "成功繪製"
 #| msgid ""
 #| "Rendering failed! Please contact hartmut@php.net for more information."
 msgid "Rendering failed! Please contact %(email)s for more information."
-msgstr "繪製失敗，欲得知進一步資訊請聯絡 hartmut@php.net"
+msgstr "繪製失敗，欲得知進一步資訊請聯絡 %(email)s"
 
 #: www/maposmatic/templatetags/extratags.py:51
 #, fuzzy
diff --git a/www/maposmatic/templatetags/extratags.py b/www/maposmatic/templatetags/extratags.py
index 91a083fe..dcc9fc89 100644
--- a/www/maposmatic/templatetags/extratags.py
+++ b/www/maposmatic/templatetags/extratags.py
@@ -46,9 +46,9 @@ def job_status_to_str(value, arg, autoescape=None):
             return _("Rendering was successful.")
         else:
             if www.settings.CONTACT_EMAIL:
-                return _("Rendering failed! Please contact %(email)s for more information.") % {'email': www.settings.CONTACT_EMAIL}
+                return _("Rendering failed! Please check the error log and contact %(email)s for more information.") % {'email': www.settings.CONTACT_EMAIL}
             else:
-                return _("Rendering failed!")
+                return _("Rendering failed! Please check the error log for more information.")
     elif value == 3:
         if arg == 'ok':
             return _("Rendering is obsolete: the rendering was successful, but the files are no longer available.")
@@ -103,7 +103,10 @@ def bbox_km(value):
 
     (height, width) = boundingbox.spheric_sizes()
 
-    return "ca. %d x %d km²" % (width/1000, height/1000)
+    if width >= 1000 and height >= 1000:
+        return "ca. %d x %d km²" % (width/1000, height/1000)
+
+    return "ca. %d x %d m²" % (width, height)
 
 def language_flag(value):
     if value in www.settings.LANGUAGE_FLAGS:
diff --git a/www/settings.py b/www/settings.py
index b9d52e54..c9e956e1 100644
--- a/www/settings.py
+++ b/www/settings.py
@@ -137,6 +137,7 @@ LANGUAGES = {
     "el":    "ελληνικά",
     "en":    "English",
     "es":    "Español",
+    "eu":    "Euskara",
     "fa":    "فارسی",
     "fr":    "Français",
     "hr":    "Hrvatski",
@@ -166,6 +167,7 @@ LANGUAGE_FLAGS = {
     "el":    "gr",
     "en":    "gb",
     "es":    "es",
+    "eu":    "es-pv",
     "fa":    "ir",
     "fr":    "fr",
     "hr":    "hr",
@@ -246,6 +248,7 @@ MAP_LANGUAGES = {
     "ar_EG.UTF-8": "مصر",
     "es_ES.UTF-8": "España",
     "ca_ES.UTF-8": "Espanya",
+    "eu_ES.UTF-8": "Euskara",
     "ast_ES.UTF-8": "España",
     "fr_FR.UTF-8": "France",
     "ca_FR.UTF-8": "França",
diff --git a/www/settings_local.py.dist b/www/settings_local.py.dist
index 0f88da3e..80459181 100644
--- a/www/settings_local.py.dist
+++ b/www/settings_local.py.dist
@@ -35,7 +35,7 @@ import sys
 DEBUG = True
 
 ADMINS = (
-    ('MapOSMatic admin', 'contact@your.domain'),
+    ('MapOSMatic admin', 'your-name@example.org'),
 )
 
 DATABASES = {
@@ -126,9 +126,9 @@ DAEMON_ERRORS_SMTP_PORT = 25
 DAEMON_ERRORS_SMTP_ENCRYPT = None
 DAEMON_ERRORS_SMTP_USER = None
 DAEMON_ERRORS_SMTP_PASSWORD = None
-DAEMON_ERRORS_EMAIL_FROM = 'daemon@example.com'
-DAEMON_ERRORS_EMAIL_REPLY_TO = 'noreply@example.com'
-DAEMON_ERRORS_JOB_URL = 'http://example.com/jobs/%d'
+DAEMON_ERRORS_EMAIL_FROM = 'daemon@example.org'
+DAEMON_ERRORS_EMAIL_REPLY_TO = 'noreply@example.org'
+DAEMON_ERRORS_JOB_URL = 'http://example.org/jobs/%d'
 
 # example email settings for using a Google Mail account
 # DAEMON_ERRORS_SMTP_HOST = 'smtp.googlemail.com'
@@ -176,7 +176,7 @@ SUBMITTER_MAIL_LIFETIME=24
 WEBLATE_BASE_URL = 'https://translate.get-map.org/'
 
 # contact information, to be displayed in page footer if set
-CONTACT_EMAIL = 'hartmut@php.net'
+CONTACT_EMAIL = 'your-name@example.org'
 CONTACT_CHAT  = 'irc://irc.freenode.net/#maposmatic'
 
 # custom footer text