i18n

2018-09-08 17:09:10 +02:00 · 2018-09-08 17:09:10 +02:00 · 709387d985
commit 709387d985
parent 0798b708a8
46 changed files with 313 additions and 157 deletions
--- a/umap/locale/am_ET/LC_MESSAGES/django.mo
+++ b/umap/locale/am_ET/LC_MESSAGES/django.mo
--- a/umap/locale/bg/LC_MESSAGES/django.mo
+++ b/umap/locale/bg/LC_MESSAGES/django.mo
--- a/umap/locale/ca/LC_MESSAGES/django.mo
+++ b/umap/locale/ca/LC_MESSAGES/django.mo
--- a/umap/locale/cs_CZ/LC_MESSAGES/django.mo
+++ b/umap/locale/cs_CZ/LC_MESSAGES/django.mo
--- a/umap/locale/da/LC_MESSAGES/django.mo
+++ b/umap/locale/da/LC_MESSAGES/django.mo
--- a/umap/locale/de/LC_MESSAGES/django.mo
+++ b/umap/locale/de/LC_MESSAGES/django.mo
--- a/umap/locale/en/LC_MESSAGES/django.mo
+++ b/umap/locale/en/LC_MESSAGES/django.mo
--- a/umap/locale/es/LC_MESSAGES/django.mo
+++ b/umap/locale/es/LC_MESSAGES/django.mo
--- a/umap/locale/fi/LC_MESSAGES/django.mo
+++ b/umap/locale/fi/LC_MESSAGES/django.mo
--- a/umap/locale/fr/LC_MESSAGES/django.mo
+++ b/umap/locale/fr/LC_MESSAGES/django.mo
--- a/umap/locale/it/LC_MESSAGES/django.mo
+++ b/umap/locale/it/LC_MESSAGES/django.mo
--- a/umap/locale/ja/LC_MESSAGES/django.mo
+++ b/umap/locale/ja/LC_MESSAGES/django.mo
--- a/umap/locale/lt/LC_MESSAGES/django.mo
+++ b/umap/locale/lt/LC_MESSAGES/django.mo
--- a/umap/locale/nl/LC_MESSAGES/django.mo
+++ b/umap/locale/nl/LC_MESSAGES/django.mo
--- a/umap/locale/pt/LC_MESSAGES/django.mo
+++ b/umap/locale/pt/LC_MESSAGES/django.mo
--- a/umap/locale/ru/LC_MESSAGES/django.mo
+++ b/umap/locale/ru/LC_MESSAGES/django.mo
--- a/umap/locale/uk_UA/LC_MESSAGES/django.mo
+++ b/umap/locale/uk_UA/LC_MESSAGES/django.mo
--- a/umap/locale/vi/LC_MESSAGES/django.mo
+++ b/umap/locale/vi/LC_MESSAGES/django.mo
--- a/umap/locale/zh/LC_MESSAGES/django.mo
+++ b/umap/locale/zh/LC_MESSAGES/django.mo
--- a/umap/locale/zh_TW/LC_MESSAGES/django.mo
+++ b/umap/locale/zh_TW/LC_MESSAGES/django.mo
--- a/umap/static/umap/locale/am_ET.js
+++ b/umap/static/umap/locale/am_ET.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "ስም እና መግለጫ",
-    "Name and description (large)": "ስም እና መግለጫ (ትልቅ)",
    "None": "ምንም",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "የፖፕ-አፕ ኮንቴንት ተምሳሌ",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "የጎን ፓኔል",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("am_ET", locale);
 L.setLocale("am_ET");
--- a/umap/static/umap/locale/bg.js
+++ b/umap/static/umap/locale/bg.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Име и описание",
-    "Name and description (large)": "Наименование и описание (голям)",
    "None": "Нищо",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Popup content template",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Side panel",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("bg", locale);
 L.setLocale("bg");
--- a/umap/static/umap/locale/ca.js
+++ b/umap/static/umap/locale/ca.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Nom i descripció",
-    "Name and description (large)": "Nom i descripció (gran)",
    "None": "Cap",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Popup content template",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Side panel",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("ca", locale);
 L.setLocale("ca");
--- a/umap/static/umap/locale/cs_CZ.js
+++ b/umap/static/umap/locale/cs_CZ.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Jméno a popis",
-    "Name and description (large)": "Jméno a popis (velké)",
    "None": "Žádný",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Šablona obsahu bubliny",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Boční panel",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("cs_CZ", locale);
 L.setLocale("cs_CZ");
--- a/umap/static/umap/locale/da.js
+++ b/umap/static/umap/locale/da.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Navn og beskrivelse",
-    "Name and description (large)": "Navn og beskrivelse (meget tekst)",
    "None": "Ingen",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Popul indholdsskabelon",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Sidepanel",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("da", locale);
 L.setLocale("da");
--- a/umap/static/umap/locale/de.js
+++ b/umap/static/umap/locale/de.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Beschriftungsrichtung",
    "Label key": "Anzeigeschlüssel",
    "Labels are clickable": "Beschriftungen sind klickbar",
-    "Name and description": "Name und Beschreibung",
-    "Name and description (large)": "Name und Beschreibung (groß)",
    "None": "Keine",
    "On the bottom": "An der Unterseite",
    "On the left": "An der linken Seite",
    "On the right": "An der rechten Seite",
    "On the top": "An der Oberseite",
    "Popup content template": "Popup Vorlage",
-    "Popup style": "Popupstil",
    "Set symbol": "Symbol festlegen",
    "Side panel": "Seitenleiste",
    "Simplify": "Vereinfachen",
@ -343,14 +340,14 @@ var locale = {
    "previous": "zurück",
    "width": "Breite",
    "{count} errors during import: {message}": "{count} Fehler während dem Import: {message}",
-    "Measure distances": "Measure distances",
+    "Measure distances": "Abstände messen",
    "NM": "NM",
-    "kilometers": "kilometers",
+    "kilometers": "Kilometer",
    "km": "km",
    "mi": "mi",
-    "miles": "miles",
-    "nautical miles": "nautical miles",
-    "{area} acres": "{area} acres",
+    "miles": "Meilen",
+    "nautical miles": "Nautische Meilen",
+    "{area} acres": "{area} ac",
    "{area} ha": "{area} ha",
    "{area} m&sup2;": "{area} m&sup2;",
    "{area} mi&sup2;": "{area} mi&sup2;",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("de", locale);
 L.setLocale("de");
--- a/umap/static/umap/locale/el.js
+++ b/umap/static/umap/locale/el.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Name and description",
-    "Name and description (large)": "Name and description (large)",
    "None": "None",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Popup content template",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Side panel",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("el", locale);
 L.setLocale("el");
--- a/umap/static/umap/locale/en.js
+++ b/umap/static/umap/locale/en.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Name and description",
-    "Name and description (large)": "Name and description (large)",
    "None": "None",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Popup content template",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Side panel",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("en", locale);
 L.setLocale("en");
--- a/umap/static/umap/locale/es.js
+++ b/umap/static/umap/locale/es.js
@ -40,19 +40,16 @@ var locale = {
    "Label direction": "Dirección de la etiqueta",
    "Label key": "Etiqueta de la clave",
    "Labels are clickable": "Las etiquetas se podrán hacer clic",
-    "Name and description": "nombre y descripción",
-    "Name and description (large)": "nombre y descripción (larga)",
    "None": "ninguno",
    "On the bottom": "En la parte inferior",
    "On the left": "A la izquierda",
    "On the right": "A la derecha",
    "On the top": "En la parte superior",
    "Popup content template": "plantilla del contenido de la ventana emergente",
-    "Popup style": "Estilo de ventana emergente",
-    "Set symbol": "Set symbol",
+    "Set symbol": "Establecer símbolo",
    "Side panel": "panel lateral",
    "Simplify": "Simplifica",
-    "Symbol or url": "Symbol or url",
+    "Symbol or url": "Símbolo o URL",
    "Table": "tabla",
    "always": "siempre",
    "clear": "limpiar",
@ -72,7 +69,7 @@ var locale = {
    "never": "nunca",
    "new window": "nueva ventana",
    "no": "no",
-    "on hover": "on hover",
+    "on hover": "al pasar el ratón",
    "opacity": "opacidad",
    "parent window": "ventana padre",
    "stroke": "trazo",
@ -106,7 +103,7 @@ var locale = {
    "Are you sure you want to delete this map?": "¿Está seguro que quiere eliminar este mapa?",
    "Are you sure you want to delete this property on all the features?": "¿Esta seguro que quiere eliminar esta propiedad en todos los elementos?",
    "Are you sure you want to restore this version?": "¿Está seguro que quiere restaurar esta versión?",
-    "Attach the map to my account": "Attach the map to my account",
+    "Attach the map to my account": "Adjuntar el mapa a mi cuenta",
    "Auto": "Automático",
    "Autostart when map is loaded": "Autocomenzar cuando el mapa esté cargado",
    "Bring feature to center": "Llevar al centro el elemento",
@ -145,7 +142,7 @@ var locale = {
    "Define link to open in a new window on polygon click.": "Defina un enlace para abrir en un nueva ventana al hacer clic en el polígono.",
    "Delay between two transitions when in play mode": "Delay between two transitions when in play mode",
    "Delete": "Eliminar",
-    "Delete all layers": "Delete all layers",
+    "Delete all layers": "Eliminar todas las capas",
    "Delete layer": "Borrar capa",
    "Delete this feature": "Eliminar este elemento",
    "Delete this property on all the features": "Eliminar esta propiedad en todos los elementos",
@ -155,7 +152,7 @@ var locale = {
    "Disable editing": "Deshabilitar la edición",
    "Display measure": "Display measure",
    "Display on load": "Mostrar al cargar",
-    "Download": "Download",
+    "Download": "Descargar",
    "Download data": "Descargar datos",
    "Drag to reorder": "Arrastrar para reordenar",
    "Draw a line": "Dibuja una línea",
@ -220,18 +217,18 @@ var locale = {
    "Make main shape": "Hacer la forma principal",
    "Manage layers": "Gestionar capas",
    "Map background credits": "Créditos del mapa de fondo",
-    "Map has been attached to your account": "Map has been attached to your account",
+    "Map has been attached to your account": "El mapa se ha adjuntado a su cuenta",
    "Map has been saved!": "¡Se ha guardado el mapa!",
    "Map user content has been published under licence": "El contenido del mapa del usuario ha sido publicados bajo la licencia",
-    "Map's editors": "Map's editors",
-    "Map's owner": "Map's owner",
+    "Map's editors": "Editores del mapa",
+    "Map's owner": "Propietario del mapa",
    "Merge lines": "Combinar líneas",
    "More controls": "Más controles",
    "Must be a valid CSS value (eg.: DarkBlue or #123456)": "Debe ser un valor CSS válido (por ej.: DarkBlue o #123456)",
    "No licence has been set": "Ninguna licencia se ha establecido",
    "No results": "Sin resultado",
    "Only visible features will be downloaded.": "Sólo los elementos visibles se descargarán.",
-    "Open download panel": "Open download panel",
+    "Open download panel": "Abrir el panel de descarga",
    "Open link in…": "Abrir enlace en...",
    "Open this map extent in a map editor to provide more accurate data to OpenStreetMap": "Abre la extensión de este mapa en un editor de mapas para proveer datos más precisos a OpenStreetMap",
    "Optional intensity property for heatmap": "Propiedad intensidad opcional para el mapa de calor",
@ -262,11 +259,11 @@ var locale = {
    "Save current edits": "Guardar las ediciones actuales",
    "Save this center and zoom": "Guardar este centrado y acercamiento",
    "Save this location as new feature": "Guardar esta ubicación como nuevo elemento",
-    "Search a place name": "Search a place name",
+    "Search a place name": "Buscar el nombre de un lugar",
    "Search location": "Buscar ubicación",
-    "Secret edit link is:<br>{link}": "Secret edit link is:<br>{link}",
+    "Secret edit link is:<br>{link}": "El enlace secreto de edición es:<br>{link}",
    "See all": "Ver todo",
-    "See data layers": "See data layers",
+    "See data layers": "Ver capas de datos",
    "See full screen": "Ver pantalla completa",
    "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…",
    "Shape properties": "Propiedades de la forma",
@ -286,7 +283,7 @@ var locale = {
    "Stop slideshow": "Parar presentación de diapositivas",
    "Supported scheme": "Esquema soportado",
    "Supported variables that will be dynamically replaced": "Variables soportadas que serán reemplazadas dinámicamente",
-    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.",
+    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "El símbolo puede ser un carácter unicode o una URL. Puede usar las propiedades del elemento como variables: ej.: \"http://myserver.org/images/{name}.png\",  la variable {name} será remplazada por el valor \"name\" de cada marcador.",
    "TMS format": "formato TMS",
    "Text color for the cluster label": "Color del texto para la etiqueta clúster",
    "Text formatting": "Formato de texto",
@ -302,7 +299,7 @@ var locale = {
    "Unable to detect format of file {filename}": "No se puede detectar el formato de archivo {filename}",
    "Untitled layer": "Capa sin título",
    "Untitled map": "Mapa sin título",
-    "Update permissions": "Update permissions",
+    "Update permissions": "Actualizar permisos",
    "Update permissions and editors": "Actualizar permisos y editores",
    "Url": "Url",
    "Use current bounds": "Utilizar límites actuales",
@ -314,8 +311,8 @@ var locale = {
    "Where do we go from here?": "¿A dónde vamos a partir de aquí?",
    "Whether to display or not polygons paths.": "Si desea mostrar o no el trayecto de los polígonos.",
    "Whether to fill polygons with color.": "Si desea rellenar los polígonos con color.",
-    "Who can edit": "Who can edit",
-    "Who can view": "Who can view",
+    "Who can edit": "Quién puede editar",
+    "Who can view": "Quién puede ver",
    "Will be displayed in the bottom right corner of the map": "Se mostrará en la esquina inferior izquierda del mapa",
    "Will be visible in the caption of the map": "Será visible en el subtítulo del mapa",
    "Woops! Someone else seems to have edited the data. You can save anyway, but this will erase the changes made by others.": "¡Oops! Alguien parece haber editado los datos. Puedes guardar de todos modos, pero esto va a borrar los cambios realizados por otros.",
@ -343,13 +340,13 @@ var locale = {
    "previous": "anterior",
    "width": "anchura",
    "{count} errors during import: {message}": "{count} errores durante la importación: {message}",
-    "Measure distances": "Measure distances",
+    "Measure distances": "Medir distancias",
    "NM": "NM",
-    "kilometers": "kilometers",
+    "kilometers": "kilómetros",
    "km": "km",
    "mi": "mi",
-    "miles": "miles",
-    "nautical miles": "nautical miles",
+    "miles": "millas",
+    "nautical miles": "millas náuticas",
    "{area} acres": "{area} acres",
    "{area} ha": "{area} ha",
    "{area} m&sup2;": "{area} m&sup2;",
@ -358,8 +355,17 @@ var locale = {
    "{distance} NM": "{distance} NM",
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
-    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} miles": "{distance} millas",
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("es", locale);
 L.setLocale("es");
--- a/umap/static/umap/locale/fi.js
+++ b/umap/static/umap/locale/fi.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Nimi ja kuvaus",
-    "Name and description (large)": "Nimi ja kuvaus (suuri)",
    "None": "Ei mitään",
    "On the bottom": "Alhaalla",
    "On the left": "Vasemmalla",
    "On the right": "Oikealla",
    "On the top": "Ylhäällä",
    "Popup content template": "Ponnahdusikkunan sisällön sapluuna",
-    "Popup style": "Ponnahdusikkunan tyyli",
    "Set symbol": "Set symbol",
    "Side panel": "Sivupaneeli",
    "Simplify": "Yksinkertaista",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("fi", locale);
 L.setLocale("fi");
--- a/umap/static/umap/locale/fr.js
+++ b/umap/static/umap/locale/fr.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Direction de l'étiquette",
    "Label key": "Clé pour le libellé",
    "Labels are clickable": "Étiquette cliquable",
-    "Name and description": "Nom et description",
-    "Name and description (large)": "Nom et description (large)",
    "None": "Aucun",
    "On the bottom": "Bas",
    "On the left": "Gauche",
    "On the right": "Droite",
    "On the top": "Haut",
    "Popup content template": "Gabarit du contenu de la popup",
-    "Popup style": "Style de popup",
    "Set symbol": "Définir le pictogramme",
    "Side panel": "Panneau latéral",
    "Simplify": "Simplifier",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 jour",
+    "1 hour": "1 heure",
+    "5 min": "5 min",
+    "Cache proxied request": "Cacher la requête avec proxy",
+    "No cache": "Pas de cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (grande)",
+    "Popup content style": "Gabarit du contenu de la popup",
+    "Popup shape": "Forme de popup"
 };
 L.registerLocale("fr", locale);
 L.setLocale("fr");
--- a/umap/static/umap/locale/hr.js
+++ b/umap/static/umap/locale/hr.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Name and description",
-    "Name and description (large)": "Name and description (large)",
    "None": "None",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Popup content template",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Side panel",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("hr", locale);
 L.setLocale("hr");
--- a/umap/static/umap/locale/hu.js
+++ b/umap/static/umap/locale/hu.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Felirat iránya",
    "Label key": "Felirathoz használt kulcs",
    "Labels are clickable": "Kattintható feliratok",
-    "Name and description": "Név és leírás",
-    "Name and description (large)": "Név és leírás (nagy)",
    "None": "Semmi",
    "On the bottom": "Lent",
    "On the left": "Balra",
    "On the right": "Jobbra",
    "On the top": "Fent",
    "Popup content template": "Előugró tartalom sablonja",
-    "Popup style": "Előugrás stílusa",
    "Set symbol": "Szimbólum megadása",
    "Side panel": "Oldalsó panel",
    "Simplify": "Egyszerűsítés",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} mérföld",
-    "{distance} yd": "{distance} yard"
+    "{distance} yd": "{distance} yard",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("hu", locale);
 L.setLocale("hu");
--- a/umap/static/umap/locale/it.js
+++ b/umap/static/umap/locale/it.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Nome e descrizione",
-    "Name and description (large)": "Nome e descrizione (lunga)",
    "None": "Nulla",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Template del contenuto del popup",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Pannello laterale",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("it", locale);
 L.setLocale("it");
--- a/umap/static/umap/locale/ja.js
+++ b/umap/static/umap/locale/ja.js
@ -40,19 +40,16 @@ var locale = {
    "Label direction": "ラベルの位置",
    "Label key": "ラベル表示するキー",
    "Labels are clickable": "ラベルをクリックしてポップアップを表示",
-    "Name and description": "名称・概要",
-    "Name and description (large)": "名称・概要 (大)",
    "None": "なし",
    "On the bottom": "下寄せ",
    "On the left": "左寄せ",
    "On the right": "右寄せ",
    "On the top": "上寄せ",
    "Popup content template": "ポップアップコンテンツのテンプレート",
-    "Popup style": "ポップアップスタイル",
-    "Set symbol": "Set symbol",
+    "Set symbol": "シンボルを設定",
    "Side panel": "サイドパネル",
    "Simplify": "簡略化",
-    "Symbol or url": "Symbol or url",
+    "Symbol or url": "シンボルまたはURL",
    "Table": "テーブル",
    "always": "常時",
    "clear": "クリア",
@ -72,7 +69,7 @@ var locale = {
    "never": "表示しない",
    "new window": "新規ウィンドウ",
    "no": "いいえ",
-    "on hover": "on hover",
+    "on hover": "ホバー時",
    "opacity": "透過度",
    "parent window": "親ウィンドウ",
    "stroke": "ストローク",
@ -106,7 +103,7 @@ var locale = {
    "Are you sure you want to delete this map?": "本当にこのマップを削除してよいですか？",
    "Are you sure you want to delete this property on all the features?": "すべての地物からこのプロパティを削除します。よろしいですか？",
    "Are you sure you want to restore this version?": "本当にこのバージョンを復元してよいですか？",
-    "Attach the map to my account": "Attach the map to my account",
+    "Attach the map to my account": "マップを自分のアカウントに関連付ける",
    "Auto": "自動",
    "Autostart when map is loaded": "マップ読み込み時に自動で開始",
    "Bring feature to center": "この地物を中心に表示",
@ -155,7 +152,7 @@ var locale = {
    "Disable editing": "編集を終了",
    "Display measure": "Display measure",
    "Display on load": "読み込み時に表示",
-    "Download": "Download",
+    "Download": "ダンロード",
    "Download data": "データダウンロード",
    "Drag to reorder": "ドラッグして並べ替える",
    "Draw a line": "ラインを描く",
@ -220,18 +217,18 @@ var locale = {
    "Make main shape": "メインシェイプを作成",
    "Manage layers": "レイヤ管理",
    "Map background credits": "背景地図クレジット",
-    "Map has been attached to your account": "Map has been attached to your account",
+    "Map has been attached to your account": "あなたのアカウントにマップが関連付けられました",
    "Map has been saved!": "地図の保存完了",
    "Map user content has been published under licence": "マップユーザコンテンツのライセンス",
-    "Map's editors": "Map's editors",
-    "Map's owner": "Map's owner",
+    "Map's editors": "マップの編集者",
+    "Map's owner": "マップの所有者",
    "Merge lines": "ラインを結合",
    "More controls": "詳細操作パネル",
    "Must be a valid CSS value (eg.: DarkBlue or #123456)": "CSSで有効な値を指定してください (例: DarkBlue, #123456など)",
    "No licence has been set": "ライセンス指定がありません",
    "No results": "検索結果なし",
    "Only visible features will be downloaded.": "表示中の地物のみがダウンロードされます。",
-    "Open download panel": "Open download panel",
+    "Open download panel": "ダウンロードパネルを開く",
    "Open link in…": "リンクの開き方",
    "Open this map extent in a map editor to provide more accurate data to OpenStreetMap": "現在表示中の領域をエディタで編集し、より正確なデータをOpenStreetMapへ書き込む",
    "Optional intensity property for heatmap": "ヒートマップ強調表示オプション",
@ -262,11 +259,11 @@ var locale = {
    "Save current edits": "編集内容を保存",
    "Save this center and zoom": "地図中心点とズームレベルを保存",
    "Save this location as new feature": "この場所を新しい地物として保存",
-    "Search a place name": "Search a place name",
+    "Search a place name": "場所の名前を検索",
    "Search location": "地名で検索",
-    "Secret edit link is:<br>{link}": "Secret edit link is:<br>{link}",
+    "Secret edit link is:<br>{link}": "非公開の編集用リンク:<br>{link}",
    "See all": "すべて表示",
-    "See data layers": "See data layers",
+    "See data layers": "データレイヤを見る",
    "See full screen": "フルスクリーン表示",
    "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…",
    "Shape properties": "シェイプ表示プロパティ",
@ -286,7 +283,7 @@ var locale = {
    "Stop slideshow": "スライドショーを停止",
    "Supported scheme": "対応スキーマ",
    "Supported variables that will be dynamically replaced": "対応する動的な変数",
-    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.",
+    "Symbol can be either a unicode caracter or an URL. You can use feature properties as variables: ex.: with \"http://myserver.org/images/{name}.png\", the {name} variable will be replaced by the \"name\" value of each marker.": "シンボルにはユニコード文字やURLを使えます。地物のプロパティを変数として使うこともできます。例: \"http://myserver.org/images/{name}.png\" であれば、{name}の部分はそれぞれのマーカーの\"name\"の値で置き換えられます。",
    "TMS format": "TMSフォーマット",
    "Text color for the cluster label": "クラスタラベルのテキスト色",
    "Text formatting": "テキスト形式",
@ -302,7 +299,7 @@ var locale = {
    "Unable to detect format of file {filename}": "ファイル形式を認識できません {filename}",
    "Untitled layer": "名称未定レイヤ",
    "Untitled map": "名称未定マップ",
-    "Update permissions": "Update permissions",
+    "Update permissions": "権限設定を更新",
    "Update permissions and editors": "権限設定とエディタを更新",
    "Url": "URL",
    "Use current bounds": "現在の表示範囲を利用",
@ -314,8 +311,8 @@ var locale = {
    "Where do we go from here?": "ここからどこへ向かいますか？",
    "Whether to display or not polygons paths.": "ポリゴンの外周線を表示するかどうか",
    "Whether to fill polygons with color.": "ポリゴンを塗りつぶすかどうか",
-    "Who can edit": "Who can edit",
-    "Who can view": "Who can view",
+    "Who can edit": "編集できる人",
+    "Who can view": "閲覧できる人",
    "Will be displayed in the bottom right corner of the map": "地図の右下に表示されます",
    "Will be visible in the caption of the map": "地図の脚注として表示されます",
    "Woops! Someone else seems to have edited the data. You can save anyway, but this will erase the changes made by others.": "おおおっと！ 他の誰かがデータを編集したようです。あなたの編集内容をもう一度保存することもできますが、その場合、他の誰かが行った編集は削除されます。",
@ -343,23 +340,32 @@ var locale = {
    "previous": "前へ",
    "width": "横幅",
    "{count} errors during import: {message}": "インポートで {count} 個のエラー: {message}",
-    "Measure distances": "Measure distances",
+    "Measure distances": "距離を計測",
    "NM": "NM",
-    "kilometers": "kilometers",
+    "kilometers": "キロメートル",
    "km": "km",
-    "mi": "mi",
-    "miles": "miles",
-    "nautical miles": "nautical miles",
-    "{area} acres": "{area} acres",
-    "{area} ha": "{area} ha",
+    "mi": "マイル",
+    "miles": "マイル",
+    "nautical miles": "海里",
+    "{area} acres": "{area} エイカー",
+    "{area} ha": "{area} ヘクタール",
    "{area} m&sup2;": "{area} m&sup2;",
-    "{area} mi&sup2;": "{area} mi&sup2;",
-    "{area} yd&sup2;": "{area} yd&sup2;",
+    "{area} mi&sup2;": "{area} 平方マイル",
+    "{area} yd&sup2;": "{area} 平方ヤード",
    "{distance} NM": "{distance} NM",
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
-    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} miles": "{distance} マイル",
+    "{distance} yd": "{distance} ヤード",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("ja", locale);
 L.setLocale("ja");
--- a/umap/static/umap/locale/lt.js
+++ b/umap/static/umap/locale/lt.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Vardas ir aprašymas",
-    "Name and description (large)": "Pavadinimas ir aprašymas (ilgas)",
    "None": "Nieko",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Popup'o turinio šablonas",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Šoninis skydelis",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("lt", locale);
 L.setLocale("lt");
--- a/umap/static/umap/locale/nl.js
+++ b/umap/static/umap/locale/nl.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Name and description",
-    "Name and description (large)": "Name and description (large)",
    "None": "None",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Popup content template",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Side panel",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("nl", locale);
 L.setLocale("nl");
--- a/umap/static/umap/locale/pl.js
+++ b/umap/static/umap/locale/pl.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Kierunek etykiety",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Nazwa i opis",
-    "Name and description (large)": "Nazwa i opis (duże)",
    "None": "Brak",
    "On the bottom": "Na dole",
    "On the left": "Po lewej",
    "On the right": "Po prawej",
    "On the top": "Na górze",
    "Popup content template": "Szablon treści dymka",
-    "Popup style": "Styl wyskakującego okienka",
    "Set symbol": "Set symbol",
    "Side panel": "Panel boczny",
    "Simplify": "Uprość",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("pl", locale);
 L.setLocale("pl");
--- a/umap/static/umap/locale/pt.js
+++ b/umap/static/umap/locale/pt.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Direção da etiqueta",
    "Label key": "Chave da etiqueta",
    "Labels are clickable": "Etiquetas são clicáveis",
-    "Name and description": "Nome e descrição",
-    "Name and description (large)": "Nome e descrição (extenso)",
    "None": "Nenhum",
    "On the bottom": "No fundo",
    "On the left": "Na esquerda",
    "On the right": "Na direita",
    "On the top": "No topo",
    "Popup content template": "Modelo de conteúdo do popup",
-    "Popup style": "Estilo do popup",
    "Set symbol": "Definir símbolo",
    "Side panel": "Painel lateral",
    "Simplify": "Simplificar",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} milhas",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("pt", locale);
 L.setLocale("pt");
--- a/umap/static/umap/locale/ru.js
+++ b/umap/static/umap/locale/ru.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Направление метки",
    "Label key": "Кнопка метки",
    "Labels are clickable": "Метки можно нажимать",
-    "Name and description": "Название и описание",
-    "Name and description (large)": "Название и описание (большие)",
    "None": "Нет",
    "On the bottom": "Внизу",
    "On the left": "Слева",
    "On the right": "Справа",
    "On the top": "Вверху",
    "Popup content template": "Шаблон всплывающей подсказки",
-    "Popup style": "Стиль всплывающего окна",
    "Set symbol": "Выбрать значок",
    "Side panel": "Боковая панель",
    "Simplify": "Упростить",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} км",
    "{distance} m": "{distance} м",
    "{distance} miles": "{distance} миль",
-    "{distance} yd": "{distance} ярдов"
+    "{distance} yd": "{distance} ярдов",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("ru", locale);
 L.setLocale("ru");
--- a/umap/static/umap/locale/sk_SK.js
+++ b/umap/static/umap/locale/sk_SK.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Orientácia popisu",
    "Label key": "Kľúč popisu",
    "Labels are clickable": "Popis je klikateľný",
-    "Name and description": "Názov a popis",
-    "Name and description (large)": "Názov a popis (veľký)",
    "None": "Žiadny",
    "On the bottom": "V spodnej časti",
    "On the left": "Naľavo",
    "On the right": "Napravo",
    "On the top": "V hornej časti",
    "Popup content template": "Šablóna obsahu bubliny",
-    "Popup style": "Štýl bubliny",
    "Set symbol": "Set symbol",
    "Side panel": "Bočný panel",
    "Simplify": "Zjednodušiť",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("sk_SK", locale);
 L.setLocale("sk_SK");
--- a/umap/static/umap/locale/sl.js
+++ b/umap/static/umap/locale/sl.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Usmerjenost oznake",
    "Label key": "Oznaka",
    "Labels are clickable": "Oznake so klikljive",
-    "Name and description": "Ime in opis",
-    "Name and description (large)": "Ime in opis (veliko)",
    "None": "Brez",
    "On the bottom": "Na dnu",
    "On the left": "Na levi",
    "On the right": "Na desni",
    "On the top": "Na vrhu",
    "Popup content template": "Predloga pojavne vsebine",
-    "Popup style": "Slog pojavnega okna",
    "Set symbol": "Set symbol",
    "Side panel": "Bočno okno",
    "Simplify": "Poenostavi",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("sl", locale);
 L.setLocale("sl");
--- a/umap/static/umap/locale/uk_UA.js
+++ b/umap/static/umap/locale/uk_UA.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Назва та опис",
-    "Name and description (large)": "Назва та опис (розширено)",
    "None": "Ні",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Шаблон спливаючої підказки",
-    "Popup style": "Popup style",
    "Set symbol": "Вибрати значок",
    "Side panel": "Бічна панель",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} км",
    "{distance} m": "{distance} м",
    "{distance} miles": " {distance} миль",
-    "{distance} yd": " {distance} ярдів"
+    "{distance} yd": " {distance} ярдів",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("uk_UA", locale);
 L.setLocale("uk_UA");
--- a/umap/static/umap/locale/vi.js
+++ b/umap/static/umap/locale/vi.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "Name and description",
-    "Name and description (large)": "Name and description (large)",
    "None": "None",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Popup content template",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Side panel",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("vi", locale);
 L.setLocale("vi");
--- a/umap/static/umap/locale/zh.js
+++ b/umap/static/umap/locale/zh.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "Label direction",
    "Label key": "Label key",
    "Labels are clickable": "Labels are clickable",
-    "Name and description": "名称与描述",
-    "Name and description (large)": "Name and description (large)",
    "None": "空",
    "On the bottom": "On the bottom",
    "On the left": "On the left",
    "On the right": "On the right",
    "On the top": "On the top",
    "Popup content template": "Popup content template",
-    "Popup style": "Popup style",
    "Set symbol": "Set symbol",
    "Side panel": "Side panel",
    "Simplify": "Simplify",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("zh", locale);
 L.setLocale("zh");
--- a/umap/static/umap/locale/zh_TW.js
+++ b/umap/static/umap/locale/zh_TW.js
@ -40,15 +40,12 @@ var locale = {
    "Label direction": "標籤方向",
    "Label key": "標籤鍵",
    "Labels are clickable": "標籤可點擊",
-    "Name and description": "名稱與說明",
-    "Name and description (large)": "名稱和敘述(大型)",
    "None": "以上皆非",
    "On the bottom": "在底部",
    "On the left": "在左側",
    "On the right": "在右側",
    "On the top": "在頂部",
    "Popup content template": "彈出內文範本",
-    "Popup style": "彈出視窗樣式",
    "Set symbol": "Set symbol",
    "Side panel": "側邊框",
    "Simplify": "簡化",
@ -359,7 +356,16 @@ var locale = {
    "{distance} km": "{distance} km",
    "{distance} m": "{distance} m",
    "{distance} miles": "{distance} miles",
-    "{distance} yd": "{distance} yd"
+    "{distance} yd": "{distance} yd",
+    "1 day": "1 day",
+    "1 hour": "1 hour",
+    "5 min": "5 min",
+    "Cache proxied request": "Cache proxied request",
+    "No cache": "No cache",
+    "Popup": "Popup",
+    "Popup (large)": "Popup (large)",
+    "Popup content style": "Popup content style",
+    "Popup shape": "Popup shape"
 };
 L.registerLocale("zh_TW", locale);
 L.setLocale("zh_TW");