Update to iD v2.17.3

vendor/assets/iD/iD/img/tnp-sprite.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><symbol viewBox="0 0 48 48" id="tnp-2009223" xmlns="http://www.w3.org/2000/svg"><g data-name="Layer 2"><path d="M3.981 36h12.04a.98.98 0 00.979-.98V17a.98.98 0 00-1.795-.543l-12.04 18.02A.98.98 0 003.982 36zM20 36h23.993A1.004 1.004 0 0045 34.98C44.58 16.6 32.843.764 20.033.001a.992.992 0 00-1.033 1v34A1 1 0 0020 36zM46 39H2a2 2 0 00-2 2 7 7 0 007 7h34a7 7 0 007-7 2 2 0 00-2-2z"/></g></symbol><symbol viewBox="0 0 20 48" id="tnp-2009234" xmlns="http://www.w3.org/2000/svg"><g data-name="Layer 2"><path d="M1 15h18a1 1 0 001-1 6 6 0 00-6-6V4a2 2 0 000-4H6a2 2 0 000 4v4a6 6 0 00-6 6 1 1 0 001 1z"/><rect y="18" width="20" height="4" rx="1" ry="1"/><rect y="25" width="20" height="4" rx="1" ry="1"/><path d="M19 32H1a1 1 0 00-1 1v13a2 2 0 002 2h16a2 2 0 002-2V33a1 1 0 00-1-1z"/></g></symbol><symbol viewBox="0 0 48 48" id="tnp-2009265" xmlns="http://www.w3.org/2000/svg"><path d="M46 26a2 2 0 00-2 2v3l-12-9v-4.52a2.493 2.493 0 00-4-1.973V10.63a3 3 0 00-.212-1.109L25.096.744a1.18 1.18 0 00-2.192 0L20.212 9.52A3 3 0 0020 10.63v4.877a2.493 2.493 0 00-4 1.973V22L4 31v-3a2 2 0 00-4 0v14a2 2 0 004 0v-2l16-4v5l-4.45 3.811a1.868 1.868 0 001.322 3.19l7.117-1 7.14 1a1.868 1.868 0 001.32-3.19L28 41.001v-5l16 4v2a2 2 0 104 0V28a2 2 0 00-2-2z" data-name="Layer 2"/></symbol><symbol viewBox="0 0 22 48" id="tnp-2009541" xmlns="http://www.w3.org/2000/svg"><g data-name="Layer 2"><path d="M0 42.954V46.5a1.5 1.5 0 003 0V45h16v1.5a1.5 1.5 0 003 0V8H0zM17 25a1 1 0 012 0v3a1 1 0 01-2 0zM16 0H6a6 6 0 00-6 6h22a6 6 0 00-6-6z"/></g></symbol><symbol viewBox="0 0 59.987 100" id="tnp-4310" xmlns="http://www.w3.org/2000/svg"><path d="M38.268 14.401v4.597H10.886v-4.597h2.643V1.693C13.529.749 18.477 0 24.57 0s11.029.749 11.029 1.693v12.708h2.669zM51.966 31.458L38.711 22.2H10.677L.886 33.77 0 100h59.635l.352-40.944-8.021-27.598zm-8.554 29.486l-5.208-17.989c-.117-8.574 4.531-8.268 7.435-6.146 2.019 1.497 2.617 4.121 2.617 4.121l2.409 19.818c-3.23 6.628-7.253.196-7.253.196z"/></symbol></svg>
+<?xml version="1.0" encoding="utf-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><symbol viewBox="0 0 48 48" id="tnp-2009223" xmlns="http://www.w3.org/2000/svg"><g data-name="Layer 2"><path d="M3.981 36h12.04a.98.98 0 00.979-.98V17a.98.98 0 00-1.795-.543l-12.04 18.02A.98.98 0 003.982 36zM20 36h23.993A1.004 1.004 0 0045 34.98C44.58 16.6 32.843.764 20.033.001a.992.992 0 00-1.033 1v34A1 1 0 0020 36zM46 39H2a2 2 0 00-2 2 7 7 0 007 7h34a7 7 0 007-7 2 2 0 00-2-2z"/></g></symbol><symbol viewBox="0 0 20 48" id="tnp-2009234" xmlns="http://www.w3.org/2000/svg"><g data-name="Layer 2"><path d="M1 15h18a1 1 0 001-1 6 6 0 00-6-6V4a2 2 0 000-4H6a2 2 0 000 4v4a6 6 0 00-6 6 1 1 0 001 1z"/><rect y="18" width="20" height="4" rx="1" ry="1"/><rect y="25" width="20" height="4" rx="1" ry="1"/><path d="M19 32H1a1 1 0 00-1 1v13a2 2 0 002 2h16a2 2 0 002-2V33a1 1 0 00-1-1z"/></g></symbol><symbol viewBox="0 0 48 48" id="tnp-2009265" xmlns="http://www.w3.org/2000/svg"><path d="M46 26a2 2 0 00-2 2v3l-12-9v-4.52a2.493 2.493 0 00-4-1.973V10.63a3 3 0 00-.212-1.109L25.096.744a1.18 1.18 0 00-2.192 0L20.212 9.52A3 3 0 0020 10.63v4.877a2.493 2.493 0 00-4 1.973V22L4 31v-3a2 2 0 00-4 0v14a2 2 0 004 0v-2l16-4v5l-4.45 3.811a1.868 1.868 0 001.322 3.19l7.117-1 7.14 1a1.868 1.868 0 001.32-3.19L28 41.001v-5l16 4v2a2 2 0 104 0V28a2 2 0 00-2-2z" data-name="Layer 2"/></symbol><symbol viewBox="0 0 22 48" id="tnp-2009541" xmlns="http://www.w3.org/2000/svg"><g data-name="Layer 2"><path d="M0 42.954V46.5a1.5 1.5 0 003 0V45h16v1.5a1.5 1.5 0 003 0V8H0zM17 25a1 1 0 012 0v3a1 1 0 01-2 0zM16 0H6a6 6 0 00-6 6h22a6 6 0 00-6-6z"/></g></symbol><symbol viewBox="0 0 100 100" id="tnp-4306" xmlns="http://www.w3.org/2000/svg"><path d="M91.993 13.647c-32.67-.267-39.726-8.789-53.633-8.789-16.549 0-26.263 4.551-30.43 7.116-3.086 1.66-2.37-1.537-2.37-2.65 0-1.12 1.836-2.207 1.836-2.207 3.828-2.48 13.672-7.448 30.963-7.448 13.932 0 21.002 8.555 53.79 8.789 0 0 2.5-.254 2.5 1.979s-.156 3.21-2.656 3.21zM94.649 96.459c0-2.232-2.5-1.979-2.5-1.979-32.787-.241-39.857-8.789-53.79-8.789-17.292 0-27.135 4.967-30.963 7.447 0 0-1.836 1.088-1.836 2.207 0 1.113-.716 4.311 2.37 2.637 4.167-2.552 13.88-7.103 30.43-7.115 13.907 0 20.963 8.535 53.633 8.802 2.5 0 2.656-.977 2.656-3.21z"/><path d="M94.649 21.056c0-2.233-2.5-1.979-2.5-1.979-32.787-.241-39.857-8.789-53.79-8.789-17.292 0-27.135 4.967-30.963 7.448 0 0-1.836 1.087-1.836 2.207v64.648c0 1.113-.716 4.31 2.37 2.649 4.167-2.571 13.88-7.115 30.43-7.115 13.907 0 20.963 8.521 53.633 8.789 2.5 0 2.656-.977 2.656-3.21V21.056z"/></symbol><symbol viewBox="0 0 59.987 100" id="tnp-4310" xmlns="http://www.w3.org/2000/svg"><path d="M38.268 14.401v4.597H10.886v-4.597h2.643V1.693C13.529.749 18.477 0 24.57 0s11.029.749 11.029 1.693v12.708h2.669zM51.966 31.458L38.711 22.2H10.677L.886 33.77 0 100h59.635l.352-40.944-8.021-27.598zm-8.554 29.486l-5.208-17.989c-.117-8.574 4.531-8.268 7.435-6.146 2.019 1.497 2.617 4.121 2.617 4.121l2.409 19.818c-3.23 6.628-7.253.196-7.253.196z"/></symbol></svg>

vendor/assets/iD/iD/locales/af.json

@@ -281,9 +281,6 @@
                 "description": {
                     "label": "Beskrywing"
                 },
-                "elevation": {
-                    "label": "Hoogte bo seespiëel"
-                },
                 "emergency": {
                     "label": "Noodgeval"
                 },
@@ -310,7 +307,6 @@
                     "label": "Steilte"
                 },
                 "internet_access": {
-                    "label": "Internet Toegang",
                     "options": {
                         "terminal": "Terminaal",
                         "wired": "Bedraad",
@@ -555,9 +551,6 @@
                 "amenity/restaurant": {
                     "name": "Restaurant"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Swembad"
-                },
                 "amenity/taxi": {
                     "name": "Taxi staanplek"
                 },
@@ -966,21 +959,9 @@
                 "railway/disused": {
                     "name": "Ongebruikte spoorweg"
                 },
-                "railway/monorail": {
-                    "name": "Enkelspoorbaan"
-                },
-                "railway/rail": {
-                    "name": "Treinspoor"
-                },
-                "railway/subway": {
-                    "name": "Metro"
-                },
                 "railway/subway_entrance": {
                     "name": "Metro Ingang"
                 },
-                "railway/tram": {
-                    "name": "Trem"
-                },
                 "relation": {
                     "name": "Verhouding"
                 },
@@ -1044,9 +1025,6 @@
                 "shop/farm": {
                     "name": "Padstal"
                 },
-                "shop/fishmonger": {
-                    "name": "Viswinkel"
-                },
                 "shop/florist": {
                     "name": "Bloemiste"
                 },

vendor/assets/iD/iD/locales/ast.json

@@ -16,6 +16,9 @@
                 "description": "Amiesta al mapa restaurantes, monumentos, buzones o otros puntos.",
                 "tail": "Fai click nel mapa p'amestar un puntu."
             },
+            "add_note": {
+                "key": "N"
+            },
             "browse": {
                 "title": "Navegar",
                 "description": "Mover y ampliar el mapa."
@@ -69,7 +72,8 @@
                 "key": "O"
             },
             "orthogonalize": {
-                "title": "Escuadrar"
+                "title": "Escuadrar",
+                "key": "Q"
             },
             "straighten": {
                 "title": "Enderechar",
@@ -252,6 +256,9 @@
                     "create": "Amestada una torga de xiru",
                     "delete": "Desaniciada una torga de xiru"
                 }
+            },
+            "extract": {
+                "key": "E"
             }
         },
         "undo": {
@@ -273,6 +280,9 @@
         "loading_auth": "Coneutando con OpenStreetMap...",
         "report_a_bug": "Informar d'un fallu",
         "help_translate": "Ayudar a traducir",
+        "sidebar": {
+            "key": "`"
+        },
         "feature_info": {
             "hidden_warning": "{count} carauterístiques tapecíes",
             "hidden_details": "Anguaño estes carauterístiques tán tapecíes: {details}"
@@ -284,7 +294,6 @@
             "request_review": "Prestaríame que dalguién revise les mios ediciones.",
             "save": "Xubir",
             "cancel": "Encaboxar",
-            "changes": "{count} cambios",
             "download_changes": "Descargar ficheru osmChange",
             "warnings": "Avisos",
             "modified": "Camudáu",
@@ -302,7 +311,7 @@
         "info_panels": {
             "key": "I",
             "background": {
-                "key": "F",
+                "key": "B",
                 "title": "Fondu",
                 "zoom": "Ampliación",
                 "vintage": "Antigüedá",
@@ -363,6 +372,9 @@
             "locating": "Llocalizando, aguarda..."
         },
         "inspector": {
+            "zoom_to": {
+                "key": "Z"
+            },
             "show_more": "Ver más",
             "view_on_osm": "Ver en openstreetmap.org",
             "new_relation": "Nueva rellación...",
@@ -420,6 +432,9 @@
                     "title": "Datos d'OpenStreetMap"
                 }
             },
+            "highlight_edits": {
+                "key": "G"
+            },
             "map_features": "Elementos del mapa",
             "autohidden": "Estos elementos tapeciéronse automáticamente porque s'amosaríen demasiaos en pantalla. Puedes averate pa editalos.",
             "osmhidden": "Estes carauterístiques tapeciéronse automáticamente porque la capa d'OpenStreetMap ta tapecida."
@@ -487,6 +502,9 @@
                 "tooltip": "Les árees dibúxense col rellenu completu"
             }
         },
+        "preferences": {
+            "key": "P"
+        },
         "save": {
             "title": "Guardar",
             "no_changes": "Nun hai cambios que guardar.",
@@ -528,10 +546,6 @@
             "on_wiki": "{tag} en wiki.osm.org",
             "used_with": "usada con {type}"
         },
-        "zoom": {
-            "in": "Averar",
-            "out": "Alloñar"
-        },
         "cannot_zoom": "Nun puede alloñase más nel mou actual.",
         "full_screen": "Conmutar pantalla completa",
         "mapillary_images": {
@@ -548,7 +562,7 @@
         },
         "help": {
             "title": "Ayuda",
-            "key": "A",
+            "key": "H",
             "help": {
                 "title": "Ayuda",
                 "open_data_h": "Open Data",
@@ -561,6 +575,9 @@
                 "save_h": "Guardar"
             }
         },
+        "issues": {
+            "key": "I"
+        },
         "intro": {
             "done": "fecho",
             "ok": "Aceutar",
@@ -1053,9 +1070,6 @@
                     },
                     "placeholder": "Catenaria, ferrocarril electrificáu..."
                 },
-                "elevation": {
-                    "label": "Altor"
-                },
                 "email": {
                     "label": "Corréu-e",
                     "placeholder": "example@example.com"
@@ -1195,7 +1209,6 @@
                     "label": "Intermitente"
                 },
                 "internet_access": {
-                    "label": "Accesu a Internet",
                     "options": {
                         "no": "Non",
                         "terminal": "Terminal",
@@ -1204,9 +1217,6 @@
                         "yes": "Si"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Accesu a Internet de pagu"
-                },
                 "label": {
                     "label": "Etiqueta"
                 },
@@ -1912,10 +1922,6 @@
                     "name": "Telesquí",
                     "terms": "remonte, arrastre"
                 },
-                "aerialway/gondola": {
-                    "name": "Telecabina",
-                    "terms": "cabina"
-                },
                 "aerialway/magic_carpet": {
                     "name": "Alfombra máxica",
                     "terms": "remonte de cinta rodante"
@@ -2193,9 +2199,6 @@
                 "amenity/recycling_centre": {
                     "name": "Centru de reciclax"
                 },
-                "amenity/register_office": {
-                    "name": "Oficina de rexistru"
-                },
                 "amenity/restaurant": {
                     "name": "Restaurante",
                     "terms": "Chigre, llagar"
@@ -2208,9 +2211,6 @@
                     "name": "Antoxana d'escuela",
                     "terms": "Terrén d'escuela, zona escolar"
                 },
-                "amenity/scrapyard": {
-                    "name": "Chatarrería"
-                },
                 "amenity/shelter": {
                     "name": "Abellugu"
                 },
@@ -2235,9 +2235,6 @@
                     "name": "Estudiu",
                     "terms": "Música,Radio,Televisión"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Piscina"
-                },
                 "amenity/taxi": {
                     "name": "Parada de taxis"
                 },
@@ -2913,9 +2910,6 @@
                 "junction": {
                     "name": "Crucie"
                 },
-                "landuse/allotments": {
-                    "name": "Xardín acomuñáu"
-                },
                 "landuse/aquaculture": {
                     "name": "Acuacultura"
                 },
@@ -2983,15 +2977,9 @@
                     "name": "Base naval",
                     "terms": "Arsenal"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Recorríu d'obstáculos"
-                },
                 "landuse/military/range": {
                     "name": "Campu de tiru"
                 },
-                "landuse/military/training_area": {
-                    "name": "Campu de maniobres"
-                },
                 "landuse/orchard": {
                     "name": "Plantación"
                 },
@@ -3165,9 +3153,6 @@
                 "man_made/gasometer": {
                     "name": "Gasómetru"
                 },
-                "man_made/groyne": {
-                    "name": "Espigón"
-                },
                 "man_made/lighthouse": {
                     "name": "Faru"
                 },
@@ -3465,39 +3450,18 @@
                 "railway/disused": {
                     "name": "Ferrocarril ensin usu"
                 },
-                "railway/funicular": {
-                    "name": "Funicular",
-                    "terms": "Cremallera,Cable"
-                },
                 "railway/level_crossing": {
                     "name": "Pasu a nivel (estrada)"
                 },
-                "railway/monorail": {
-                    "name": "Monocarril"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Ferrocarril de vía estrecha",
-                    "terms": "FEVE,Vía estrecha"
-                },
-                "railway/rail": {
-                    "name": "Carril"
-                },
                 "railway/signal": {
                     "name": "Señal de ferrocarril"
                 },
                 "railway/station": {
                     "name": "Estación de tren"
                 },
-                "railway/subway": {
-                    "name": "Metro"
-                },
                 "railway/subway_entrance": {
                     "name": "Boca del metro"
                 },
-                "railway/tram": {
-                    "name": "Tranvía",
-                    "terms": "Tranvía, tresporte, trole"
-                },
                 "relation": {
                     "name": "Rellación"
                 },
@@ -3613,9 +3577,6 @@
                 "shop/fashion": {
                     "name": "Tienda de moda"
                 },
-                "shop/fishmonger": {
-                    "name": "Pescadería"
-                },
                 "shop/florist": {
                     "name": "Floristería",
                     "terms": "flores, florista, floristería"
@@ -3627,9 +3588,6 @@
                     "name": "Velatoriu",
                     "terms": "Tanatoriu, Funeraria"
                 },
-                "shop/furnace": {
-                    "name": "Fornos"
-                },
                 "shop/furniture": {
                     "name": "Mueblería"
                 },
@@ -4085,10 +4043,47 @@
             }
         },
         "imagery": {
+            "AGIV": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "Imáxenes aérees más nueves de AIV Flandes"
+            },
+            "AGIV10cm": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Flanders 2013-2015  imáxenes aérees de 10cm"
+            },
+            "AGIVFlandersGRB": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Flanders GRB"
+            },
+            "AIV_DHMV_II_HILL_25cm": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Digitaal Hoogtemodel Vlaanderen II, sombráu multidireicional 0,25 m"
+            },
+            "AIV_DHMV_II_SVF_25cm": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Digitaal Hoogtemodel Vlaanderen II, Vista aérea factor 0,25 m"
+            },
             "Bing": {
                 "description": "Imáxenes aerees y de satélite.",
                 "name": "Imáxenes aerees de Bing."
             },
+            "EOXAT2018CLOUDLESS": {
+                "attribution": {
+                    "text": "Sentinel-2 ensin nubes - https://s2maps.eu por EOX IT Services GmbH (Contien datos tresformaos de Copernicus Sentinel 2017 & 2018)"
+                },
+                "description": "Imáxenes de satélite Sentinel post-procesaes.",
+                "name": "eox.at 2018 ensin nubes"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Términos y comentarios "
@@ -4096,7 +4091,17 @@
                 "description": "Imáxenes mundiales Esri.",
                 "name": "Imáxenes mundiales Esri"
             },
+            "EsriWorldImageryClarity": {
+                "attribution": {
+                    "text": "Términos y comentarios "
+                },
+                "description": "Imáxenes del archivu Esri que puen se más clares y más precises que la capa predeterminada.",
+                "name": "Imáxenes mundiales Esri (Clarity) Beta"
+            },
             "MAPNIK": {
+                "attribution": {
+                    "text": "© collaboradores d'OpenStreetMap, CC-BY-SA 2.0"
+                },
                 "description": "La capa predeterminada d'OpenStreetMap.",
                 "name": "OpenStreetMap (Estándar)"
             },
@@ -4149,6 +4154,12 @@
                 },
                 "name": "OSM Inspector: Etiquetáu"
             },
+            "SPW_ORTHO_LAST": {
+                "name": "Imáxenes aérees más nueves de SPW(allonie)"
+            },
+            "SPW_PICC": {
+                "name": "Imáxenes dixitales PICC de SPW(allonie)"
+            },
             "US-TIGER-Roads-2014": {
                 "description": "A nivel d'ampliación 16+, datos del mapa de dominiu públicu dende US Census. A nivel d'ampliación menor, sólo los cambios dende 2006 menos los cambios yá incorporaos a OpenStreetMap",
                 "name": "Estraes TIGER 2014"
@@ -4157,25 +4168,88 @@
                 "description": "Mariellu = Datos del mapa de dominiu públicu dende US Census. Bermeyu = Datos que nun s'alcuentren n'OpenStreetMap",
                 "name": "Estraes TIGER 2017"
             },
+            "US-TIGER-Roads-2018": {
+                "description": "Mariellu = Datos del mapa de dominiu públicu del US Census. Bermeyu = Datos que nun s'alcuentren n'OpenStreetMap",
+                "name": "Estraes TIGER 2018"
+            },
+            "US-TIGER-Roads-2019": {
+                "description": "Mariellu = Datos del mapa de dominiu públicu del US Census. Bermeyu = Datos que nun s'alcuentren n'OpenStreetMap",
+                "name": "Estraes TIGER 2019"
+            },
+            "US_Forest_Service_roads_overlay": {
+                "name": "Capa d'estraes de U.S. Forest"
+            },
+            "UrbISOrtho2016": {
+                "attribution": {
+                    "text": "Fecho por mediu de Brussels UrbIS®© - Distribución & Copyright CIRB"
+                },
+                "name": "UrbIS-Ortho 2016"
+            },
+            "UrbISOrtho2017": {
+                "attribution": {
+                    "text": "Fecho por mediu de Brussels UrbIS®© - Distribución & Copyright CIRB"
+                },
+                "name": "UrbIS-Ortho 2017"
+            },
+            "UrbISOrtho2018": {
+                "attribution": {
+                    "text": "Fecho por mediu de Brussels UrbIS®© - Distribución & Copyright CIRB"
+                },
+                "name": "UrbIS-Ortho 2018"
+            },
+            "UrbISOrtho2019": {
+                "attribution": {
+                    "text": "Fecho por mediu de Brussels UrbIS®© - Distribución & Copyright CIRB"
+                },
+                "name": "UrbIS-Ortho 2019"
+            },
+            "UrbisAdmFR": {
+                "attribution": {
+                    "text": "Fecho por mediu de Brussels UrbIS®© - Distribución & Copyright CIRB"
+                },
+                "name": "UrbisAdm FR"
+            },
+            "UrbisAdmNL": {
+                "attribution": {
+                    "text": "Fecho por mediu de Brussels UrbIS®© - Distribución & Copyright CIRB"
+                },
+                "name": "UrbisAdm NL"
+            },
             "Waymarked_Trails-Cycling": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, Collaboradores d'OpenStreetMap, CC by-SA 3.0"
+                },
                 "name": "Rutes marcaes: Ciclismu"
             },
             "Waymarked_Trails-Hiking": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, Collaboradores d'OpenStreetMap, CC by-SA 3.0"
+                },
                 "name": "Rutes marcaes: Escursionismu"
             },
             "Waymarked_Trails-MTB": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, Collaboradores d'OpenStreetMap, CC by-SA 3.0"
+                },
                 "name": "Rutes marcaes: BTT"
             },
             "Waymarked_Trails-Skating": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, Collaboradores d'OpenStreetMap, CC by-SA 3.0"
+                },
                 "name": "Rutes marcaes: Patinaxe"
             },
             "Waymarked_Trails-Winter_Sports": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, Collaboradores d'OpenStreetMap, CC by-SA 3.0"
+                },
                 "name": "Rutes marcaes: Deportes d'iviernu"
             },
             "basemap.at": {
                 "attribution": {
                     "text": "basemap.at"
                 },
+                "description": "Mapa base d 'Austria, basáu en datos gubernamentales.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -4185,6 +4259,37 @@
                 "description": "Capa d'ortofotos proporcionada por basemap.at «Socesor» de les imáxenes de geoimage.at.",
                 "name": "Ortofoto de basemap.at"
             },
+            "basemap.at-overlay": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Capa d'anotaciones proporcionada por basemap.at.",
+                "name": "Capa basemap.at"
+            },
+            "eufar-balaton": {
+                "attribution": {
+                    "text": "Ortofotó EUFAR Balaton 2010"
+                }
+            },
+            "finds.jp_KBN_2500": {
+                "attribution": {
+                    "text": "GSI KIBAN 2500"
+                },
+                "description": "GSI Kiban 2500 via finds.jp. Bonu pa dibuxar, anque daqué más antiguu.",
+                "name": "GSI KIBAN 2500 del Xapón"
+            },
+            "gothenburg-citymap": {
+                "attribution": {
+                    "text": "© conceyu de Gotemburgu, CC0"
+                },
+                "description": "El mapa de la ciudá ye un mapa de supervisión que describe Gotemburgu. Contien información xeneral sobro'l terrén, comunicaciones, hidrografía, edificios, númberos de direición y nomes de calles, divisiones alministratives y otros testos d'orientación.",
+                "name": "Mapa de la Ciudá de Gotemburgu"
+            },
+            "gsi.go.jp_airphoto": {
+                "attribution": {
+                    "text": "GSI Xapón"
+                }
+            },
             "mapbox_locator_overlay": {
                 "attribution": {
                     "text": "Términos y comentarios "
@@ -4246,6 +4351,16 @@
             }
         },
         "community": {
+            "Bahia-telegram": {
+                "name": "Grupu de Telegram OpenStreetMap Bahia",
+                "description": "Xunite a la comunidá OpenStreetMap Bahia en Telegram",
+                "extendedDescription": "Xúnite a la comunidá pa saber más sobro OpenStreetMap, facer entrugues o participar nos nuesos alcuentros. ¡Tol mundu ye bienveníu!"
+            },
+            "DF-telegram": {
+                "name": "Grupu de Telegram OpenStreetMap Brasília",
+                "description": "Xunite a la comunidá OpenStreetMap Brasília en Telegram",
+                "extendedDescription": "Xúnite a la comunidá pa saber más sobro OpenStreetMap, facer entrugues o participar nos nuesos alcuentros. ¡Tol mundu ye bienveníu!"
+            },
             "OSM-ES-mailinglist": {
                 "name": "Llista de corréu Talk-es",
                 "description": "Llista de corréu p'alderiques sobro OpenStreetMap n'España"

vendor/assets/iD/iD/locales/be.json

@@ -257,10 +257,6 @@
             "no_changes": "Правак для захавання няма .",
             "unsaved_changes": "У вас ёсць незахаваныя праўкі"
         },
-        "zoom": {
-            "in": "Наблізіць",
-            "out": "Аддаліць"
-        },
         "help": {
             "title": "Даведка",
             "help": {

vendor/assets/iD/iD/locales/bg.json

@@ -344,7 +344,6 @@
             "request_review": "Бих желал някой да прегледа моите промени.",
             "save": "Качи",
             "cancel": "Отказ",
-            "changes": "{count} промени",
             "download_changes": "Свалете osmChange файл",
             "warnings": "Предупреждения",
             "modified": "Променени",
@@ -622,10 +621,6 @@
             "on_wiki": "{tag} в wiki.osm.org",
             "used_with": "използва се с {type}"
         },
-        "zoom": {
-            "in": "Навътре",
-            "out": "Навън"
-        },
         "cannot_zoom": "Не можете да намалявате повече в текущия режим.",
         "full_screen": "Превключи на Цял Екран",
         "mapillary_images": {
@@ -651,8 +646,7 @@
                 "before_start_h": "Преди да започнете",
                 "before_start": "Трябва да сте запознати с OpenStreetMap и този редактор преди да започнете да редактирате. iD съдържа въвеждащ урок за основните неща при редактирането на OpenStreetMap. Кликнете на \"Стартирай въведението\" на този екран, за да започнете урока - отнема само около 15 минути.",
                 "open_source_h": "Отворен код",
-                "open_source": "Редакторът iD е съвместен проект с отворен код и в момента използвате издание {version}. Изходният код е наличен [в GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Може да помогнете на iD с [превод] (https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) или [докладване на бъгове](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "Редакторът iD е съвместен проект с отворен код и в момента използвате издание {version}. Изходният код е наличен [в GitHub](https://github.com/openstreetmap/iD)."
             },
             "overview": {
                 "title": "Преглед",
@@ -1184,9 +1178,6 @@
                     },
                     "placeholder": "Контактна мрежа, контактна релса"
                 },
-                "elevation": {
-                    "label": "Надморска височина"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "example@example.com"
@@ -1326,7 +1317,6 @@
                     "label": "Пресъхващ"
                 },
                 "internet_access": {
-                    "label": "Интернет достъп",
                     "options": {
                         "no": "Не",
                         "terminal": "Терминал",
@@ -1335,9 +1325,6 @@
                         "yes": "Да"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Такса за достъп до интернет"
-                },
                 "kerb": {
                     "label": "Бордюр"
                 },
@@ -1877,9 +1864,6 @@
                 "amenity/restaurant": {
                     "name": "Ресторант"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Плувен басейн"
-                },
                 "amenity/taxi": {
                     "name": "Такси стоянка"
                 },
@@ -2270,21 +2254,9 @@
                 "railway/disused": {
                     "name": "Закрита железопътна линия"
                 },
-                "railway/monorail": {
-                    "name": "Монорелсов път"
-                },
-                "railway/rail": {
-                    "name": "ЖП линия"
-                },
-                "railway/subway": {
-                    "name": "Метро"
-                },
                 "railway/subway_entrance": {
                     "name": "Вход на метростанция"
                 },
-                "railway/tram": {
-                    "name": "Трамвайни релси"
-                },
                 "relation": {
                     "name": "Релация"
                 },
@@ -2351,9 +2323,6 @@
                 "shop/farm": {
                     "name": "Щанд за плодове и зеленчуци"
                 },
-                "shop/fishmonger": {
-                    "name": "Магазин за риба"
-                },
                 "shop/florist": {
                     "name": "Магазин за цветя"
                 },

vendor/assets/iD/iD/locales/bn.json

@@ -204,7 +204,6 @@
             "title": "ওপেনস্ট্রীটম্যাপে আপলোড করুন",
             "save": "আপলোড করুন",
             "cancel": "বাতিল করুন",
-            "changes": "{count}টি পরিবর্তন",
             "warnings": "সতর্কতা",
             "modified": "পরিবর্তিত",
             "deleted": "মুছে ফেলা হয়েছে",
@@ -258,9 +257,6 @@
             "title": "আমার অবস্থানটি দেখান"
         },
         "inspector": {
-            "zoom_to": {
-                "title": "এটিতে জুম করুন"
-            },
             "show_more": "আরো দেখান",
             "view_on_osm": "openstreetmap.org-এ দেখুন",
             "new_relation": "নতুন সম্পর্ক...",
@@ -360,10 +356,6 @@
             "on_wiki": "wiki.osm.org-এ {tag}",
             "used_with": "{type}-এর সাথে ব্যবহার করা হয়"
         },
-        "zoom": {
-            "in": "জুম করুন",
-            "out": "জুম থেকে বাহির হোন"
-        },
         "cannot_zoom": "বর্তমান মোডে আরও জুম আউট করা যাবে না।",
         "help": {
             "title": "সাহায্য",
@@ -555,9 +547,6 @@
                 "description": {
                     "label": "বর্ননা"
                 },
-                "elevation": {
-                    "label": "উচ্চতা"
-                },
                 "emergency": {
                     "label": "জরুরি"
                 },
@@ -614,7 +603,6 @@
                     "label": "ধরন"
                 },
                 "internet_access": {
-                    "label": "ইন্টারনেট সুবিধা",
                     "options": {
                         "no": "না",
                         "terminal": "টার্মিনাল",
@@ -838,9 +826,6 @@
                 "amenity/restaurant": {
                     "name": "রেস্তোরাঁ"
                 },
-                "amenity/swimming_pool": {
-                    "name": "সাঁতার কাটার পুকুর"
-                },
                 "amenity/telephone": {
                     "name": "টেলিফোন"
                 },
@@ -1105,21 +1090,9 @@
                 "railway/disused": {
                     "name": "অব্যবহৃত রেলপথ"
                 },
-                "railway/monorail": {
-                    "name": "মনোরেল"
-                },
-                "railway/rail": {
-                    "name": "রেল"
-                },
-                "railway/subway": {
-                    "name": "ভূতলপথ"
-                },
                 "railway/subway_entrance": {
                     "name": "ভূতলপথ দ্বার"
                 },
-                "railway/tram": {
-                    "name": "ট্রাম"
-                },
                 "relation": {
                     "name": "সম্পর্ক"
                 },
@@ -1162,9 +1135,6 @@
                 "shop/electronics": {
                     "name": "ইলেকট্রনিক্স-এর দোকান"
                 },
-                "shop/fishmonger": {
-                    "name": "মৎস্য ব্যবসায়ী"
-                },
                 "shop/florist": {
                     "name": "ফুল ব্যবসায়ী"
                 },

vendor/assets/iD/iD/locales/bs.json

@@ -376,9 +376,6 @@
                 "description": {
                     "label": "Opis"
                 },
-                "elevation": {
-                    "label": "Nadmorska visina"
-                },
                 "emergency": {
                     "label": "Hitna"
                 },
@@ -421,7 +418,6 @@
                     "label": "Vrsta"
                 },
                 "internet_access": {
-                    "label": "Internet pristup",
                     "options": {
                         "terminal": "Terminal",
                         "wired": "Kablovski",
@@ -589,9 +585,6 @@
                     "name": "Adresa",
                     "terms": "adresa,prebivalište"
                 },
-                "aerialway/gondola": {
-                    "name": "Gondola"
-                },
                 "aeroway/aerodrome": {
                     "name": "Aerodrom",
                     "terms": "aerodrom,zračna luka"
@@ -748,9 +741,6 @@
                 "amenity/studio": {
                     "name": "Studio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Bazen"
-                },
                 "amenity/taxi": {
                     "name": "Taxi stajalište",
                     "terms": "taxi štand,taxi stajalište"
@@ -1472,26 +1462,10 @@
                     "name": "Nekorištena željeznica",
                     "terms": "nekorištena željeznička pruga,nekorištena željeznica"
                 },
-                "railway/monorail": {
-                    "name": "Pruga sa jednim kolosijekom",
-                    "terms": "pruga sa jednim kolosijekom,jednošinska pruga"
-                },
-                "railway/rail": {
-                    "name": "Šina",
-                    "terms": "šine,šinski put"
-                },
-                "railway/subway": {
-                    "name": "Podzemna željeznica",
-                    "terms": "podzemna željeznica,metro"
-                },
                 "railway/subway_entrance": {
                     "name": "Ulaz u podzemnu željeznicu",
                     "terms": "ulaz u podzemnu željeznicu, ulaz podzemne željeznice"
                 },
-                "railway/tram": {
-                    "name": "Tramvaj",
-                    "terms": "tramvaj,električni tramvaj"
-                },
                 "relation": {
                     "name": "Relacija",
                     "terms": "relacija,odnos objekata u skupu"
@@ -1575,9 +1549,6 @@
                     "name": "Štand proizvodnje",
                     "terms": "štand proizvodnje,štand proizvođača"
                 },
-                "shop/fishmonger": {
-                    "name": "Ribarnica"
-                },
                 "shop/florist": {
                     "name": "Cvjećar",
                     "terms": "cvjećara,radnja za prodaju cvijeća"

vendor/assets/iD/iD/locales/ckb.json

@@ -67,7 +67,6 @@
             "title": "بەرزکردنەوە بۆ OpenStreetMap",
             "request_review": "پێم باشە کەسێک پێداچوونەوە بە دەستکارییکانم بکات.",
             "cancel": "پاشگەزبوونەوە",
-            "changes": "{count} دەستکاری",
             "warnings": "ئاگادارکردنەوەکان",
             "deleted": "سڕایەوە",
             "created": "دروستکرا",
@@ -545,9 +544,6 @@
                         "no": "نەخێر"
                     }
                 },
-                "elevation": {
-                    "label": "بەرزی"
-                },
                 "entrance": {
                     "label": "جۆر"
                 },
@@ -940,9 +936,6 @@
                 "amenity/studio": {
                     "name": "ستۆدیۆ"
                 },
-                "amenity/swimming_pool": {
-                    "name": "حەزی مەلەوانی"
-                },
                 "amenity/telephone": {
                     "name": "تەلەفۆن"
                 },

vendor/assets/iD/iD/locales/cy.json

@@ -214,15 +214,11 @@
                     "label": "Arysgrif"
                 },
                 "internet_access": {
-                    "label": "Mynediad Rhyngrwyd",
                     "options": {
                         "no": "Na",
                         "yes": "Ia"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Tâl Mynediad Rhyngrwyd"
-                },
                 "label": {
                     "label": "Label"
                 },

vendor/assets/iD/iD/locales/dv.json

@@ -222,9 +222,6 @@
                 "generator/source": {
                     "label": "ޗާޓަށް މައުލޫމާތު ދިން ފަރާތް"
                 },
-                "internet_access": {
-                    "label": "އިންްޓަރނެޓް ލިބޭތޯ ނުވަތަ ނޫންތޯ"
-                },
                 "lanes": {
                     "label": "ގޯޅިތަކުގެ އަދަދު"
                 },

vendor/assets/iD/iD/locales/el.json

@@ -304,7 +304,6 @@
             "request_review": "Θα ήθελα κάποιος να ελέγξει τις επεξεργασίες μου.",
             "save": "Μεταφόρτωση",
             "cancel": "Ακύρωση",
-            "changes": "{count} Αλλαγές",
             "download_changes": "Κατεβάστε το αρχείο osmChange",
             "errors": "Σφάλματα",
             "warnings": "Προειδοποιήσεις",
@@ -387,9 +386,6 @@
             "locating": "Εντοπισμός, παρακαλώ περιμένετε..."
         },
         "inspector": {
-            "zoom_to": {
-                "title": "Εστίαση σε "
-            },
             "show_more": "Εμφάνιση Περισσότερων",
             "view_on_osm": "Προβολή στο openstreetmap.org",
             "new_relation": "Νέα σχέση...",
@@ -583,10 +579,6 @@
             "on_wiki": "{tag} στο wiki.osm.org",
             "used_with": "χρησιμοποιείται με {type}"
         },
-        "zoom": {
-            "in": "Μεγέθυνση",
-            "out": "Απομάκρυνση"
-        },
         "cannot_zoom": "Δεν είναι δυνατή μεγαλύτερη σμίκρυνση στην τρέχουσα κατάσταση λειτουργίας.",
         "full_screen": "Αλλάξτε σε Πλήρη Οθόνη",
         "streetside": {
@@ -624,8 +616,7 @@
                 "before_start_h": "Πριν ξεκινήσετε",
                 "before_start": "Θα πρέπει να είστε εξοικειωμένοι με το OpenStreetMap και αυτόν τον επεξεργαστή πριν ξεκινήσετε την επεξεργασία. Το iD περιέχει μια καθοδήγηση για να σας διδάξει τα βασικά της επεξεργασίας του OpenStreetMap. Κάντε κλικ στο \"Εκκίνηση της Καθοδήγησης\" σε αυτήν την οθόνη για να πάρετε το μάθημα - χρειάζονται μόνο 15 λεπτά περίπου.",
                 "open_source_h": "Ανοιχτά Δεδομένα",
-                "open_source": "Ο επεξεργαστής iD είναι ένα συλλογικό έργο ανοιχτού κώδικα και τώρα χρησιμοποιείτε την έκδοση {version}. Ο πηγαίος κώδικας είναι διαθέσιμος [στο GitHub] (https://github.com/openstreetmap/iD).",
-                "open_source_help": "Μπορείτε να βοηθήσετε την iD με την [μετάφραση] (https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) ή [αναφορά σφαλμάτων] (https://github.com/openstreetmap/iD/issues )."
+                "open_source": "Ο επεξεργαστής iD είναι ένα συλλογικό έργο ανοιχτού κώδικα και τώρα χρησιμοποιείτε την έκδοση {version}. Ο πηγαίος κώδικας είναι διαθέσιμος [στο GitHub] (https://github.com/openstreetmap/iD)."
             },
             "overview": {
                 "title": "Επισκόπηση",
@@ -1352,6 +1343,9 @@
                         "onsen": "Ιαπωνική Onsen"
                     }
                 },
+                "beauty": {
+                    "label": "Υπηρεσίες"
+                },
                 "bench": {
                     "label": "Παγκάκι"
                 },
@@ -1414,6 +1408,10 @@
                     "label": "Κτίριο",
                     "terms": "Κτίριο, Κτήριο, Οικοδόμημα"
                 },
+                "building/levels": {
+                    "label": "Επίπεδα",
+                    "placeholder": "2, 4, 6..."
+                },
                 "building/levels/underground": {
                     "label": "Υπόγεια Επίπεδα",
                     "placeholder": "2, 4, 6..."
@@ -1473,7 +1471,8 @@
                     "placeholder": "1 EUR, 5 USD, 10 JPY…"
                 },
                 "check_date": {
-                    "label": "Πρόσφατη Ημερομηνία Ελέγχου"
+                    "label": "Πρόσφατη Ημερομηνία Ελέγχου",
+                    "placeholder": "ΕΕΕΕ-ΜΜ-ΗΗ"
                 },
                 "clothes": {
                     "label": "Ρούχα"
@@ -1763,9 +1762,6 @@
                     },
                     "placeholder": "Γραμμή επαφής, Ηλεκτροδοτούμενος Σιδηρόδρομος..."
                 },
-                "elevation": {
-                    "label": "Υψόμετρο"
-                },
                 "email": {
                     "label": "Διεύθυνση Ηλεκτρονικού Ταχυδρομείου",
                     "placeholder": "example@example.com"
@@ -1867,6 +1863,9 @@
                 "fuel_multi": {
                     "label": "Είδη Καυσίμων"
                 },
+                "gambling": {
+                    "label": "Παίγνια"
+                },
                 "gauge": {
                     "label": "Διάμετρος"
                 },
@@ -1898,6 +1897,9 @@
                 "grape_variety": {
                     "label": "Ποικιλία Αμπελιού"
                 },
+                "group_only": {
+                    "label": "Μόνο Ομάδες"
+                },
                 "guest_house": {
                     "label": "Τύπος"
                 },
@@ -1982,6 +1984,9 @@
                         "undefined": "Όχι"
                     }
                 },
+                "hot_water": {
+                    "label": "Καυτό Νερό"
+                },
                 "iata": {
                     "label": "Κωδικός Αεροδρομίου IATA"
                 },
@@ -2024,18 +2029,13 @@
                     "label": "Διακοπτόμενη"
                 },
                 "internet_access": {
-                    "label": "Πρόσβαση στο διαδίκτυο",
                     "options": {
                         "no": "Όχι",
                         "terminal": "Τερματικό",
                         "wired": "Ενσύρματο δίκτυο",
                         "wlan": "Ασύρματο Δίκτυο",
                         "yes": "Ναι"
-                    },
-                    "terms": "Δωρεάν Πρόσβαση στο Διαδίκτυο, Ελεύθερη Πρόσβαση στο Διαδίκτυο"
-                },
-                "internet_access/fee": {
-                    "label": "Κώμιστρο Πρόσβασης στο Διαδίκτυο"
+                    }
                 },
                 "internet_access/ssid": {
                     "label": "Όνομα Ασύρματου Δικτύου"
@@ -2186,7 +2186,7 @@
                     "placeholder": "40, 50, 60..."
                 },
                 "maxspeed/advisory": {
-                    "label": "Προειδοποιητικό Όριο Ταχύτητας",
+                    "label": "Συνιστώμενο Όριο Ταχύτητας",
                     "placeholder": "40, 50, 60..."
                 },
                 "maxstay": {
@@ -2250,6 +2250,9 @@
                     },
                     "placeholder": "0, 1, 2, 3..."
                 },
+                "museum": {
+                    "label": "Τύπος"
+                },
                 "name": {
                     "label": "Όνομα",
                     "placeholder": "Κοινό όνομα (αν υπάρχει)"
@@ -2325,8 +2328,12 @@
                         "yes": "Ναι"
                     }
                 },
+                "openfire": {
+                    "label": "Επιτρέπονται οι ανοικτές εστίες φωτιάς"
+                },
                 "opening_date": {
-                    "label": "Αναμενόμενη Ημερομηνία Λειτουργίας "
+                    "label": "Αναμενόμενη Ημερομηνία Λειτουργίας ",
+                    "placeholder": "ΕΕΕΕ-ΜΜ-ΗΗ"
                 },
                 "opening_hours": {
                     "label": "Ωράριο",
@@ -2335,6 +2342,9 @@
                 "operator": {
                     "label": "Διαχειριστής"
                 },
+                "operator/type": {
+                    "label": "Τύπος Χειριστή"
+                },
                 "outdoor_seating": {
                     "label": "Εξωτερικά Καθίσματα"
                 },
@@ -2463,6 +2473,9 @@
                     "label": "Ισχύς Εξόδου",
                     "placeholder": "500 MW, 1000 MW, 2000 MW..."
                 },
+                "plant/source": {
+                    "label": "Πηγή Ενέργειας"
+                },
                 "playground": {
                     "label": "Τύπος"
                 },
@@ -2494,7 +2507,10 @@
                     "label": "Τύπος"
                 },
                 "pump": {
-                    "label": "Τρόμπα"
+                    "label": "Τρόμπα",
+                    "options": {
+                        "manual": "Τουλούμπα"
+                    }
                 },
                 "railway": {
                     "label": "Είδος"
@@ -3201,9 +3217,6 @@
                 "aerialway/drag_lift": {
                     "name": "Αναβατήρας"
                 },
-                "aerialway/gondola": {
-                    "name": "Γόνδολα"
-                },
                 "aerialway/goods": {
                     "name": "Τελεφερίκ Αγαθών"
                 },
@@ -3456,6 +3469,9 @@
                     "name": "Βενζινάδικο",
                     "terms": "Σταθμός καυσίμων, Πρατήριο καυσίμων"
                 },
+                "amenity/gambling": {
+                    "name": "Αίθουσα Τυχερών Παιγνίων για Διασκέδαση"
+                },
                 "amenity/grave_yard": {
                     "name": "Κοιμητήριο",
                     "terms": "Νεκροταφείο"
@@ -3612,9 +3628,6 @@
                 "amenity/recycling_container": {
                     "name": "Κάδος Ανακύκλωσης"
                 },
-                "amenity/register_office": {
-                    "name": "Ληξιαρχείο"
-                },
                 "amenity/restaurant": {
                     "name": "Εστιατόριο / Ταβέρνα",
                     "terms": "Εστιατόριο, Ταβέρνα, Μεζεδοπωλείο, Μαγειρείο, Οινομαγειρείο, ρεστοράν, κουτούκι, πιτσαρία, σουβλατζίδικο, φαγάδικο, φαγητό"
@@ -3677,9 +3690,6 @@
                     "name": "Χώρος Σχολείου",
                     "terms": "σχολείο, δημοτικό, γυμνάσιο, λύκειο"
                 },
-                "amenity/scrapyard": {
-                    "name": "Μάντρα"
-                },
                 "amenity/shelter": {
                     "name": "Στέγαστρο"
                 },
@@ -3705,7 +3715,7 @@
                     "name": "Κοινωνικό Κέντρο"
                 },
                 "amenity/social_facility": {
-                    "name": "Μονάδα Κοινωνικών Παροχών"
+                    "name": "Μονάδα Κοινωνικών Υπηρεσιών"
                 },
                 "amenity/social_facility/food_bank": {
                     "name": "Τράπεζα Τροφίμων"
@@ -3735,9 +3745,6 @@
                 "amenity/studio/video": {
                     "name": "Κινηματογραφικό Studio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Πισίνα"
-                },
                 "amenity/taxi": {
                     "name": "Πιάτσα Ταξί",
                     "terms": "Ταξιτζήδες, Πιάτσα ταξί"
@@ -4788,9 +4795,6 @@
                 "junction": {
                     "name": "Κόμβος"
                 },
-                "landuse/allotments": {
-                    "name": "Κοινωτικοί Κήποι"
-                },
                 "landuse/aquaculture": {
                     "name": "Ιχθυοτροφείο",
                     "terms": "Ιχθυοκαλλιέργεια"
@@ -4882,17 +4886,10 @@
                     "name": "Ναυτική Βάση",
                     "terms": "Ναυτική Βάση"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Εμπόδιο Διαδρομής"
-                },
                 "landuse/military/range": {
                     "name": "Στρατιωτικό Πεδίο Βολής",
                     "terms": "Στρατιωτικό Πεδίο Βολής"
                 },
-                "landuse/military/training_area": {
-                    "name": "Περιοχή Εξάσκησης",
-                    "terms": "Περιοχή Εξάσκησης, Χώρος Εξάσκησης σε συγκεκριμένη δραστηριότητα - άθλημα - δεξιότητα"
-                },
                 "landuse/orchard": {
                     "name": "Περιβόλι",
                     "terms": "Οπωρώνας, Περιβόλι"
@@ -5171,21 +5168,12 @@
                 "leisure/track/cycling": {
                     "name": "Ποδηλατική Πίστα"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Ποδηλατική Πίστα"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Πίστα Ιπποδρομιών"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Πίστα Ιπποδρομιών"
-                },
                 "leisure/track/running": {
                     "name": "Στίβος"
                 },
-                "leisure/track/running_point": {
-                    "name": "Στίβος"
-                },
                 "leisure/water_park": {
                     "name": "Νεροτσουλήθρες"
                 },
@@ -5232,9 +5220,6 @@
                 "man_made/gasometer": {
                     "name": "Αεριόμετρο"
                 },
-                "man_made/groyne": {
-                    "name": "Λιμενοβραχίονας"
-                },
                 "man_made/lighthouse": {
                     "name": "Φάρος",
                     "terms": "Φάρος"
@@ -5356,6 +5341,9 @@
                     "name": "Εργοστάσιο",
                     "terms": "Εργοστάσιο, Φάμπρικα"
                 },
+                "military/bunker": {
+                    "name": "Στρατιωτικό Φυλάκιο-Πολυβολείο"
+                },
                 "military/office": {
                     "name": "Στρατολογικό Γραφείο"
                 },
@@ -5878,9 +5866,6 @@
                 "railway/disused": {
                     "name": "Σιδηροτροχιά εκτός Χρήσης"
                 },
-                "railway/funicular": {
-                    "name": "Τελεφερίκ"
-                },
                 "railway/halt": {
                     "name": "Σιδηροδρομικός Σταθμός ( Σε Παραγγελία Στάσης )"
                 },
@@ -5890,29 +5875,15 @@
                 "railway/milestone": {
                     "name": "Σιδηροδρομικό Χιλιομετρικό Σημείο"
                 },
-                "railway/miniature": {
-                    "name": "Μινιατούρα Σιδηρόδρομου"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Σιδηροτροχιά Στενού Εύρους"
-                },
                 "railway/platform": {
                     "name": "Αποβάθρα Τρένου δίπλα στη διαδρομή"
                 },
-                "railway/rail": {
-                    "name": "Σιδηροδρομική Γραμμή",
-                    "terms": "Σιδηροτροχιά, Ράγα"
-                },
                 "railway/signal": {
                     "name": "Σιδηροδρομικό Σήμα"
                 },
                 "railway/station": {
                     "name": "Σταθμός Τρένου δίπλα στη διαδρομή"
                 },
-                "railway/subway": {
-                    "name": "Μετρό",
-                    "terms": "Μετρό, Υπόγειος Σιδηρόδρομος"
-                },
                 "railway/subway_entrance": {
                     "name": "Είσοδος Μετρό",
                     "terms": "Είσοδος Μετρό, Είσοδος υπόγειου σιδηρόδρομου"
@@ -5923,10 +5894,6 @@
                 "railway/train_wash": {
                     "name": "Πλυντήριο Τρένου"
                 },
-                "railway/tram": {
-                    "name": "Τραμ",
-                    "terms": "Τραμ"
-                },
                 "railway/tram_stop": {
                     "name": "Τοποθεσία Στάσης Τραμ πάνω στις ράγες"
                 },
@@ -6141,16 +6108,10 @@
                 "shop/fishing": {
                     "name": "Είδη Αλιείας"
                 },
-                "shop/fishmonger": {
-                    "name": "Ψαράδικο"
-                },
                 "shop/florist": {
                     "name": "Ανθοπωλείο",
                     "terms": "Ανθοπωλείο"
                 },
-                "shop/frozen_food": {
-                    "name": "Κατεψυγμένα Τρόφιμα"
-                },
                 "shop/fuel": {
                     "name": "Κατάστημα Καυσίμων"
                 },
@@ -6158,9 +6119,6 @@
                     "name": "Γραφείο Τελετών",
                     "terms": "Γραφείο κηδειών"
                 },
-                "shop/furnace": {
-                    "name": "Κατάστημα Κλιβάνων"
-                },
                 "shop/furniture": {
                     "name": "Κατάστημα Επίπλων"
                 },

vendor/assets/iD/iD/locales/en-GB.json

@@ -331,7 +331,6 @@
             "request_review": "I would like someone to review my edits.",
             "save": "Upload",
             "cancel": "Cancel",
-            "changes": "{count} Changes",
             "download_changes": "Download osmChange file",
             "warnings": "Warnings",
             "modified": "Modified",
@@ -609,10 +608,6 @@
             "on_wiki": "{tag} on wiki.osm.org",
             "used_with": "used with {type}"
         },
-        "zoom": {
-            "in": "Zoom in",
-            "out": "Zoom out"
-        },
         "cannot_zoom": "Cannot zoom out further in current mode.",
         "full_screen": "Toggle Full Screen",
         "streetside": {
@@ -641,8 +636,7 @@
                 "before_start_h": "Before you start",
                 "before_start": "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a walkthrough to teach you the basics of editing OpenStreetMap. Click \"Start the Walkthrough\" on this screen to take the tutorial - it takes only about 15 minutes.",
                 "open_source_h": "Open Source",
-                "open_source": "The iD editor is a collaborative open source project, and you are using version {version} now. The source code is available [on GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "You can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "The iD editor is a collaborative open source project, and you are using version {version} now. The source code is available [on GitHub](https://github.com/openstreetmap/iD)."
             },
             "overview": {
                 "title": "Overview",
@@ -1216,17 +1210,32 @@
                 "category-building": {
                     "name": "Building Features"
                 },
+                "category-golf": {
+                    "name": "Golf Features"
+                },
                 "category-landuse": {
                     "name": "Land Use Features"
                 },
+                "category-natural": {
+                    "name": "Natural Features"
+                },
+                "category-path": {
+                    "name": "Paths"
+                },
                 "category-restriction": {
                     "name": "Restriction Features"
                 },
+                "category-road_service": {
+                    "name": "Service Roads"
+                },
                 "category-route": {
                     "name": "Route Features"
                 },
                 "category-utility": {
                     "name": "Utility Features"
+                },
+                "category-waterway": {
+                    "name": "Waterways"
                 }
             },
             "fields": {
@@ -1276,6 +1285,14 @@
                 "access_simple": {
                     "label": "Allowed Access"
                 },
+                "addr/interpolation": {
+                    "options": {
+                        "all": "All",
+                        "alphabetic": "Alphabetic",
+                        "even": "Even",
+                        "odd": "Odd"
+                    }
+                },
                 "address": {
                     "label": "Address",
                     "placeholders": {
@@ -1358,6 +1375,9 @@
                 "agrarian": {
                     "label": "Products"
                 },
+                "air_conditioning": {
+                    "label": "Air Conditioning"
+                },
                 "amenity": {
                     "label": "Type"
                 },
@@ -1370,6 +1390,9 @@
                 "animal_shelter": {
                     "label": "For Animals"
                 },
+                "architect": {
+                    "label": "Architect"
+                },
                 "area/highway": {
                     "label": "Type"
                 },
@@ -1382,6 +1405,9 @@
                 "atm": {
                     "label": "Cash Machine"
                 },
+                "baby_seat": {
+                    "label": "Baby Seat"
+                },
                 "backrest": {
                     "label": "Backrest"
                 },
@@ -1402,6 +1428,9 @@
                         "onsen": "Japanese Onsen"
                     }
                 },
+                "beauty": {
+                    "label": "Services"
+                },
                 "bench": {
                     "label": "Bench"
                 },
@@ -1411,6 +1440,13 @@
                 "bin": {
                     "label": "Rubbish Bin"
                 },
+                "blind": {
+                    "options": {
+                        "limited": "Limited",
+                        "no": "No",
+                        "yes": "Yes"
+                    }
+                },
                 "blood_components": {
                     "label": "Blood Components",
                     "options": {
@@ -1442,6 +1478,12 @@
                 "building": {
                     "label": "Building"
                 },
+                "building/levels/underground": {
+                    "placeholder": "2, 4, 6..."
+                },
+                "building/levels_building": {
+                    "placeholder": "2, 4, 6..."
+                },
                 "building_area": {
                     "label": "Building"
                 },
@@ -1471,9 +1513,25 @@
                     "label": "Capacity",
                     "placeholder": "50, 100, 200..."
                 },
+                "capacity/disabled_parking": {
+                    "placeholder": "1, 2, 3..."
+                },
+                "capacity_parking": {
+                    "placeholder": "10, 20, 30..."
+                },
                 "castle_type": {
                     "label": "Type"
                 },
+                "charge_fee": {
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…"
+                },
+                "charge_toll": {
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…"
+                },
+                "circumference": {
+                    "label": "Circumference",
+                    "placeholder": "1 m, 20 cm, 30 in…"
+                },
                 "clothes": {
                     "label": "Clothes"
                 },
@@ -1506,6 +1564,9 @@
                 "country": {
                     "label": "Country"
                 },
+                "couplings": {
+                    "placeholder": "1, 2, 3..."
+                },
                 "covered": {
                     "label": "Covered"
                 },
@@ -1592,6 +1653,14 @@
                 "denotation": {
                     "label": "Denotation"
                 },
+                "departures_board": {
+                    "options": {
+                        "no": "None",
+                        "realtime": "Realtime",
+                        "timetable": "Timetable",
+                        "yes": "Yes"
+                    }
+                },
                 "description": {
                     "label": "Description"
                 },
@@ -1599,6 +1668,9 @@
                     "label": "Devices",
                     "placeholder": "1, 2, 3..."
                 },
+                "diameter": {
+                    "placeholder": "5 mm, 10 cm, 15 in…"
+                },
                 "direction": {
                     "label": "Direction (Degrees Clockwise)",
                     "placeholder": "45, 90, 180, 270"
@@ -1647,6 +1719,15 @@
                 "dock": {
                     "label": "Type"
                 },
+                "dog": {
+                    "label": "Dogs"
+                },
+                "door": {
+                    "label": "Door"
+                },
+                "drink_multi": {
+                    "label": "Drinks"
+                },
                 "drive_through": {
                     "label": "Drive-Through"
                 },
@@ -1664,9 +1745,6 @@
                     },
                     "placeholder": "Contact Line, Electrified Rail..."
                 },
-                "elevation": {
-                    "label": "Elevation"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "example@example.com"
@@ -1698,18 +1776,25 @@
                     "label": "Type"
                 },
                 "fire_hydrant/type": {
+                    "label": "Shape",
                     "options": {
                         "pillar": "Pillar/Aboveground",
                         "underground": "Underground",
                         "wall": "Wall"
                     }
                 },
+                "fireplace": {
+                    "label": "Fireplace"
+                },
                 "fitness_station": {
                     "label": "Equipment Type"
                 },
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "floating": {
+                    "label": "Floating"
+                },
                 "ford": {
                     "label": "Type",
                     "placeholder": "Default"
@@ -1723,6 +1808,9 @@
                 "fuel_multi": {
                     "label": "Fuel Types"
                 },
+                "gambling": {
+                    "label": "Games"
+                },
                 "gauge": {
                     "label": "Gauge"
                 },
@@ -1762,6 +1850,7 @@
                     "label": "Handrail"
                 },
                 "hashtags": {
+                    "label": "Hashtags",
                     "placeholder": "#example"
                 },
                 "healthcare": {
@@ -1845,7 +1934,7 @@
                     "label": "Intermittent"
                 },
                 "internet_access": {
-                    "label": "Internet Access",
+                    "label": "Internet Connection",
                     "options": {
                         "no": "No",
                         "terminal": "Terminal",
@@ -1855,7 +1944,16 @@
                     }
                 },
                 "internet_access/fee": {
-                    "label": "Internet Access Fee"
+                    "label": "Internet Access",
+                    "options": {
+                        "no": "Free",
+                        "yes": "Paid"
+                    }
+                },
+                "junction_line": {
+                    "options": {
+                        "roundabout": "Roundabout"
+                    }
                 },
                 "kerb": {
                     "label": "Kerb"
@@ -1928,6 +2026,14 @@
                 "location": {
                     "label": "Location"
                 },
+                "location_pool": {
+                    "label": "Location",
+                    "options": {
+                        "indoor": "Indoor",
+                        "outdoor": "Outdoor",
+                        "roof": "Rooftop"
+                    }
+                },
                 "man_made": {
                     "label": "Type"
                 },
@@ -2641,10 +2747,6 @@
                 "aerialway/drag_lift": {
                     "name": "Drag Lift"
                 },
-                "aerialway/gondola": {
-                    "name": "Gondola",
-                    "terms": "Dangleway"
-                },
                 "aerialway/goods": {
                     "name": "Goods Aerialway"
                 },
@@ -2907,6 +3009,9 @@
                 "amenity/police": {
                     "name": "Police"
                 },
+                "amenity/post_box": {
+                    "name": "Post Box"
+                },
                 "amenity/post_office": {
                     "name": "Post Office"
                 },
@@ -2928,9 +3033,6 @@
                 "amenity/recycling_centre": {
                     "name": "Recycling Centre"
                 },
-                "amenity/register_office": {
-                    "name": "Register Office"
-                },
                 "amenity/restaurant": {
                     "name": "Restaurant"
                 },
@@ -2940,9 +3042,6 @@
                 "amenity/school": {
                     "name": "School Grounds"
                 },
-                "amenity/scrapyard": {
-                    "name": "Scrap Yard"
-                },
                 "amenity/shelter": {
                     "name": "Shelter"
                 },
@@ -2970,9 +3069,6 @@
                 "amenity/studio": {
                     "name": "Studio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Swimming Pool"
-                },
                 "amenity/taxi": {
                     "name": "Taxi Stand"
                 },
@@ -3576,6 +3672,9 @@
                 "highway/footway/marked-raised": {
                     "name": "Marked Crossing (Raised)"
                 },
+                "highway/footway/sidewalk": {
+                    "name": "Pavement"
+                },
                 "highway/footway/zebra": {
                     "name": "Marked Crossing"
                 },
@@ -3729,9 +3828,6 @@
                 "junction": {
                     "name": "Junction"
                 },
-                "landuse/allotments": {
-                    "name": "Allotments"
-                },
                 "landuse/aquaculture": {
                     "name": "Aquaculture"
                 },
@@ -3804,21 +3900,18 @@
                 "landuse/military/naval_base": {
                     "name": "Naval Base"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Obstacle Course"
-                },
                 "landuse/military/range": {
                     "name": "Military Range"
                 },
-                "landuse/military/training_area": {
-                    "name": "Training Area"
-                },
                 "landuse/orchard": {
                     "name": "Orchard"
                 },
                 "landuse/plant_nursery": {
                     "name": "Plant Nursery"
                 },
+                "landuse/pond": {
+                    "name": "Pond"
+                },
                 "landuse/quarry": {
                     "name": "Quarry"
                 },
@@ -3831,6 +3924,9 @@
                 "landuse/religious": {
                     "name": "Religious Area"
                 },
+                "landuse/reservoir": {
+                    "name": "Reservoir"
+                },
                 "landuse/residential": {
                     "name": "Residential Area"
                 },
@@ -3867,6 +3963,15 @@
                 "leisure/dog_park": {
                     "name": "Dog Park"
                 },
+                "leisure/escape_game": {
+                    "name": "Escape Room"
+                },
+                "leisure/firepit": {
+                    "name": "Fire Pit"
+                },
+                "leisure/fishing": {
+                    "name": "Fishing Spot"
+                },
                 "leisure/fitness_centre": {
                     "name": "Gym / Fitness Centre"
                 },
@@ -3948,6 +4053,9 @@
                 "leisure/pitch/american_football": {
                     "name": "American Football Field"
                 },
+                "leisure/pitch/badminton": {
+                    "name": "Badminton Court"
+                },
                 "leisure/pitch/basketball": {
                     "name": "Basketball Court"
                 },
@@ -3960,12 +4068,18 @@
                 "leisure/pitch/bowls": {
                     "name": "Bowling Green"
                 },
+                "leisure/pitch/chess": {
+                    "name": "Giant Chess Board"
+                },
                 "leisure/pitch/cricket": {
                     "name": "Cricket Field"
                 },
                 "leisure/pitch/equestrian": {
                     "name": "Riding Arena"
                 },
+                "leisure/pitch/netball": {
+                    "name": "Netball Court"
+                },
                 "leisure/pitch/rugby_league": {
                     "name": "Rugby League Pitch"
                 },
@@ -3999,6 +4113,9 @@
                 "leisure/slipway": {
                     "name": "Slipway"
                 },
+                "leisure/slipway_point": {
+                    "name": "Slipway"
+                },
                 "leisure/sports_centre": {
                     "name": "Sports Centre / Complex"
                 },
@@ -4026,9 +4143,15 @@
                 "man_made/antenna": {
                     "name": "Antenna"
                 },
+                "man_made/beehive": {
+                    "name": "Beehive"
+                },
                 "man_made/breakwater": {
                     "name": "Breakwater"
                 },
+                "man_made/cairn": {
+                    "name": "Cairn"
+                },
                 "man_made/chimney": {
                     "name": "Chimney"
                 },
@@ -4056,9 +4179,27 @@
                 "man_made/lighthouse": {
                     "name": "Lighthouse"
                 },
+                "man_made/manhole": {
+                    "name": "Manhole"
+                },
                 "man_made/mast": {
                     "name": "Mast"
                 },
+                "man_made/mast/communication/mobile_phone": {
+                    "name": "Mobile Phone Mast"
+                },
+                "man_made/mast/communication/radio": {
+                    "name": "Radio Broadcast Mast"
+                },
+                "man_made/mast/communication/television": {
+                    "name": "Television Broadcast Mast"
+                },
+                "man_made/mineshaft": {
+                    "name": "Mineshaft"
+                },
+                "man_made/obelisk": {
+                    "name": "Obelisk"
+                },
                 "man_made/petroleum_well": {
                     "name": "Oil Well"
                 },
@@ -4086,6 +4227,15 @@
                 "man_made/tower": {
                     "name": "Tower"
                 },
+                "man_made/tower/minaret": {
+                    "name": "Minaret"
+                },
+                "man_made/tower/observation": {
+                    "name": "Observation Tower"
+                },
+                "man_made/tunnel": {
+                    "name": "Tunnel Area"
+                },
                 "man_made/wastewater_plant": {
                     "name": "Wastewater Plant"
                 },
@@ -4107,6 +4257,18 @@
                 "man_made/works": {
                     "name": "Factory"
                 },
+                "military/bunker": {
+                    "name": "Military Bunker"
+                },
+                "military/checkpoint": {
+                    "name": "Military Checkpoint"
+                },
+                "military/nuclear_explosion_site": {
+                    "name": "Nuclear Explosion Site"
+                },
+                "military/office": {
+                    "name": "Military Office"
+                },
                 "natural/bare_rock": {
                     "name": "Bare Rock"
                 },
@@ -4161,18 +4323,30 @@
                 "natural/scrub": {
                     "name": "Scrub"
                 },
+                "natural/shrub": {
+                    "name": "Shrub"
+                },
                 "natural/spring": {
                     "name": "Spring"
                 },
+                "natural/stone": {
+                    "name": "Unattached Stone / Boulder"
+                },
                 "natural/tree": {
                     "name": "Tree"
                 },
+                "natural/valley": {
+                    "name": "Valley"
+                },
                 "natural/volcano": {
                     "name": "Volcano"
                 },
                 "natural/water": {
                     "name": "Water"
                 },
+                "natural/water/basin": {
+                    "name": "Basin"
+                },
                 "natural/water/lake": {
                     "name": "Lake"
                 },
@@ -4503,42 +4677,21 @@
                 "railway/disused": {
                     "name": "Disused Railway"
                 },
-                "railway/funicular": {
-                    "name": "Funicular"
-                },
                 "railway/halt": {
                     "name": "Train Station (Halt / Request)"
                 },
                 "railway/level_crossing": {
                     "name": "Level Crossing (Road)"
                 },
-                "railway/light_rail": {
-                    "name": "Light Rail"
-                },
                 "railway/milestone": {
                     "name": "Railway Milestone"
                 },
-                "railway/miniature": {
-                    "name": "Miniature Railway"
-                },
-                "railway/monorail": {
-                    "name": "Monorail"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Narrow Gauge Rail"
-                },
-                "railway/rail": {
-                    "name": "Rail"
-                },
                 "railway/signal": {
                     "name": "Railway Signal"
                 },
                 "railway/station": {
                     "name": "Train Station"
                 },
-                "railway/subway": {
-                    "name": "Subway"
-                },
                 "railway/subway_entrance": {
                     "name": "Subway Entrance"
                 },
@@ -4548,9 +4701,6 @@
                 "railway/train_wash": {
                     "name": "Train Wash"
                 },
-                "railway/tram": {
-                    "name": "Tram"
-                },
                 "railway/tram_stop": {
                     "name": "Tram Stopping Position"
                 },
@@ -4701,9 +4851,6 @@
                 "shop/fashion": {
                     "name": "Fashion Shop"
                 },
-                "shop/fishmonger": {
-                    "name": "Fishmonger"
-                },
                 "shop/florist": {
                     "name": "Florist"
                 },
@@ -4713,9 +4860,6 @@
                 "shop/funeral_directors": {
                     "name": "Funeral Home"
                 },
-                "shop/furnace": {
-                    "name": "Furnace Shop"
-                },
                 "shop/furniture": {
                     "name": "Furniture Shop"
                 },
@@ -5134,6 +5278,9 @@
                 "waterway/canal": {
                     "name": "Canal"
                 },
+                "waterway/canal/lock": {
+                    "name": "Canal Lock"
+                },
                 "waterway/dam": {
                     "name": "Dam"
                 },
@@ -5149,6 +5296,12 @@
                 "waterway/fuel": {
                     "name": "Marine Fuel Station"
                 },
+                "waterway/lock_gate": {
+                    "name": "Lock Gate"
+                },
+                "waterway/milestone": {
+                    "name": "Waterway Milestone"
+                },
                 "waterway/river": {
                     "name": "River"
                 },

vendor/assets/iD/iD/locales/en.json

@@ -117,19 +117,37 @@
             "circularize": {
                 "title": "Circularize",
                 "description": {
-                    "line": "Make this line circular.",
-                    "area": "Make this area circular."
+                    "single": "Make this feature circular.",
+                    "multiple": "Make these features circular."
                 },
                 "key": "O",
                 "annotation": {
-                    "line": "Made a line circular.",
-                    "area": "Made an area circular."
+                    "single": "Made a feature circular.",
+                    "multiple": "Made features circular."
                 },
-                "not_closed": "This can't be made circular because it's not a loop.",
-                "too_large": "This can't be made circular because not enough of it is currently visible.",
-                "connected_to_hidden": "This can't be made circular because it is connected to a hidden feature.",
-                "not_downloaded": "This can't be made circular because parts of it have not yet been downloaded.",
-                "already_circular": "This can't be made circular because it's already circular."
+                "multiple_blockers": {
+                    "multiple": "These can't be made circular for multiple reasons."
+                },
+                "not_closed": {
+                    "single": "This can't be made circular because it's not a loop.",
+                    "multiple": "These can't be made circular because they aren't loops."
+                },
+                "too_large": {
+                    "single": "This can't be made circular because not enough of it is currently visible.",
+                    "multiple": "These can't be made circular because not enough of them are currently visible."
+                },
+                "connected_to_hidden": {
+                    "single": "This can't be made circular because it is connected to a hidden feature.",
+                    "multiple": "These can't be made circular because some are connected to hidden features."
+                },
+                "not_downloaded": {
+                    "single": "This can't be made circular because parts of it have not yet been downloaded.",
+                    "multiple": "These can't be made circular because parts of them have not yet been downloaded."
+                },
+                "already_circular": {
+                    "single": "This can't be made more circular than it already is.",
+                    "multiple": "These can't be made more circular than they already are."
+                }
             },
             "orthogonalize": {
                 "title": "Square",
@@ -684,10 +702,10 @@
             "show_more": "Show More",
             "view_on_osm": "View on openstreetmap.org",
             "view_on_keepRight": "View on keepright.at",
-            "all_fields": "All fields",
-            "all_tags": "All tags",
-            "all_members": "All members",
-            "all_relations": "All relations",
+            "fields": "Fields",
+            "tags_count": "Tags ({count})",
+            "members_count": "Members ({count})",
+            "relations_count": "Relations ({count})",
             "add_to_relation": "Add to a relation",
             "new_relation": "New relation...",
             "choose_relation": "Choose a parent relation",
@@ -710,6 +728,7 @@
             "incomplete": "<not downloaded>",
             "feature_list": "Search features",
             "edit": "Edit feature",
+            "edit_features": "Edit features",
             "check": {
                 "yes": "Yes",
                 "no": "No",
@@ -1489,7 +1508,7 @@
                 "before_start": "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a walkthrough to teach you the basics of editing OpenStreetMap. Click \"Start the Walkthrough\" on this screen to take the tutorial - it takes only about 15 minutes.",
                 "open_source_h": "Open Source",
                 "open_source": "The iD editor is a collaborative open source project, and you are using version {version} now. The source code is available [on GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "You can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
+                "open_source_help": "You can help iD by [translating](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
                 "title": "Overview",
@@ -2803,7 +2822,7 @@
                     }
                 },
                 "beauty": {
-                    "label": "Beauty Specialty"
+                    "label": "Services"
                 },
                 "bench": {
                     "label": "Bench",
@@ -2860,6 +2879,9 @@
                     "label": "Draft Beers",
                     "terms": "on tap"
                 },
+                "bridge_combo": {
+                    "label": "Type"
+                },
                 "bridge": {
                     "label": "Type",
                     "placeholder": "Default"
@@ -2916,11 +2938,19 @@
                         "dome": "Dome"
                     }
                 },
+                "capacity_parking": {
+                    "label": "Total Spaces",
+                    "placeholder": "10, 20, 30..."
+                },
                 "capacity": {
                     "label": "Capacity",
                     "terms": "",
                     "placeholder": "50, 100, 200..."
                 },
+                "capacity/disabled_parking": {
+                    "label": "Accessible Spaces",
+                    "placeholder": "1, 2, 3..."
+                },
                 "cash_in": {
                     "label": "Cash In"
                 },
@@ -2941,7 +2971,13 @@
                     "placeholder": "1 EUR, 5 USD, 10 JPY…"
                 },
                 "check_date": {
-                    "label": "Last Checked Date"
+                    "label": "Last Checked Date",
+                    "placeholder": "YYYY-MM-DD"
+                },
+                "circumference": {
+                    "label": "Circumference",
+                    "terms": "",
+                    "placeholder": "1 m, 20 cm, 30 in…"
                 },
                 "clothes": {
                     "label": "Clothes"
@@ -3108,6 +3144,9 @@
                         "no": "None"
                     }
                 },
+                "depth": {
+                    "label": "Depth (Meters)"
+                },
                 "description": {
                     "label": "Description",
                     "terms": "summary"
@@ -3181,6 +3220,7 @@
                 },
                 "direction": {
                     "label": "Direction (Degrees Clockwise)",
+                    "terms": "",
                     "placeholder": "45, 90, 180, 270"
                 },
                 "dispensing": {
@@ -3190,11 +3230,15 @@
                     "label": "Display"
                 },
                 "distance": {
-                    "label": "Distance"
+                    "label": "Distance",
+                    "terms": "length,mileage"
                 },
                 "disused/railway": {
                     "label": "Type"
                 },
+                "disused/shop": {
+                    "label": "Type"
+                },
                 "dock": {
                     "label": "Type"
                 },
@@ -3229,8 +3273,17 @@
                     "terms": "",
                     "placeholder": "00:00"
                 },
+                "ele_node": {
+                    "label": "Elevation",
+                    "terms": "altitude,height"
+                },
+                "ele": {
+                    "label": "Elevation",
+                    "terms": "altitude,height"
+                },
                 "electrified": {
                     "label": "Electrification",
+                    "terms": "contact line,powered,third rail",
                     "placeholder": "Contact Line, Electrified Rail...",
                     "options": {
                         "contact_line": "Contact Line",
@@ -3239,10 +3292,6 @@
                         "no": "No"
                     }
                 },
-                "elevation": {
-                    "label": "Elevation",
-                    "terms": "altitude"
-                },
                 "email": {
                     "label": "Email",
                     "terms": "",
@@ -3359,6 +3408,9 @@
                 "gambling": {
                     "label": "Games"
                 },
+                "garden/type": {
+                    "label": "Garden Type"
+                },
                 "gauge": {
                     "label": "Gauge"
                 },
@@ -3540,7 +3592,7 @@
                     "terms": ""
                 },
                 "internet_access": {
-                    "label": "Internet Access",
+                    "label": "Internet Connection",
                     "terms": "wifi,wlan",
                     "options": {
                         "yes": "Yes",
@@ -3551,8 +3603,13 @@
                     }
                 },
                 "internet_access/fee": {
-                    "label": "Internet Access Fee",
-                    "terms": "wifi fee"
+                    "label": "Internet Access",
+                    "terms": "wifi fee",
+                    "options": {
+                        "no": "Free",
+                        "yes": "Paid",
+                        "customers": "Customers Only"
+                    }
                 },
                 "internet_access/ssid": {
                     "label": "Wifi Network Name",
@@ -3581,6 +3638,9 @@
                 "kerb/height": {
                     "label": "Height"
                 },
+                "kneipp_water_cure_multi": {
+                    "label": "Basin Types"
+                },
                 "label": {
                     "label": "Label"
                 },
@@ -3747,6 +3807,10 @@
                     "label": "Microbrewery",
                     "terms": "brewpub,craft beer"
                 },
+                "mimics": {
+                    "label": "Mimics",
+                    "terms": "camoflauged,disguised,looks like,tree"
+                },
                 "min_age": {
                     "label": "Minimum Age",
                     "terms": "lower age limit"
@@ -3847,8 +3911,7 @@
                     "terms": ""
                 },
                 "network/type": {
-                    "label": "Network Type",
-                    "terms": ""
+                    "label": "Network Type"
                 },
                 "not/name": {
                     "label": "Incorrect Names",
@@ -3890,13 +3953,18 @@
                     "terms": ""
                 },
                 "opening_date": {
-                    "label": "Expected Opening Date"
+                    "label": "Expected Opening Date",
+                    "placeholder": "YYYY-MM-DD"
                 },
                 "opening_hours": {
                     "label": "Hours",
                     "terms": "",
                     "placeholder": "Unknown"
                 },
+                "opening_hours/covid19": {
+                    "label": "COVID-19 Pandemic Hours",
+                    "terms": "coronavirus,lockdown,opening hours,SARS‑CoV‑2"
+                },
                 "operator": {
                     "label": "Operator",
                     "terms": ""
@@ -3916,6 +3984,9 @@
                     "label": "Park and Ride",
                     "terms": ""
                 },
+                "parking_space": {
+                    "label": "Type"
+                },
                 "parking": {
                     "label": "Type",
                     "options": {
@@ -4068,6 +4139,10 @@
                 "playground/theme": {
                     "label": "Theme"
                 },
+                "plots": {
+                    "label": "Plots",
+                    "placeholder": "10, 20, 30..."
+                },
                 "polling_station": {
                     "label": "Polling Place",
                     "terms": "voting place"
@@ -4487,7 +4562,8 @@
                 },
                 "start_date": {
                     "label": "Start Date",
-                    "terms": "inception"
+                    "terms": "inception",
+                    "placeholder": "YYYY-MM-DD"
                 },
                 "step_count": {
                     "label": "Number of Steps",
@@ -4601,6 +4677,9 @@
                 "target": {
                     "label": "Target"
                 },
+                "telecom/medium": {
+                    "label": "Medium"
+                },
                 "tidal": {
                     "label": "Tidal",
                     "terms": ""
@@ -4724,6 +4803,9 @@
                     "label": "Overhead Trolley Wires",
                     "terms": ""
                 },
+                "tunnel_combo": {
+                    "label": "Type"
+                },
                 "tunnel": {
                     "label": "Type",
                     "placeholder": "Default"
@@ -4879,10 +4961,10 @@
             },
             "presets": {
                 "aerialway": {
-                    "name": "Aerialway"
+                    "name": "Aerialway Feature"
                 },
                 "aeroway": {
-                    "name": "Aeroway"
+                    "name": "Aeroway Feature"
                 },
                 "amenity": {
                     "name": "Amenity"
@@ -4957,7 +5039,7 @@
                 },
                 "advertising/board": {
                     "name": "Notice Board",
-                    "terms": ""
+                    "terms": "advertising,announcements,blackboard,bulletin board,bulletinboard,cork board,corkboard,fliers,flyers,noticeboard,pin board,pinboard,sign,whiteboard"
                 },
                 "advertising/column": {
                     "name": "Advertising Column",
@@ -4984,7 +5066,7 @@
                     "terms": "skiing,snowboarding,surface cable"
                 },
                 "aerialway/gondola": {
-                    "name": "Gondola",
+                    "name": "Gondola Lift",
                     "terms": "aerial cable,lift,skiing,snowboarding"
                 },
                 "aerialway/goods": {
@@ -5097,15 +5179,6 @@
                 "amenity/recycling": {
                     "name": "Recycling"
                 },
-                "amenity/register_office": {
-                    "name": "Register Office"
-                },
-                "amenity/scrapyard": {
-                    "name": "Scrap Yard"
-                },
-                "amenity/swimming_pool": {
-                    "name": "Swimming Pool"
-                },
                 "amenity/animal_boarding": {
                     "name": "Animal Boarding Facility",
                     "terms": "boarding,cat,cattery,dog,horse,kennel,kitten,pet,pet boarding,pet care,pet hotel,puppy,reptile"
@@ -5298,6 +5371,10 @@
                     "name": "Events Venue",
                     "terms": "banquet hall,baptism,Bar Mitzvah,Bat Mitzvah,birthdays,celebrations,conferences,confirmation,meetings,parties,party,quinceañera,reunions,weddings"
                 },
+                "amenity/exhibition_centre": {
+                    "name": "Exposition Center",
+                    "terms": "exhibition center,fair,exhibition,exposition,trade fair,trade show,trade exhibition,expo,tradeshow"
+                },
                 "amenity/fast_food": {
                     "name": "Fast Food",
                     "terms": "restaurant,takeaway"
@@ -5393,6 +5470,10 @@
                     "name": "Preschool / Kindergarten Grounds",
                     "terms": "kindergarden,pre-school"
                 },
+                "amenity/kneipp_water_cure": {
+                    "name": "Kneipp Water Cure",
+                    "terms": ""
+                },
                 "amenity/language_school": {
                     "name": "Language School",
                     "terms": "esl"
@@ -5451,7 +5532,11 @@
                 },
                 "amenity/parking_space": {
                     "name": "Parking Space",
-                    "terms": ""
+                    "terms": "parking spot,parking stall"
+                },
+                "amenity/parking_space/disabled": {
+                    "name": "Accessible Parking Space",
+                    "terms": "disability,disabled parking stall,handicap parking spot,wheelchair"
                 },
                 "amenity/parking": {
                     "name": "Parking Lot",
@@ -6042,7 +6127,7 @@
                 },
                 "barrier/border_control": {
                     "name": "Border Control",
-                    "terms": ""
+                    "terms": "checkpoint,customs,international boundary,passport check,port of entry,visa"
                 },
                 "barrier/cattle_grid": {
                     "name": "Cattle Grid",
@@ -6124,6 +6209,10 @@
                     "name": "Sally Port",
                     "terms": "Postern,castle side gate"
                 },
+                "barrier/spikes": {
+                    "name": "Spike Strip",
+                    "terms": "one-way traffic treadles,stingers,stop sticks,tire deflation device,tire shredders,traffic spikes"
+                },
                 "barrier/stile": {
                     "name": "Stile",
                     "terms": ""
@@ -6239,7 +6328,7 @@
                 },
                 "building/farm_auxiliary": {
                     "name": "Farm Building",
-                    "terms": ""
+                    "terms": "agriculture,auxilary,chicken coop,farm auxiliary,pigsty,sty"
                 },
                 "building/farm": {
                     "name": "Farm House",
@@ -6311,7 +6400,7 @@
                 },
                 "building/retail": {
                     "name": "Retail Building",
-                    "terms": ""
+                    "terms": "shop building,store building"
                 },
                 "building/roof": {
                     "name": "Roof",
@@ -6347,7 +6436,7 @@
                 },
                 "building/static_caravan": {
                     "name": "Static Mobile Home",
-                    "terms": ""
+                    "terms": "house trailer,manufactured home,mobile home,prefabricated home,residential caravan,static caravan,trailer home"
                 },
                 "building/temple": {
                     "name": "Temple Building",
@@ -6597,6 +6686,9 @@
                 "disused/railway": {
                     "name": "Disused Railway Feature"
                 },
+                "disused/shop": {
+                    "name": "Disused Shop"
+                },
                 "emergency/designated": {
                     "name": "Emergency Access Designated"
                 },
@@ -6655,6 +6747,10 @@
                     "name": "Lifeguard",
                     "terms": "CPR,rescue"
                 },
+                "emergency/mountain_rescue": {
+                    "name": "Mountain Rescue",
+                    "terms": "EMS,EMT,rescue"
+                },
                 "emergency/phone": {
                     "name": "Emergency Phone",
                     "terms": ""
@@ -6846,6 +6942,10 @@
                     "name": "Cycle & Foot Path",
                     "terms": "bicycle and foot path,bike and pedestrian path,green way,greenway,mixed-use trail,multi-use trail,segregated trail,rail trail"
                 },
+                "highway/cycleway/crossing/bicycle_foot": {
+                    "name": "Cycle & Foot Crossing",
+                    "terms": "bicycle and foot crosswalk,bike and pedestrian crossing,cycleway,cycling,cyclist"
+                },
                 "highway/cycleway/crossing/marked": {
                     "name": "Marked Cycle Crossing",
                     "terms": "cycle crosswalk,cycle path crossing,cycleway crossing,bicycle crossing,bike crossing"
@@ -6939,6 +7039,10 @@
                     "name": "Path",
                     "terms": "hike,hiking,trackway,trail,walk"
                 },
+                "highway/path/boardwalk": {
+                    "name": "Boardwalk",
+                    "terms": "pier,plank walkway,wooden raised foot path"
+                },
                 "highway/path/informal": {
                     "name": "Informal Path",
                     "terms": "bootleg trail,cow path,desire line,desire path,desireline,desirepath,elephant path,game trail,goat track,herd path,pig trail,shortcut,social trail,use trail"
@@ -7139,6 +7243,10 @@
                     "name": "Monument",
                     "terms": ""
                 },
+                "historic/pillory": {
+                    "name": "Historic Pillory",
+                    "terms": "attraction"
+                },
                 "historic/ruins": {
                     "name": "Ruins",
                     "terms": ""
@@ -7214,8 +7322,8 @@
                     "name": "Reservoir"
                 },
                 "landuse/allotments": {
-                    "name": "Community Garden",
-                    "terms": "allotment,garden"
+                    "name": "Garden Allotments",
+                    "terms": "allotment,community garden,garden"
                 },
                 "landuse/aquaculture": {
                     "name": "Aquaculture",
@@ -7314,7 +7422,7 @@
                     "terms": "base,fight,force,guard,marine,navy,ship,sub,troop,war"
                 },
                 "landuse/military/obstacle_course": {
-                    "name": "Obstacle Course",
+                    "name": "Military Obstacle Course",
                     "terms": "army,base,force,guard,marine,navy,troop,war"
                 },
                 "landuse/military/range": {
@@ -7322,7 +7430,7 @@
                     "terms": "air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war"
                 },
                 "landuse/military/training_area": {
-                    "name": "Training Area",
+                    "name": "Military Training Area",
                     "terms": "air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war"
                 },
                 "landuse/orchard": {
@@ -7487,7 +7595,15 @@
                 },
                 "leisure/garden": {
                     "name": "Garden",
-                    "terms": ""
+                    "terms": "flowers,fruits,herbs,plants,vegetables"
+                },
+                "leisure/garden/botanical": {
+                    "name": "Botanical Garden",
+                    "terms": "botanic garden,plant collection,rare plants"
+                },
+                "leisure/garden/community": {
+                    "name": "Community Garden",
+                    "terms": "co-op garden,collective garden,communal garden"
                 },
                 "leisure/golf_course": {
                     "name": "Golf Course",
@@ -7677,30 +7793,22 @@
                     "name": "Racetrack (Non-Motorsport)",
                     "terms": "cycle,dog,greyhound,horse,race*,track"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Cycling Track",
-                    "terms": "bicycle track,bicycling track,cycle racetrack,velodrome"
-                },
                 "leisure/track/cycling": {
                     "name": "Cycling Track",
                     "terms": "bicycle track,bicycling track,cycle racetrack,velodrome"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Horse Racing Track",
-                    "terms": "equestrian race track,horse race betting,horseracing,horsetrack,horse racetrack"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Horse Racing Track",
                     "terms": "equestrian race track,horse race betting,horseracing,horsetrack,horse racetrack"
                 },
-                "leisure/track/running_point": {
-                    "name": "Running Track",
-                    "terms": "athletics track,decathlon,foot race,long distance running,marathon,middle distance running,racetrack,running,sprint,track,walking"
-                },
                 "leisure/track/running": {
                     "name": "Running Track",
                     "terms": "athletics track,decathlon,foot race,long distance running,marathon,middle distance running,racetrack,running,sprint,track,walking"
                 },
+                "leisure/trampoline_park": {
+                    "name": "Trampoline Park",
+                    "terms": "bounce,jump,spring"
+                },
                 "leisure/water_park": {
                     "name": "Water Park",
                     "terms": "swim,pool,dive"
@@ -7778,7 +7886,7 @@
                     "terms": "gas holder"
                 },
                 "man_made/groyne": {
-                    "name": "Groyne",
+                    "name": "Groin",
                     "terms": ""
                 },
                 "man_made/lighthouse": {
@@ -7990,7 +8098,7 @@
                     "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"
                 },
                 "military/checkpoint": {
-                    "name": "Checkpoint",
+                    "name": "Military Checkpoint",
                     "terms": "air force,army,base,force,guard,marine,navy,troop,war"
                 },
                 "military/nuclear_explosion_site": {
@@ -8093,6 +8201,10 @@
                     "name": "Shingle",
                     "terms": "beach,gravel,pebbles,riverbed,rounded rock fragments"
                 },
+                "natural/shrub": {
+                    "name": "Shrub",
+                    "terms": "bush,scrub"
+                },
                 "natural/spring": {
                     "name": "Spring",
                     "terms": "aquifer,hydro,seep,water source"
@@ -8343,7 +8455,7 @@
                 },
                 "office/research": {
                     "name": "Research Office",
-                    "terms": "R and D,research and development,research lab"
+                    "terms": "R and D,research and development,research lab,r&d,rnd"
                 },
                 "office/surveyor": {
                     "name": "Surveyor Office",
@@ -8524,6 +8636,9 @@
                     "name": "Temporary Polling Place",
                     "terms": "ballot box,ballot drop,democracy,elections,polling place,vote,voting booth,voting machine"
                 },
+                "power/cable": {
+                    "name": "Power Cable"
+                },
                 "power/cable/underground": {
                     "name": "Underground Power Cable",
                     "terms": ""
@@ -8803,7 +8918,7 @@
                     "terms": ""
                 },
                 "railway/funicular": {
-                    "name": "Funicular",
+                    "name": "Funicular Track",
                     "terms": "venicular,cliff railway,cable car,cable railway,funicular railway"
                 },
                 "railway/level_crossing": {
@@ -8811,7 +8926,7 @@
                     "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
                 },
                 "railway/light_rail": {
-                    "name": "Light Rail",
+                    "name": "Light Rail Track",
                     "terms": "light rail,streetcar,trolley"
                 },
                 "railway/milestone": {
@@ -8819,23 +8934,31 @@
                     "terms": "milestone,marker"
                 },
                 "railway/miniature": {
-                    "name": "Miniature Railway",
+                    "name": "Miniature Train Track",
                     "terms": "rideable miniature railway,narrow gauge railway,minimum gauge railway"
                 },
                 "railway/monorail": {
-                    "name": "Monorail",
+                    "name": "Monorail Track",
                     "terms": ""
                 },
+                "railway/monorail/hanging": {
+                    "name": "Hanging Monorail Track",
+                    "terms": "suspension railway"
+                },
                 "railway/narrow_gauge": {
-                    "name": "Narrow Gauge Rail",
+                    "name": "Narrow Gauge Track",
                     "terms": "narrow gauge railway,narrow gauge railroad"
                 },
+                "railway/preserved": {
+                    "name": "Heritage Railway Track",
+                    "terms": "historic train,preserved rail,steam train,tourist train"
+                },
                 "railway/rail": {
-                    "name": "Rail",
-                    "terms": "rail line,railroad track,train track"
+                    "name": "Train Track",
+                    "terms": "permanent way,rail line,railroad track,railway track,track,train track"
                 },
                 "railway/rail/highspeed": {
-                    "name": "High-Speed Rail",
+                    "name": "High-Speed Train Track",
                     "terms": "bullet train,fast rail,high speed rail,highspeed rail,HSR"
                 },
                 "railway/signal": {
@@ -8847,8 +8970,8 @@
                     "terms": "metro,transit"
                 },
                 "railway/subway": {
-                    "name": "Subway",
-                    "terms": "metro,transit"
+                    "name": "Subway Track",
+                    "terms": "metro,transit,underground railway"
                 },
                 "railway/switch": {
                     "name": "Railway Switch",
@@ -8859,8 +8982,8 @@
                     "terms": "wash,clean"
                 },
                 "railway/tram": {
-                    "name": "Tram",
-                    "terms": "light rail,streetcar,tram,trolley"
+                    "name": "Tram Track",
+                    "terms": "electric street railway,light rail,streetcar,tramway,trolley"
                 },
                 "railway/yard": {
                     "name": "Rail Yard",
@@ -8908,12 +9031,6 @@
                 "shop/fashion": {
                     "name": "Fashion Store"
                 },
-                "shop/fishmonger": {
-                    "name": "Fishmonger"
-                },
-                "shop/furnace": {
-                    "name": "Furnace Store"
-                },
                 "shop/vacant": {
                     "name": "Vacant Shop"
                 },
@@ -9019,7 +9136,7 @@
                 },
                 "shop/car_repair": {
                     "name": "Car Repair Shop",
-                    "terms": "automobile,automotive,garage,service"
+                    "terms": "auto mechanic,automechanic,automobile,automotive,garage,inspection,oil change,service"
                 },
                 "shop/car": {
                     "name": "Car Dealership",
@@ -9186,7 +9303,7 @@
                     "terms": "art*,paint*,photo*,frame"
                 },
                 "shop/frozen_food": {
-                    "name": "Frozen Food",
+                    "name": "Frozen Food Store",
                     "terms": ""
                 },
                 "shop/fuel": {
@@ -9257,6 +9374,10 @@
                     "name": "Hobby Shop",
                     "terms": "manga,figurine,model"
                 },
+                "shop/household_linen": {
+                    "name": "Household Linen Shop",
+                    "terms": "bedspreads,blankets,domestic cloths,curtains,handkerchieves,napkins,pillow cases,robes,sheets,towels"
+                },
                 "shop/houseware": {
                     "name": "Houseware Store",
                     "terms": "home,household,kitchenware"
@@ -9569,6 +9690,10 @@
                     "name": "Data Center",
                     "terms": "computer systems storage,information technology,server farm,the cloud,telecommunications"
                 },
+                "telecom/exchange": {
+                    "name": "Telecom Exchange",
+                    "terms": "telecommunications,telephone exchange,telephone switch"
+                },
                 "tourism/alpine_hut": {
                     "name": "Alpine Hut",
                     "terms": "cabin,climbing hut,lodge,lodging,overnight accommodations,wilderness hut"
@@ -9928,6 +10053,10 @@
                     "name": "Tram Route",
                     "terms": ""
                 },
+                "type/route/trolleybus": {
+                    "name": "Trolleybus Route",
+                    "terms": ""
+                },
                 "type/site": {
                     "name": "Site",
                     "terms": ""
@@ -10267,6 +10396,13 @@
                 "description": "The city map is an overview map that describes Gothenburg. It contains general information about land, communications, hydrography, buildings, address numbers and street names, administrative division and other orientation text.",
                 "name": "Gothenburg City map"
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© Gothenburg municipality, CC0"
+                },
+                "description": "Orthophoto for Gothenburg municipality",
+                "name": "Gothenburg Orthophoto"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI Japan"
@@ -10434,6 +10570,12 @@
                 },
                 "name": "Thunderforest Landscape"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"
+                },
+                "name": "Thunderforest Outdoors"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -10475,6 +10617,12 @@
                 },
                 "description": "Swedish NVDB road network with several options for map layers",
                 "name": "Trafikverket Road Network options"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Urząd Miasta Wrocław"
+                },
+                "name": "Wrocław: Orthophotomap 2018 (aerial image)"
             }
         },
         "community": {
@@ -10514,6 +10662,10 @@
                 "name": "OpenStreetMap Galicia Twitter",
                 "description": "Follow us on Twitter at {url}"
             },
+            "Galicia-Xeoinquedos-Twitter": {
+                "name": "Geoinquetos on Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
             "GeoPhilly": {
                 "name": "GeoPhilly",
                 "description": "Meetup for map enthusiasts in the Philadelphia area",
@@ -10946,10 +11098,6 @@
                 "description": "Mappers and OpenStreetMap users in the Salt Lake City area",
                 "extendedDescription": "Activities may include things like Learn To Map workshops, mapping parties and outdoor data collection. The events will take place in the SLC area, at least initially.  We are looking for seasoned mappers as well as people new to OSM. Join and let's do some mapping!"
             },
-            "OSM-Vancouver-meetup": {
-                "name": "OpenStreetMap Vancouver",
-                "description": "Mappers and OpenStreetMap users in the Vancouver, BC area"
-            },
             "OSM-Wyoming": {
                 "name": "OpenStreetMap Wyoming",
                 "description": "Mappers and OpenStreetMap users in the state of Wyoming",
@@ -10993,6 +11141,10 @@
                 "name": "OpenStreetMap Japan Mailinglist",
                 "description": "Talk-ja is an Official Mailinglist for Japanese Community"
             },
+            "OSM-japan-slack": {
+                "name": "OpenStreetMap Japan Slack",
+                "description": "A Slack workspace for the OSM Japan community {signupUrl}"
+            },
             "OSM-japan-twitter": {
                 "name": "OpenStreetMap Japan Twitter",
                 "description": "Hashtag on Twitter: {url}"
@@ -11205,6 +11357,14 @@
                 "name": "OpenStreetMap Germany Matrix",
                 "description": "Join #osm-de:matrix.org at https://riot.im/app/#/room/%23osm-de:matrix.org"
             },
+            "de-mv-mailinglist": {
+                "name": "Mecklenburg-Vorpommern Mailing List",
+                "description": "This is the mailing list for the OSM community of Mecklenburg-Vorpommern"
+            },
+            "de-mv-twitter": {
+                "name": "OpenStreetMap Mecklenburg-Vorpommern Twitter",
+                "description": "Follow us on Twitter: {url}"
+            },
             "de-ostwestfalen-lippe-mailinglist": {
                 "name": "OWL Mailing List",
                 "description": "This is the mailing list for the Ostwestfalen-Lippe OSM community"
@@ -11249,6 +11409,22 @@
                 "name": "Talk-fi Mailing List",
                 "description": "Talk-fi is the official mailing list for the Finnish OSM community"
             },
+            "fr-35-wiki": {
+                "name": "OpenStreetMap Rennes Wiki page",
+                "description": "Wiki page of Rennes OSM local group"
+            },
+            "fr-bzh-mailinglist": {
+                "name": "Talk-fr-bzh Mailing List",
+                "description": "Talk-fr-bzh mailing list"
+            },
+            "fr-bzh-twitter": {
+                "name": "OSM-BZH on Twitter",
+                "description": "OpenStreetMap BZH on Twitter: {url}"
+            },
+            "fr-bzh-website": {
+                "name": "OpenStreetMap BZH Website",
+                "description": "The map which speaks Breton"
+            },
             "fr-chapter": {
                 "name": "OpenStreetMap France Local Chapter",
                 "description": "We help grow and improve OpenStreetMap in France."
@@ -11294,6 +11470,18 @@
                 "name": "GeoGeeks Perth Meetup",
                 "description": "Perth-based meetup group for people interested in mapping, geospatial data, and open source. We'll be working on anything that involves a sense of place."
             },
+            "gr-forum": {
+                "name": "OpenStreetMap GR forum",
+                "description": "OpenStreetMap Greece web forum"
+            },
+            "gr-mailinglist": {
+                "name": "Talk-gr Mailing List",
+                "description": "Talk-gr is the official mailing list for the Greek OSM community"
+            },
+            "gr-matrix": {
+                "name": "OpenStreetMap Greece Matrix",
+                "description": "Join #osm-gr:matrix.org at https://riot.im/app/#/room/%23osm-gr:matrix.org"
+            },
             "guatemala-telegram": {
                 "name": "OSM Guatemala on Telegram",
                 "description": "OpenStreetMap Guatemala Telegram chat"
@@ -11302,6 +11490,10 @@
                 "name": "OpenStreetMap Croatia Facebook group",
                 "description": "OpenStreetMap Croatia Facebook group"
             },
+            "hr-forum": {
+                "name": "OSM Croaria Forum",
+                "description": "OpenStreetMap Croatia Forum"
+            },
             "hr-irc": {
                 "name": "OpenStreetMap Croatia on IRC",
                 "description": "Join #osm-hr on irc.freenode.org (port 6667)"
@@ -11310,6 +11502,10 @@
                 "name": "Talk-hr Mailing List",
                 "description": "Talk-hr mailing list"
             },
+            "hr-wiki": {
+                "name": "OpenStreetMap Wikiproject Croatia",
+                "description": "Wikiproject page for Croatia"
+            },
             "hu-facebook": {
                 "name": "OpenStreetMap HU on Facebook",
                 "description": "Mappers and OpenStreetMap Facebook in Hungary"
@@ -11540,6 +11736,10 @@
                 "name": "OpenStreetMap Ghana on Twitter",
                 "description": "Follow us on Twitter: {url}"
             },
+            "osm-hr": {
+                "name": "OpenStreetMap Croatia",
+                "description": "The platform for information on OpenStreetMap in Croatia"
+            },
             "osm-india-forum": {
                 "name": "OpenStreetMap India forum",
                 "description": "OpenStreetMap India web forum"
@@ -11703,6 +11903,10 @@
                 "name": "OpenStreetMap Freemap Slovensko on Twitter",
                 "description": "OpenStreetMap Freemap Slovensko on Twitter: {url}"
             },
+            "talk-africa": {
+                "name": "Talk-africa Mailing List",
+                "description": "Talk-africa is the official mailing list for the African OSM community."
+            },
             "talk-au": {
                 "name": "Talk-au Mailing List",
                 "description": "Place for Aussie mappers to chat"
@@ -11733,6 +11937,10 @@
                 "name": "Talk-nz Mailing List",
                 "description": "New Zealand's OSM community talk"
             },
+            "talk-tz": {
+                "name": "Talk-tz Mailing List",
+                "description": "Talk-tz is the official mailing list for the Tanzanian OSM community."
+            },
             "talk-za": {
                 "name": "Talk-za Mailing List",
                 "description": "Talk-za is the official mailing list for South African OSM community."

vendor/assets/iD/iD/locales/eo.json

@@ -20,6 +20,14 @@
             "favorites": "Elstarigitaj",
             "add_feature": "Aldoni objekton"
         },
+        "title": {
+            "format": {
+                "context": "{base} – {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} – {context}"
+            },
+            "labeled_and_more": "{labeled} kaj {count} pli"
+        },
         "modes": {
             "add_feature": {
                 "title": "Aldoni objekton",
@@ -107,7 +115,38 @@
             },
             "circularize": {
                 "title": "Rondigi",
-                "key": "O"
+                "description": {
+                    "single": "Fari ĉi tiun objekton ronda.",
+                    "multiple": "Fari ĉi tiujn objektojn rondaj."
+                },
+                "key": "O",
+                "annotation": {
+                    "single": "Rondigis objekton.",
+                    "multiple": "Rondigis objektojn."
+                },
+                "multiple_blockers": {
+                    "multiple": "Ili ne povas esti rondigitaj pro diversaj kialoj."
+                },
+                "not_closed": {
+                    "single": "Ĝi ne povas esti rondigita, ĉar ne estas fermita linio.",
+                    "multiple": "Ili ne povas esti rondigitaj, ĉar ne estas fermitaj linioj."
+                },
+                "too_large": {
+                    "single": "Ĝi ne povas esti rondigita, ĉar nesufiĉa parto de ĝi estas nune videbla.",
+                    "multiple": "Ili ne povas esti rondigitaj, ĉar nesufiĉaj partoj de ili estas nuntempe videblaj."
+                },
+                "connected_to_hidden": {
+                    "single": "Ĝi ne povas esti rondigita, pro esti kunigita al kaŝita objekto.",
+                    "multiple": "Ili ne povas esti rondigitaj, ĉar kalkaj estas kunigitaj al kaŝitaj objektoj."
+                },
+                "not_downloaded": {
+                    "single": "Ĝi ne povas esti rondigita, ĉar parto de ĝi ankoraŭ ne estas elŝutita.",
+                    "multiple": "Ili ne povas esti rondigitaj, ĉar partoj de ili ankoraŭ ne estas elŝutitaj."
+                },
+                "already_circular": {
+                    "single": "Ĝi ne povas esti rondigita pli.",
+                    "multiple": "Ili ne povas esti rondigitaj pli."
+                }
             },
             "orthogonalize": {
                 "title": "Kvadratigi",
@@ -559,7 +598,7 @@
             "request_review": "Mi volas ke iu kontrolu miajn ŝanĝojn.",
             "save": "Alŝuti",
             "cancel": "Nuligi",
-            "changes": "{count} ŝanĝoj",
+            "changes": "Ŝanĝoj ({count})",
             "download_changes": "Elŝuti dosieron osmChange",
             "errors": "Eraroj",
             "warnings": "Avertoj",
@@ -646,21 +685,21 @@
             "no_results_worldwide": "Neniuj rezultoj trovitaj"
         },
         "geolocate": {
+            "key": "L",
             "title": "Montri mian pozicion",
-            "locating": "Trovado de pozicio, bonvolu atendi…"
+            "locating": "Trovado de pozicio, bonvolu atendi…",
+            "location_unavailable": "Via pozicio estas nekonata."
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "Pligrandigi al tio ĉi",
-                "tooltip_feature": "Centrigi kaj pligrandigi la mapon por koncentriĝi sur tiu ĉi objekto.",
-                "tooltip_note": "Centrigi kaj pligrandigi la mapon por koncentriĝi sur tiu ĉi rimarko.",
-                "tooltip_data": "Centrigi kaj pligrandigi la mapon por koncentriĝi sur tiu ĉi datumo.",
-                "tooltip_issue": "Centrigi kaj pligrandigi la mapon por koncentriĝi sur tiu ĉi problemo."
+                "title": "Pligrandigu por elekti"
             },
             "show_more": "Montri pli",
             "view_on_osm": "Montri ĉe openstreetmap.org",
+            "view_on_osmose": "Montri ĉe osmose.openstreetmap.fr",
             "view_on_keepRight": "Montri ĉe keepright.at",
+            "feature_type": "Speco de objekto",
             "fields": "Kampoj",
             "tags_count": "Etikedoj ({count})",
             "members_count": "Anoj ({count})",
@@ -678,10 +717,13 @@
             "wiki_en_reference": "Montri dokumenteron en la angla",
             "key_value": "ŝlosilo=valoro",
             "multiple_values": "Pluraj valoroj",
+            "multiple_types": "Pluraj specoj",
+            "unshared_value_tooltip": "ne kunhavigataj de ĉiuj objektoj",
             "hidden_preset": {
                 "manual": "{features} estas kaŝitaj. Vi povas aktivigi ilin per la panelo de map-datumoj.",
                 "zoom": "{features} estas kaŝitaj. Pligrandigu por vidigi ilin."
             },
+            "back_tooltip": "Ŝanĝi specon de objekto",
             "remove": "Forigi",
             "search": "Serĉi",
             "unknown": "Nekonata",
@@ -757,11 +799,17 @@
                     "title": "OpenStreetMap-rimarkoj"
                 },
                 "keepRight": {
+                    "tooltip": "Problemoj pri datumoj trovitaj de keepright.at",
                     "title": "KeepRight-eraroj"
                 },
                 "improveOSM": {
+                    "tooltip": "Mankantaj datumoj trovitaj de improveosm.org",
                     "title": "ImproveOSM-eraroj"
                 },
+                "osmose": {
+                    "tooltip": "Problemoj pri datumoj trovitaj de osmose.openstreetmap.fr",
+                    "title": "Osmose-eraroj"
+                },
                 "custom": {
                     "tooltip": "Ŝovu kaj demetu datum-dosieron sur la paĝon, aŭ klaku la butonon por agordi",
                     "title": "Propraj map-datumoj",
@@ -883,7 +931,7 @@
             "custom_background": {
                 "tooltip": "Redakti propran fonon",
                 "header": "Agordoj de propra fono",
-                "instructions": "Entajpu ligilon de kaheloj. Ĝustaj ĵetonoj estas:\n {zoom}/{z}, {x}, {y} por Z/X/Y kahela skemo\n {-y} aŭ {ty} por renversaj TMS-stilaj Y-koordinatoj\n {u} por kvarkahela (quadtile) skemo\n {switch:a,b,c} por DNS-servila kunigado (multiplexing)\n\nEkzemplo:\n{example}",
+                "instructions": "Enigu ligilon de kaheloj. Ĝustaj ĵetonoj estas:\n {zoom} aŭ {z}, {x}, {y} por Z/X/Y kahela skemo\n {-y} aŭ {ty} por renversaj TMS-stilaj Y-koordinatoj\n {u} por kvarkahela (quadtile) skemo\n {switch:a,b,c} por DNS-servila kunigado (multiplexing)\n\nEkzemplo:\n{example}",
                 "template": {
                     "placeholder": "Redakti ligilon de ŝablono"
                 }
@@ -1005,7 +1053,20 @@
         },
         "cannot_zoom": "Ne povas plie plibonigi en nuna reĝimo.",
         "full_screen": "Baskuligi plenekranon",
+        "self_intersection": {
+            "error": {
+                "lines": "Linioj ne povas intersekci sin.",
+                "areas": "Areoj ne povas intersekci sin."
+            }
+        },
         "QA": {
+            "osmose": {
+                "title": "Osmose-eraro",
+                "detail_title": "Detaloj",
+                "elems_title": "Objektoj",
+                "fix_title": "Konsiloj pri riparo",
+                "trap_title": "Oftaj eraroj"
+            },
             "improveOSM": {
                 "title": "Trovita de ImproveOSM",
                 "geometry_types": {
@@ -1041,11 +1102,15 @@
                 }
             },
             "keepRight": {
+                "title": "KeepRight",
                 "detail_description": "Priskribo",
                 "comment": "Komento",
                 "comment_placeholder": "Skribu komenton por sciigi aliajn uzantojn.",
+                "close": "Fermi (problemo solvita)",
+                "ignore": "Forigi (ne problemo)",
                 "save_comment": "Konservi komenton",
                 "close_comment": "Fermi kaj komenti",
+                "ignore_comment": "Forigi kaj komenti",
                 "error_parts": {
                     "this_node": "tiu ĉi nodo",
                     "this_way": "tiu ĉi linio",
@@ -1460,7 +1525,7 @@
                 "before_start": "Vi devus ekkoni kun OpenStreetMap kaj kun tiu ĉi redaktilo antaŭ vi komencos redakti. iD enhavas gvidilon por instrui al vi fundamenton de redakti OpenStreetMap. Klaku “malfermi gvidilon” sur tiu ĉi ekrano por legi la gvidilon – tio ĉi okupiĝos apenaŭ proksimume 15 minutoj.",
                 "open_source_h": "Malferma kodo",
                 "open_source": "La redaktilo iD estas kunlabora malfermkoda projekto kaj vi nun uzas version {version}. La fontkodo estas disponebla [ĉe GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Vi povas helpi al iD per [traduki](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) aŭ [raporti problemojn](https://github.com/openstreetmap/iD/issues)."
+                "open_source_help": "Vi povas helpi al iD per [traduki](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) aŭ [raporti problemojn](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
                 "title": "Sumigo",
@@ -1627,6 +1692,7 @@
                 "title": "Certigo pri kvalito",
                 "intro": "Iloj por certigo pri kvalito povas trovi malĝustajn etikedojn, nekonektitajn vojojn kaj aliajn problemojn pri OpenStreetMap, kiuj mapigistoj povas ripari. Por vidigi ekzistajn problemojn pri kvalito, klaku la panelon {data} **map-datumoj** por vidigi specifan tavolon de problemoj pri kvalito.",
                 "tools_h": "Iloj",
+                "tools": "La jenaj iloj estas nuntempe subtenataj: [KeepRight](https://www.keepright.at/), [ImproveOSM](https://improveosm.org/) kaj [Osmose](https://osmose.openstreetmap.fr/).",
                 "issues_h": "Pritrakti problemojn",
                 "issues": "Pritrakti problemojn pri kvalito estas simila al pritrakti rimarkojn. Klaku la markon por vidigi detalojn pri la problemo sur la flankbreto. Ĉiu ilo karakterizas per siaj propraj kapabloj, sed ĝenerale vi povas komenti aŭ fermi problemon."
             },
@@ -2378,7 +2444,8 @@
                     "pan": "Rulumi mapon",
                     "pan_more": "Rulumi mapon je unu ekrano",
                     "zoom": "Pligrandigi / malgrandigi",
-                    "zoom_more": "Pligrandigegi / malgrandigegi"
+                    "zoom_more": "Pligrandigegi / malgrandigegi",
+                    "geolocate": "Pligrandigi al mia pozicio"
                 },
                 "help": {
                     "title": "Helpo",
@@ -3137,9 +3204,6 @@
                     },
                     "placeholder": "Lineo supertera, kontaktrelo…"
                 },
-                "elevation": {
-                    "label": "Altitudo"
-                },
                 "email": {
                     "label": "Retpoŝtadreso",
                     "placeholder": "ekzemplo@ekzemplo.com"
@@ -3386,7 +3450,6 @@
                     "label": "Perioda"
                 },
                 "internet_access": {
-                    "label": "Interret-aliro",
                     "options": {
                         "no": "Ne",
                         "terminal": "Terminalo",
@@ -3395,9 +3458,6 @@
                         "yes": "Jes"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Pagenda interret-aliro"
-                },
                 "internet_access/ssid": {
                     "label": "Nomo de sendrata reto"
                 },
@@ -4541,10 +4601,6 @@
                     "name": "Skitelfero",
                     "terms": "skitelfero,telfero,skilifto,aertelfero"
                 },
-                "aerialway/gondola": {
-                    "name": "Telfero plur-vagoneta",
-                    "terms": "telfero,kablovojo,gondolo,aertelfero"
-                },
                 "aerialway/goods": {
                     "name": "Telfero vara",
                     "terms": "kablotransporto,ŝarĝolifto,shargholifto,sxargxolifto"
@@ -5085,9 +5141,6 @@
                     "name": "Centro de recikligo",
                     "terms": "rubujo,balaaĵujo,rubujego,recikligujo"
                 },
-                "amenity/register_office": {
-                    "name": "Oficejo de civila stato"
-                },
                 "amenity/restaurant": {
                     "name": "Restoracio",
                     "terms": "kafejo,manĝejo,gastejo,picejo"
@@ -5172,9 +5225,6 @@
                     "name": "Lernejo (ISCED 1-3)",
                     "terms": "lernejo,edukejo,instruejo"
                 },
-                "amenity/scrapyard": {
-                    "name": "Ferrubejo"
-                },
                 "amenity/shelter": {
                     "name": "Ŝirmejo",
                     "terms": "shirmejo,sxirmejo,ŝedo,budo,ŝirmo"
@@ -5235,9 +5285,6 @@
                     "name": "Studio",
                     "terms": "radiostudio,muzikstudio,filmejo"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Naĝejo"
-                },
                 "amenity/taxi": {
                     "name": "Taksistacio",
                     "terms": "taksio,taksiejo"
@@ -6554,10 +6601,6 @@
                     "name": "Vojkruciĝo",
                     "terms": "vojkrucigho,vojkrucigxo,vojnodo,kruciĝo,krucigo"
                 },
-                "landuse/allotments": {
-                    "name": "Familiaj ĝardenoj",
-                    "terms": "ĝardenoj,ghardenoj,gxardenoj,laborista ĝardeno,etĝardeno,familia ĝardeno,parcelo"
-                },
                 "landuse/aquaculture": {
                     "name": "Akvokulturejo",
                     "terms": "akvokultivo,akvokulturo,akvikultivo,fiŝbredado,moluskoj,akvofarmo"
@@ -6655,18 +6698,10 @@
                     "name": "Marbazo armea",
                     "terms": "haveno armea,ŝiparo milita"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Obstakl-kurejo",
-                    "terms": "dromo,soldatkurejo"
-                },
                 "landuse/military/range": {
                     "name": "Pafejo armea",
                     "terms": "pafdomo,bombejo"
                 },
-                "landuse/military/training_area": {
-                    "name": "Ekzercejo armea",
-                    "terms": "testejo,armea spaco"
-                },
                 "landuse/orchard": {
                     "name": "Fruktoĝardeno",
                     "terms": "fruktoghardeno,fruktogxardeno,fruktĝardeno,fruktarbaro"
@@ -7021,26 +7056,14 @@
                     "name": "Kurejo bicikla",
                     "terms": "dromo,biciklado,biciklkonkursejo,konkursejo"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Kurejo bicikla",
-                    "terms": "dromo,biciklado,biciklkonkursejo,konkursejo"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Kurejo ĉevala",
                     "terms": "ĉevalkurejo,chevalkurejo,cxevalkurejo,hipodromo"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Kurejo ĉevala",
-                    "terms": "ĉevalkurejo,chevalkurejo,cxevalkurejo,hipodromo"
-                },
                 "leisure/track/running": {
                     "name": "Kurejo",
                     "terms": "dromo,kurado"
                 },
-                "leisure/track/running_point": {
-                    "name": "Kurejo",
-                    "terms": "dromo,kurado,konkursejo"
-                },
                 "leisure/water_park": {
                     "name": "Akvoparko",
                     "terms": "naĝejo"
@@ -7113,10 +7136,6 @@
                     "name": "Gasujo (atmosfera premo)",
                     "terms": "gasometro"
                 },
-                "man_made/groyne": {
-                    "name": "Ond-rompileto",
-                    "terms": "ondorompileto,ondrompileto,digo,ĝeto"
-                },
                 "man_made/lighthouse": {
                     "name": "Lumturo",
                     "terms": "lanternego"
@@ -7269,10 +7288,6 @@
                     "name": "Ŝirmejo armea",
                     "terms": "bunkro,shirmejo,sxirmejo,blokhaŭso"
                 },
-                "military/checkpoint": {
-                    "name": "Kontrolejo armea",
-                    "terms": "armea kontrolejo,kontrolpunkto"
-                },
                 "military/nuclear_explosion_site": {
                     "name": "Eksplodejo de nuklea bombo",
                     "terms": "nuklea testejo,atombombo,a-bombo,testejo,bombejo"
@@ -7975,10 +7990,6 @@
                     "name": "Neuzata relvojo",
                     "terms": "eksa fervojlinio,trako,relvojo,forlasita fervojlinio"
                 },
-                "railway/funicular": {
-                    "name": "Funikularo",
-                    "terms": "kablovojo,fervojeto,trajneto,kablotramo,telfero"
-                },
                 "railway/halt": {
                     "name": "Stacio fervoja (laŭpete)"
                 },
@@ -7986,37 +7997,13 @@
                     "name": "Traknivela pasejo (por aŭtoj)",
                     "terms": "pasejo,nivelpasejo,trenpasejo,trajnpasejo"
                 },
-                "railway/light_rail": {
-                    "name": "Fervojo malpeza",
-                    "terms": "malpeza fervojo,malpeza trajno,suburba fervojo,tramo"
-                },
                 "railway/milestone": {
                     "name": "Kilometra fosto (apud fervojo)",
                     "terms": "mejloŝtono,cipo"
                 },
-                "railway/miniature": {
-                    "name": "Miniatura fervojo",
-                    "terms": "fervojeto,maketo,trajneto,vagonareto"
-                },
-                "railway/monorail": {
-                    "name": "Relvojo unurela",
-                    "terms": "unurela fervojo,unurelvojo,fervojo"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Relvojo etŝpura",
-                    "terms": "etŝpura fervojo,etshpura fervojo,etsxpura fervojo,mallarĝŝpura fervojo,erlvojo,relparo,trako"
-                },
                 "railway/platform": {
                     "name": "Haltejo fervoja (atendejo)"
                 },
-                "railway/rail": {
-                    "name": "Relvojo normalŝpura",
-                    "terms": "erlvojo,relparo,trako,normalŝpura,larĝŝpura"
-                },
-                "railway/rail/highspeed": {
-                    "name": "Fervojo altrapida",
-                    "terms": "grandrapida trajno,rapidega trajno,altrapida trajno"
-                },
                 "railway/signal": {
                     "name": "Fervojaj trafiklumoj",
                     "terms": "semaforo,signalilo,haltmontrilo"
@@ -8024,10 +8011,6 @@
                 "railway/station": {
                     "name": "Stacio fervoja"
                 },
-                "railway/subway": {
-                    "name": "Metroo",
-                    "terms": "subtera fervojo"
-                },
                 "railway/subway_entrance": {
                     "name": "Metroa enirejo",
                     "terms": "enirejo al metroo,metroo"
@@ -8040,10 +8023,6 @@
                     "name": "Vagonar-purigejo",
                     "terms": "purigejo,purigilo,vagonara purigejo,trajnpurigejo,vagonarpurigejo,trajnopurigejo,trajnolavejo"
                 },
-                "railway/tram": {
-                    "name": "Relvojo trama",
-                    "terms": "tramo,tramvojo,urbofervojo"
-                },
                 "railway/tram_stop": {
                     "name": "Haltejo trama (haltloko - trako)"
                 },
@@ -8308,9 +8287,6 @@
                     "name": "Fiŝkaptil-vendejo",
                     "terms": "fiŝhokado,fiŝkaptado,hokfiŝado"
                 },
-                "shop/fishmonger": {
-                    "name": "Fiŝa vendejo"
-                },
                 "shop/florist": {
                     "name": "Florvendejo",
                     "terms": "florovendejo,florejo"
@@ -8319,10 +8295,6 @@
                     "name": "Bild-kadra vendejo",
                     "terms": "kadroj,kadraĵoj,pentraĵkadroj,bildkadroj"
                 },
-                "shop/frozen_food": {
-                    "name": "Frostigit-manĝaĵo vendejo",
-                    "terms": "frostigita manĝaĵo,fridigita manĝaĵo"
-                },
                 "shop/fuel": {
                     "name": "Brulaĵ-vendejo",
                     "terms": "brulaĵo,benzino,fuelo,gaso,gasboteloj,gasujoj,boteloj"
@@ -8331,9 +8303,6 @@
                     "name": "Tombistejo",
                     "terms": "tombisto,enterigisto,entombigisto,sepultisto"
                 },
-                "shop/furnace": {
-                    "name": "Hejtila vendejo"
-                },
                 "shop/furniture": {
                     "name": "Mebla vendejo",
                     "terms": "mebloj,meblovendejo,meblaĵoj"

vendor/assets/iD/iD/locales/es.json

@@ -20,6 +20,14 @@
             "favorites": "Favoritos",
             "add_feature": "Añadir elemento"
         },
+        "title": {
+            "format": {
+                "context": "{base} – {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} – {context}"
+            },
+            "labeled_and_more": "{labeled} y {count} más"
+        },
         "modes": {
             "add_feature": {
                 "title": "Añadir un elemento",
@@ -590,7 +598,7 @@
             "request_review": "Me gustaría que alguien revise mis ediciones.",
             "save": "Subir",
             "cancel": "Cancelar",
-            "changes": "{count} Cambios",
+            "changes": "Cambios ({count})",
             "download_changes": "Descargar archivo osmChange",
             "errors": "Errores",
             "warnings": "Advertencias",
@@ -678,20 +686,19 @@
             "no_results_worldwide": "No hay resultados"
         },
         "geolocate": {
+            "key": "L",
             "title": "Mostrar mi ubicación",
-            "locating": "Ubicando, por favor espere..."
+            "locating": "Ubicando, por favor espere...",
+            "location_unavailable": "Su ubicación no está disponible."
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "Acercar a esto",
-                "tooltip_feature": "Centrar y ampliar el mapa para enfocarse en este elemento.",
-                "tooltip_note": "Centrar y ampliar el mapa para enfocarse en esta nota.",
-                "tooltip_data": "Centrar y ampliar el mapa para enfocarse en este dato.",
-                "tooltip_issue": "Centrar y ampliar el mapa para enfocarse en este problema."
+                "title": "Acercar a la selección"
             },
             "show_more": "Ver más",
             "view_on_osm": "Ver en openstreetmap.org",
+            "view_on_osmose": "Ver en osmose.openstreetmap.fr",
             "view_on_keepRight": "Ver en keepright.at",
             "feature_type": "Tipo de elemento",
             "fields": "Campos",
@@ -925,7 +932,7 @@
             "custom_background": {
                 "tooltip": "Editar fondo personalizado",
                 "header": "Ajustes de fondo personalizado",
-                "instructions": "Ingrese una plantilla URL de tesela. Los tokens válidos son:\n {zoom} o {z}, {x}, {y} para el esquema de tesela Z/X/Y\n {-y} o {ty} para las coordenadas Y invertidas estilo TMS\n {u} para el esquema cuádruple\n {switch: a, b, c} para multiplexación de servidores DNS\n\nEjemplo:\n{example}",
+                "instructions": "Ingrese una plantilla de URL de tesela. Los tokens válidos son:\n   {zoom} o {z}, {x}, {y} para el esquema de tesela Z/X/Y\n   {-y} o {ty} para coordenadas Y invertidas de estilo TMS\n   {u} para esquema quadtile\n   {switch: a,b,c} para la multiplexación del servidor DNS\n\nEjemplo:\n{example}",
                 "template": {
                     "placeholder": "Ingrese una plantilla url"
                 }
@@ -1048,14 +1055,19 @@
         },
         "cannot_zoom": "No se puede alejar más la imagen en el modo actual.",
         "full_screen": "Alternar pantalla completa",
+        "self_intersection": {
+            "error": {
+                "lines": "Las líneas no pueden cruzarse sobre sí mismas.",
+                "areas": "Las áreas no pueden cruzarse sobre sí mismas."
+            }
+        },
         "QA": {
             "osmose": {
                 "title": "Problema de Osmose",
                 "detail_title": "Detalles",
                 "elems_title": "Elementos",
                 "fix_title": "Pautas para el arreglo",
-                "trap_title": "Errores comunes",
-                "translation": "Traducciones proporcionadas por Osmose"
+                "trap_title": "Errores comunes"
             },
             "improveOSM": {
                 "title": "Detección de ImproveOSM",
@@ -1515,7 +1527,7 @@
                 "before_start": "Antes de empezar a editar se recomienda familiarizarse con este editor y OpenStreetMap. iD tiene una guía con la que aprender conceptos básicos de edición. Haga clic en «Iniciar el tutorial» para empezar un pequeño tutorial de unos 15 minutos.",
                 "open_source_h": "Código abierto",
                 "open_source": "El editor de iD es un proyecto colaborativo de código abierto, la versión actual es la {version}. El código fuente está disponible [en GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Es posible colaborar con iD [traduciendo](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) o [informando de errores](https://github.com/openstreetmap/iD/issues)."
+                "open_source_help": "Puede ayudar a iD [traduciendo](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) o [informando errores](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
                 "title": "Resumen",
@@ -2434,7 +2446,8 @@
                     "pan": "Desplazar el mapa",
                     "pan_more": "Desplazar el mapa pantalla a pantalla",
                     "zoom": "Acercar / Alejar",
-                    "zoom_more": "Acercar / Alejar un montón"
+                    "zoom_more": "Acercar / Alejar un montón",
+                    "geolocate": "Acercar a mi ubicación"
                 },
                 "help": {
                     "title": "Ayuda",
@@ -2893,6 +2906,9 @@
                 "bridge/support": {
                     "label": "Tipo"
                 },
+                "bridge_combo": {
+                    "label": "Tipo"
+                },
                 "building": {
                     "label": "Edificio",
                     "terms": "edificio, construcción, casa, estructura"
@@ -2947,6 +2963,14 @@
                     "placeholder": "50, 100, 200...",
                     "terms": "capacidad"
                 },
+                "capacity/disabled_parking": {
+                    "label": "Espacios accesibles",
+                    "placeholder": "1, 2, 3..."
+                },
+                "capacity_parking": {
+                    "label": "Espacios totales",
+                    "placeholder": "10, 20, 30..."
+                },
                 "cash_in": {
                     "label": "Pagar en efectivo"
                 },
@@ -2967,7 +2991,13 @@
                     "terms": "importe, precio, costo, peaje"
                 },
                 "check_date": {
-                    "label": "Fecha de última revisión"
+                    "label": "Fecha de última revisión",
+                    "placeholder": "AAAA-MM-DD"
+                },
+                "circumference": {
+                    "label": "Circunferencia",
+                    "placeholder": "1 m, 20 cm, 30 in…",
+                    "terms": "circunferencia, círculo, circulo"
                 },
                 "clothes": {
                     "label": "Ropa"
@@ -3134,6 +3164,9 @@
                         "yes": "Sí"
                     }
                 },
+                "depth": {
+                    "label": "Profundidad (metros)"
+                },
                 "description": {
                     "label": "Descripción",
                     "terms": "descripción, resumen"
@@ -3217,11 +3250,15 @@
                     "label": "Monitor"
                 },
                 "distance": {
-                    "label": "Distancia"
+                    "label": "Distancia",
+                    "terms": "distancia, lejanía, longitud, kilometraje, millaje"
                 },
                 "disused/railway": {
                     "label": "Tipo"
                 },
+                "disused/shop": {
+                    "label": "Tipo"
+                },
                 "dock": {
                     "label": "Tipo"
                 },
@@ -3256,6 +3293,14 @@
                     "placeholder": "00:00",
                     "terms": "duración, extensión"
                 },
+                "ele": {
+                    "label": "Elevación",
+                    "terms": "altitud, altura"
+                },
+                "ele_node": {
+                    "label": "Elevación",
+                    "terms": "altitud, altura"
+                },
                 "electrified": {
                     "label": "Electrificación",
                     "options": {
@@ -3267,10 +3312,6 @@
                     "placeholder": "Catenaria, Riel electrificada...",
                     "terms": "línea, linea, electrificada, electrificado, tercer riel"
                 },
-                "elevation": {
-                    "label": "Elevación",
-                    "terms": "elevación, altura, altitud"
-                },
                 "email": {
                     "label": "Correo electrónico",
                     "placeholder": "ejemplo@ejemplo.com",
@@ -3387,6 +3428,9 @@
                 "gambling": {
                     "label": "Juegos"
                 },
+                "garden/type": {
+                    "label": "Tipo de jardín"
+                },
                 "gauge": {
                     "label": "Gálibo"
                 },
@@ -3568,7 +3612,7 @@
                     "label": "Intermitente"
                 },
                 "internet_access": {
-                    "label": "Acceso a Internet",
+                    "label": "Conexión a Internet",
                     "options": {
                         "no": "No",
                         "terminal": "Terminal de Internet",
@@ -3576,11 +3620,16 @@
                         "wlan": "Wi-Fi",
                         "yes": "Sí"
                     },
-                    "terms": "acceso a Internet"
+                    "terms": "internet, wifi, wlan"
                 },
                 "internet_access/fee": {
-                    "label": "Pago por acceso a Internet",
-                    "terms": "tarifa de internet, precio de internet, precio de wifi, tarifa de wifi"
+                    "label": "Acceso a Internet",
+                    "options": {
+                        "customers": "Solo clientes",
+                        "no": "Gratis",
+                        "yes": "Pago"
+                    },
+                    "terms": "tarifa wifi"
                 },
                 "internet_access/ssid": {
                     "label": "Nombre de la red wifi",
@@ -3778,6 +3827,10 @@
                     "label": "Microcervecería",
                     "terms": "Microcervecería, cerveza artesanal"
                 },
+                "mimics": {
+                    "label": "Mimetiza",
+                    "terms": "camuflado, disfrazado, parece, árbol, mimetiza, imita"
+                },
                 "min_age": {
                     "label": "Edad mínima",
                     "terms": "límite de edad inferior"
@@ -3845,8 +3898,7 @@
                     "terms": "red"
                 },
                 "network/type": {
-                    "label": "Tipo de red",
-                    "terms": "red de carreteras, red vial, tipo"
+                    "label": "Tipo de red"
                 },
                 "network_bicycle": {
                     "label": "Clase de red",
@@ -3921,13 +3973,18 @@
                     "terms": "fuego, fogata"
                 },
                 "opening_date": {
-                    "label": "Fecha de apertura prevista"
+                    "label": "Fecha de apertura prevista",
+                    "placeholder": "AAAA-MM-DD"
                 },
                 "opening_hours": {
                     "label": "Horas de atención",
                     "placeholder": "Desconocido",
                     "terms": "horas"
                 },
+                "opening_hours/covid19": {
+                    "label": "Horarios por la pandemia de COVID-19",
+                    "terms": "coronavirus, bloqueo, horario de apertura, SARS-CoV-2, covid19, aislamiento, cuarentena, toque de queda, distanciamiento social"
+                },
                 "operator": {
                     "label": "Operador",
                     "terms": "operador, operario, agente"
@@ -3959,6 +4016,9 @@
                         "underground": "Subterráneo"
                     }
                 },
+                "parking_space": {
+                    "label": "Tipo"
+                },
                 "payment_multi": {
                     "label": "Formas de pago",
                     "terms": "Formas de pago"
@@ -4099,6 +4159,10 @@
                 "playground/theme": {
                     "label": "Tema"
                 },
+                "plots": {
+                    "label": "Parcelas",
+                    "placeholder": "10, 20, 30..."
+                },
                 "polling_station": {
                     "label": "Lugar de votación",
                     "terms": "centro electoral, lugar de votación, votación, elecciones"
@@ -4518,6 +4582,7 @@
                 },
                 "start_date": {
                     "label": "Fecha inicio",
+                    "placeholder": "AAAA-MM-DD",
                     "terms": "Fecha de inicio, comienzo, inaguración"
                 },
                 "step_count": {
@@ -4632,6 +4697,9 @@
                 "target": {
                     "label": "Objetivo"
                 },
+                "telecom/medium": {
+                    "label": "Medio"
+                },
                 "tidal": {
                     "label": "De marea",
                     "terms": "Marea"
@@ -4759,6 +4827,9 @@
                     "label": "Tipo",
                     "placeholder": "Predeterminado"
                 },
+                "tunnel_combo": {
+                    "label": "Tipo"
+                },
                 "usage_rail": {
                     "label": "Tipo de uso",
                     "options": {
@@ -4952,8 +5023,8 @@
                     "terms": "elevador, remonta pendientes, telesquí, esquí, deslizador, snowboarder"
                 },
                 "aerialway/gondola": {
-                    "name": "Teleférico",
-                    "terms": "telecabina, telesilla"
+                    "name": "Telecabina",
+                    "terms": "cable aéreo, ascensor, esquí, snowboard, telecabina, telesilla"
                 },
                 "aerialway/goods": {
                     "name": "Elevador por cable de mercancías",
@@ -5439,6 +5510,10 @@
                     "name": "Plaza de aparcamiento / estacionamiento",
                     "terms": "lugar, zona, área, plaza, coche, carro, auto, automóvil, vehículo, aparcamiento, parking, aparcadero, estacionamiento, parqueadero, parqueo"
                 },
+                "amenity/parking_space/disabled": {
+                    "name": "Espacio de estacionamiento accesible",
+                    "terms": "discapacidad, estacionamiento para discapacitados, lugar"
+                },
                 "amenity/payment_centre": {
                     "name": "Centro de pago",
                     "terms": "cheque, pago de impuestos, pago de facturas, moneda, finanzas, efectivo, dinero"
@@ -5578,9 +5653,6 @@
                     "name": "Contenedor de reciclaje",
                     "terms": "papelera, lata, botella, vidrio, basura, chatarra"
                 },
-                "amenity/register_office": {
-                    "name": "Oficina de registro"
-                },
                 "amenity/research_institute": {
                     "name": "Terrenos del Instituto de Investigación",
                     "terms": "investigación aplicada, experimentación, investigación y desarrollo, i+d, i&d, institución de investigación, laboratorio de investigación, laboratorios de investigación"
@@ -5669,9 +5741,6 @@
                     "name": "Terrenos de escuela / colegio",
                     "terms": "recinto escolar, escolar, escuela, colegio, centro educativo, unidad educativa, primaria, secundaria, secundario, instituto, institución educativa, academia, escuela elemental, preparatorio, liceo"
                 },
-                "amenity/scrapyard": {
-                    "name": "Depósito de chatarra"
-                },
                 "amenity/shelter": {
                     "name": "Refugio",
                     "terms": "albergue, abrigo, amparo, asilo, cobertizo, garita, refugio"
@@ -5748,9 +5817,6 @@
                     "name": "Estudio de cine",
                     "terms": "producción de cine, estudio de cine, producción de video, grabación de video, estudio de video"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Piscina"
-                },
                 "amenity/taxi": {
                     "name": "Parada de taxi",
                     "terms": "taxi, parada, acopio de taxis"
@@ -5959,8 +6025,8 @@
                     "terms": "carrusel, tiovivo, calesita, caballitos, juego mecánico, juego de feria"
                 },
                 "attraction/dark_ride": {
-                    "name": "Paseo oscuro",
-                    "terms": "viaje oscuro, tren fantasma, paseo guiado, juego de feria"
+                    "name": "Tren fantasma",
+                    "terms": "paseo oscuro, viaje oscuro, tren fantasma, paseo guiado, juego de feria"
                 },
                 "attraction/drop_tower": {
                     "name": "Paseo en torre de caída",
@@ -6591,6 +6657,9 @@
                 "disused/railway": {
                     "name": "Elemento ferroviario en desuso"
                 },
+                "disused/shop": {
+                    "name": "Tienda en desuso"
+                },
                 "embankment": {
                     "name": "Terraplén"
                 },
@@ -6953,6 +7022,10 @@
                     "name": "Sendero",
                     "terms": "vereda, sendero, senda, camino, vía, ramal, trocha, atajo, travesía, huella, rastro"
                 },
+                "highway/path/boardwalk": {
+                    "name": "Paseo marítimo entarimado",
+                    "terms": "muelle, pasarela de tablones, sendero elevado de madera, paseo de tablas, tablas, madera, tarima, entarimado"
+                },
                 "highway/path/informal": {
                     "name": "Camino informal",
                     "terms": "rastro de contrabando, camino de vaca, línea de deseo, camino de deseo, línea deseada, camino deseado, camino de elefante, camino de juego, camino de cabra, camino de rebaño, camino de cerdos, acceso directo, atajo, camino social, rastro de uso, no planificado, deseado"
@@ -7062,8 +7135,8 @@
                     "terms": "Enlace a carretera terciaria, Enlace a carretera local, Enlace de carretera local"
                 },
                 "highway/track": {
-                    "name": "Pista o camino rural",
-                    "terms": "camino, senda, sendero, calle, vía, pista, rural, forestal, agrícola, campo, sin mantenimiento, offroad, jeep, doble tracción, tractor, 4x4, atv, cuadrimotor, quadratrack, con huella"
+                    "name": "Pista o camino no mantenido",
+                    "terms": "camino, senda, sendero, vía, pista, rural, forestal, agrícola, campo, offroad, doble tracción, tractor, atv, cuadrimoto, quadra track, huella, camino rural, camino de bosque, camino forestal, camino de tala, camino de fuego, camino de granja, camino agrícola, camino de rancho, camino de carro, primitivo, sin mantenimiento, rutina, campo a través, 4wd, 4x4, tracción en las cuatro ruedas, todoterreno, quad, jeep, dos pista"
                 },
                 "highway/traffic_mirror": {
                     "name": "Espejo de tránsito",
@@ -7223,8 +7296,8 @@
                     "name": "Elemento de uso del suelo"
                 },
                 "landuse/allotments": {
-                    "name": "Huerto comunitario",
-                    "terms": "jardín, huerto, huerta, terreno, comunitario, comunal, vecindad, huerto urbano"
+                    "name": "Jardín de asignación o comunitario",
+                    "terms": "parcela, jardín comunitario, jardín"
                 },
                 "landuse/aquaculture": {
                     "name": "Acuicultura",
@@ -7332,8 +7405,8 @@
                     "terms": "base, buque naval, buque de guerra, buque militar, barco militar, puerto naval, submarino, anfibio, militar, ejército, fuerza aérea, marina, armada, fuerza naval"
                 },
                 "landuse/military/obstacle_course": {
-                    "name": "Pista de obstáculos militar",
-                    "terms": "entrenamiento, carrera de obstáculos, pista de comando, recorrido de obstáculos, militar, ejército, fuerza aérea, marina, armada, fuerza naval"
+                    "name": "Carrera de obstáculos militares",
+                    "terms": "ejército, base, fuerza, guardia, marina, tropa, guerra"
                 },
                 "landuse/military/range": {
                     "name": "Prácticas militares",
@@ -7341,7 +7414,7 @@
                 },
                 "landuse/military/training_area": {
                     "name": "Área de entrenamiento militar",
-                    "terms": "área de pruebas, zona de pruebas, sitio de pruebas, tiro, disparo, prueba de armas, prueba táctica militar, tecnología militar, demostración de terreno, militar, ejército, fuerza aérea, marina, armada, fuerza naval"
+                    "terms": "fuerza aérea, ejército, base, lucha, fuego, fuerza, guardia, arma, marina, rifle, disparar, entrenar, entrenamiento, tropa, guerra"
                 },
                 "landuse/orchard": {
                     "name": "Huerta frutal",
@@ -7516,6 +7589,14 @@
                     "name": "Jardín",
                     "terms": "parque, parterre, vergel, floresta, huerto, rosaleda, jardín"
                 },
+                "leisure/garden/botanical": {
+                    "name": "Jardín botánico",
+                    "terms": "jardín botánico, jardin botanico, colección de plantas, plantas raras"
+                },
+                "leisure/garden/community": {
+                    "name": "Jardín comunitario",
+                    "terms": "jardín cooperativo, jardín colectivo, jardín comunitario"
+                },
                 "leisure/golf_course": {
                     "name": "Campo de golf",
                     "terms": "Campo de golf, cancha de golf"
@@ -7637,8 +7718,8 @@
                     "terms": "Parque de skate boarding, Skate Park, Skate-Park, Skate"
                 },
                 "leisure/pitch/soccer": {
-                    "name": "Campo de fútbol",
-                    "terms": "campo, cancha, fútbol, fulbito, balompie, football, soccer"
+                    "name": "Campo o cancha de fútbol",
+                    "terms": "campo, cancha, fútbol, fulbito, balompie, football, soccer, cancha de fútbol, cancha de futbol, campo de fútbol, campo de futbol"
                 },
                 "leisure/pitch/softball": {
                     "name": "Campo de softbol",
@@ -7708,25 +7789,17 @@
                     "name": "Circuito de ciclismo",
                     "terms": "carril bici, ciclovía, pista de ciclismo, velódromo"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Circuito de ciclismo",
-                    "terms": "carril bici, pista de ciclismo, velódromo"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Pista de carreras de caballos",
                     "terms": "Pista de carreras ecuestres, apuestas de carreras de caballos, carreras de caballos, hipódromo, hipodromo"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Carreras de caballos",
-                    "terms": "Pista de carreras ecuestres, apuestas de carreras de caballos, carreras de caballos, hipódromo, hipodromo"
-                },
                 "leisure/track/running": {
                     "name": "Pista de atletismo",
                     "terms": "pista de atletismo, decatlón, carrera a pie, carrera de larga distancia, maratón, carrera de media distancia, pista de carreras, carrera, sprint, pista, caminar"
                 },
-                "leisure/track/running_point": {
-                    "name": "Pista de carreras",
-                    "terms": "pista de atletismo, decatlón, carrera a pie, carrera de larga distancia, maratón, carrera de media distancia, pista de carreras, carrera, sprint, pista, caminar"
+                "leisure/trampoline_park": {
+                    "name": "Parque de trampolín",
+                    "terms": "rebotar, saltar, brincar, elástica"
                 },
                 "leisure/water_park": {
                     "name": "Parque acuático",
@@ -7808,8 +7881,8 @@
                     "terms": "gasómetro, gas, depósito, contenedor, tanque"
                 },
                 "man_made/groyne": {
-                    "name": "Escollera",
-                    "terms": "escollera, rompeola, espigón, espolón, erosión, playa"
+                    "name": "Espigón",
+                    "terms": "escollera, rompeola, espigón, espolón"
                 },
                 "man_made/lighthouse": {
                     "name": "Faro",
@@ -8020,8 +8093,8 @@
                     "terms": "fuerza aerea, ejercito, pelea, fuerza, guardia, marino, marina, tropa, guerra"
                 },
                 "military/checkpoint": {
-                    "name": "Punto de control",
-                    "terms": "Fuerza Aérea, Ejército, Base, Guardia, Marina, Tropa, Guerra"
+                    "name": "Puesto de control militar",
+                    "terms": "fuerza aérea, ejército, base, guardia, marina, tropa, guerra"
                 },
                 "military/nuclear_explosion_site": {
                     "name": "Sitio de explosión nuclear",
@@ -8126,6 +8199,10 @@
                     "name": "Guijarros",
                     "terms": "Playa, grava, guijarros, cauce del río, fragmentos de roca redondeada"
                 },
+                "natural/shrub": {
+                    "name": "Arbusto",
+                    "terms": "arbusto, matorral"
+                },
                 "natural/spring": {
                     "name": "Fuente / Manantial",
                     "terms": "Manantial, fuente, agua"
@@ -8566,8 +8643,11 @@
                 "power": {
                     "name": "Elemento de energía eléctrica"
                 },
+                "power/cable": {
+                    "name": "Cable eléctrico"
+                },
                 "power/cable/underground": {
-                    "name": "Cable de alimentación subterráneo",
+                    "name": "Cable eléctrico subterráneo",
                     "terms": "cable, alimentación, energía, electricidad, subterráneo"
                 },
                 "power/generator": {
@@ -8836,8 +8916,8 @@
                     "terms": "Ferrocarril en deshuso"
                 },
                 "railway/funicular": {
-                    "name": "Funicular",
-                    "terms": "Funicular"
+                    "name": "Vía de funicular",
+                    "terms": "venicular, acantilado, teleférico, funicular"
                 },
                 "railway/halt": {
                     "name": "Estación / Aparadero de tren (parada / a pedido)"
@@ -8847,34 +8927,42 @@
                     "terms": "cruce, tren, ferrocarril, carretera, camino, cruce ferroviario, paso a nivel"
                 },
                 "railway/light_rail": {
-                    "name": "Tren ligero",
-                    "terms": "lrt, tren, tranvía, tren urbano, tranvía urbano, tren eléctrico, tren rápido, tren ligero, tren tranvía, metro ligero"
+                    "name": "Vía de tren ligero",
+                    "terms": "tren ligero, tranvía"
                 },
                 "railway/milestone": {
                     "name": "Hito kilométrico ferroviario",
                     "terms": "hito, señal, marcador, kilométrico, mojón, vía, via, férrea, ferroviaria, ferroviario, ferrocarril, tren"
                 },
                 "railway/miniature": {
-                    "name": "Vía ferrea en miniatura",
-                    "terms": "ferrocarril, tren miniatura, tren en miniatura, tren de ancho estrecho, tren de ancho mínimo, trocha angosta, trocha mínima"
+                    "name": "Vía de tren en miniatura",
+                    "terms": "ferrocarril en miniatura, vía estrecha, vía mínima, trocha mínima, ancho mínimo"
                 },
                 "railway/monorail": {
-                    "name": "Monorriel",
+                    "name": "Vía de monorriel",
                     "terms": "monorraíl, monorriel, monocarril"
                 },
+                "railway/monorail/hanging": {
+                    "name": "Carril de monorriel colgante",
+                    "terms": "vía suspendida, vía colgante, monorriel suspendido, monorriel colgante, monocarril, monorail, monorrail"
+                },
                 "railway/narrow_gauge": {
-                    "name": "Ferrocarril de vía estrecha",
+                    "name": "Vía de trocha angosta",
                     "terms": "Ferrocarril de vía estrecha, vía angosta, gálibo estrecho"
                 },
                 "railway/platform": {
                     "name": "Plataforma de tren"
                 },
+                "railway/preserved": {
+                    "name": "Vía de tren patrimonio histórico",
+                    "terms": "patrimonio, patrimonial, protegida, histórica, historica, tren histórico, ferrocarril preservado, tren a vapor, tren turístico"
+                },
                 "railway/rail": {
-                    "name": "Vía de ferrocarril",
-                    "terms": "Rail, ferrocarril, riel, tren, raíl, vía"
+                    "name": "Vía de tren",
+                    "terms": "Rail, ferrocarril, riel, tren, raíl, vía, vía permanente, línea de ferrocarril, vía férrea"
                 },
                 "railway/rail/highspeed": {
-                    "name": "Riel de alta velocidad",
+                    "name": "Vía de tren de alta velocidad",
                     "terms": "tren bala, tren rápido, tren de alta velocidad, HSR"
                 },
                 "railway/signal": {
@@ -8885,7 +8973,7 @@
                     "name": "Estación de tren"
                 },
                 "railway/subway": {
-                    "name": "Metro",
+                    "name": "Vía de metro / subterráneo",
                     "terms": "metro, subte, subterráneo, subterraneo, transporte publico, transporte público"
                 },
                 "railway/subway_entrance": {
@@ -8901,8 +8989,8 @@
                     "terms": "lavado, lavadero, limpieza, tren, ferroviario, ferrocarril"
                 },
                 "railway/tram": {
-                    "name": "Tranvía",
-                    "terms": "tren ligero, tranvía, tranvia"
+                    "name": "Vía de tranvía",
+                    "terms": "tranvía, tranvia"
                 },
                 "railway/tram_stop": {
                     "name": "Parada de tranvía"
@@ -9086,8 +9174,8 @@
                     "terms": "quesería, quesos, lácteos"
                 },
                 "shop/chemist": {
-                    "name": "Droguería",
-                    "terms": "suministros médicos, droguería, botica, farmacia sin receta"
+                    "name": "Tienda de artículos de limpieza y cosméticos",
+                    "terms": "boticario, belleza, farmacia, regalos, cabello, medic*, venta libre, sin prescripción, dientes, pasta dental, artículos de limpieza, articulos de limpieza, limpieza, cosméticos, higiene personal, artículos de higiene personal, articulos de higiene personal"
                 },
                 "shop/chocolate": {
                     "name": "Chocolatería",
@@ -9154,8 +9242,8 @@
                     "terms": "delicatessen, gourmet, exquisiteces, charcutería"
                 },
                 "shop/department_store": {
-                    "name": "Grandes almacenes",
-                    "terms": "grandes almacenes, almacén, gran almacén, centro comercial, emporio"
+                    "name": "Grandes almacenes / Tienda departamental",
+                    "terms": "grandes almacenes, almacén, gran almacén, centro comercial, emporio, tienda de departamentos, tienda por departamentos, tienda departamental"
                 },
                 "shop/doityourself": {
                     "name": "Tienda de bricolaje / Hágalo usted mismo",
@@ -9212,9 +9300,6 @@
                     "name": "Tienda de pesca",
                     "terms": "pescador, pesca, pescar, camping"
                 },
-                "shop/fishmonger": {
-                    "name": "Pescadería -en desuso-"
-                },
                 "shop/flooring": {
                     "name": "Tienda de suministros para pisos",
                     "terms": "baldosa"
@@ -9228,7 +9313,7 @@
                     "terms": "enmarcado, enmarcaciones, encuadrado, encuadre, marcos, cuadro"
                 },
                 "shop/frozen_food": {
-                    "name": "Alimentos congelados",
+                    "name": "Tienda de alimentos congelados",
                     "terms": "alimentos, comidas, congeladas, congelados"
                 },
                 "shop/fuel": {
@@ -9239,9 +9324,6 @@
                     "name": "Funeraria",
                     "terms": "Funeraria, funeral, entierro, sepelio, funerario, fúnebre"
                 },
-                "shop/furnace": {
-                    "name": "Hornería"
-                },
                 "shop/furniture": {
                     "name": "Mueblería",
                     "terms": "mueble, mobiliario, armario, mesa, silla, cocina, muebles, tienda de muebles"
@@ -9302,6 +9384,10 @@
                     "name": "Tienda de pasatiempos",
                     "terms": "manga, figuras, modelo"
                 },
+                "shop/household_linen": {
+                    "name": "Tienda de ropa de hogar",
+                    "terms": "colchas, mantas, paños domésticos, cortinas, pañuelos, servilletas, fundas de almohadas, batas, sábanas, toallas, ropa blanca, ropa de hogar"
+                },
                 "shop/houseware": {
                     "name": "Tienda de artículos del hogar ",
                     "terms": "artículos del hogar, enseres del hogar, hogar, houseware"
@@ -9555,8 +9641,8 @@
                     "terms": "juguetes, juego, juguetería, tienda de juguetes"
                 },
                 "shop/trade": {
-                    "name": "Tienda de comercio / Corralón",
-                    "terms": "comercio, corralón, corralon, materiales, contrucción, construccion, madera, cemento, ladrillos"
+                    "name": "Tienda comercial / Corralón",
+                    "terms": "comercio, comercial, corralón, corralon, materiales, construccion, construccion, madera, cemento, ladrillos, obra"
                 },
                 "shop/travel_agency": {
                     "name": "Agencia de viajes",
@@ -9617,6 +9703,10 @@
                     "name": "Centro de datos",
                     "terms": "almacenamiento de sistemas informáticos, tecnología de la información, granja de servidores, la nube, telecomunicaciones, data center"
                 },
+                "telecom/exchange": {
+                    "name": "Central telefónica",
+                    "terms": "telecomunicaciones, central telefónica, conmutador telefónico"
+                },
                 "tourism": {
                     "name": "Elemento de turismo"
                 },
@@ -9975,6 +10065,10 @@
                     "name": "Ruta del tranvía",
                     "terms": "ruta de tranvía, línea de tranvía, tranvía, tranvia"
                 },
+                "type/route/trolleybus": {
+                    "name": "Ruta del trolebús",
+                    "terms": "ruta, trole*"
+                },
                 "type/route_master": {
                     "name": "Ruta maestra",
                     "terms": "Ruta principal"
@@ -10321,6 +10415,13 @@
                 "description": "El mapa de la ciudad es un mapa general que describe Gotemburgo. Contiene información general sobre terrenos, comunicaciones, hidrografía, edificios, números de dirección y nombres de calles, división administrativa y otro texto de orientación.",
                 "name": "Mapa de la ciudad de Gotemburgo"
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© Municipio de Gotemburgo, CC0"
+                },
+                "description": "Ortofoto para el municipio de Gotemburgo",
+                "name": "Ortofoto de Gotemburgo"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI Japón"
@@ -10488,6 +10589,12 @@
                 },
                 "name": "Thunderforest Landscape"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Mapas © Thunderforest, Datos © contribuyentes de OpenStreetMap"
+                },
+                "name": "Thunderforest Outdoors"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -10529,6 +10636,12 @@
                 },
                 "description": "Red de carreteras suecas NVDB con varias opciones de capas de mapas",
                 "name": "Trafikverket Road Network options"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Ayuntamiento de Breslavia"
+                },
+                "name": "Breslavia: Ortofoto 2018 (imágen aérea)"
             }
         },
         "community": {
@@ -10568,6 +10681,10 @@
                 "name": "Twitter de OpenStreetMap Galicia",
                 "description": "Síguenos en Twitter en {url}"
             },
+            "Galicia-Xeoinquedos-Twitter": {
+                "name": "Geoinquetos en Twitter",
+                "description": "Síguenos en Twitter en {url}"
+            },
             "GeoPhilly": {
                 "name": "GeoPhilly",
                 "description": "Encuentro para entusiastas del mapa en el área de Filadelfia",
@@ -11043,6 +11160,10 @@
                 "name": "Lista de correo de OpenStreetMap Japón",
                 "description": "Talk-ja es una lista de correo oficial para la Comunidad Japonesa"
             },
+            "OSM-japan-slack": {
+                "name": "OpenStreetMap Japón Slack",
+                "description": "Un grupo de trabajo en Slack para la comunidad de OSM Japón {signupUrl}"
+            },
             "OSM-japan-twitter": {
                 "name": "Twitter de OpenStreetMap Japón",
                 "description": "Hashtag en Twitter: {url}"
@@ -11255,6 +11376,14 @@
                 "name": "Matrix de OpenStreetMap Alemania",
                 "description": "Únase a #osm-de: matrix.org en https://riot.im/app/#/room/%23osm-de:matrix.org"
             },
+            "de-mv-mailinglist": {
+                "name": "Lista de correo de Mecklenburg-Vorpommern",
+                "description": "Esta es la lista de correo de la comunidad de OSM de Mecklenburg-Vorpommern"
+            },
+            "de-mv-twitter": {
+                "name": "Twitter de OpenStreetMap Mecklenburg-Vorpommern",
+                "description": "Síguenos en Twitter: {url}"
+            },
             "de-ostwestfalen-lippe-mailinglist": {
                 "name": "Lista de correo OWL",
                 "description": "Esta es la lista de correo de la comunidad Ostwestfalen-Lippe de OSM"
@@ -11360,6 +11489,18 @@
                 "name": "Grupo de Meetup de GeoGeeks Perth",
                 "description": "Grupo de reuniones basado en Perth para personas interesadas en mapas, datos geoespaciales y código abierto. Estaremos trabajando en cualquier cosa que implique un sentido de lugar."
             },
+            "gr-forum": {
+                "name": "Foro de OpenStreetMap GR",
+                "description": "Foro web de OpenStreetMap Grecia"
+            },
+            "gr-mailinglist": {
+                "name": "Lista de correo Talk-gr",
+                "description": "Talk-gr es la lista de correo oficial para la comunidad griega de OSM"
+            },
+            "gr-matrix": {
+                "name": "Matrix de OpenStreetMap Grecia",
+                "description": "Únase a #osm-gr:matrix.org en https://riot.im/app/#/room/%23osm-gr:matrix.org"
+            },
             "guatemala-telegram": {
                 "name": "OSM Guatemala en Telegram",
                 "description": "Chat de Telegram de OpenStreetMap Guatemala"
@@ -11368,6 +11509,10 @@
                 "name": "Grupo de Facebook de OpenStreetMap de Croacia",
                 "description": "Grupo de Facebook de OpenStreetMap de Croacia"
             },
+            "hr-forum": {
+                "name": "Foro de OSM de Croacia",
+                "description": "Foro de OpenStreetMap Croacia"
+            },
             "hr-irc": {
                 "name": "OpenStreetMap Croacia en IRC",
                 "description": "Únete a #osm-hr en irc.freenode.org (puerto 6667)"
@@ -11376,6 +11521,10 @@
                 "name": "Lista de correo Talk-hr",
                 "description": "Lista de correo Talk-hr"
             },
+            "hr-wiki": {
+                "name": "Wikiproyecto de OpenStreetMap Croacia",
+                "description": "Página de Wikiproyecto para Croacia"
+            },
             "hu-facebook": {
                 "name": "Facebook de OpenStreetMap HU",
                 "description": "Facebook de Mapeadores y OpenStreetMap en Hungría"
@@ -11606,6 +11755,10 @@
                 "name": "OpenStreetMap Ghana en Twitter",
                 "description": "Síguenos en Twitter: {url}"
             },
+            "osm-hr": {
+                "name": "OpenStreetMap Croacia",
+                "description": "La plataforma de información sobre OpenStreetMap en Croacia"
+            },
             "osm-india-forum": {
                 "name": "Foro de OpenStreetMap India",
                 "description": "Foro web de OpenStreetMap India"
@@ -11769,6 +11922,10 @@
                 "name": "OpenStreetMap Freemap Eslovaquia en Twitter",
                 "description": "OpenStreetMap Freemap Eslovaquia en Twitter: {url}"
             },
+            "talk-africa": {
+                "name": "Lista de correo Talk-africa",
+                "description": "Talk-africa es la lista de correo oficial para la comunidad africana de OSM."
+            },
             "talk-au": {
                 "name": "Lista de correo Talk-au",
                 "description": "Lugar para que los mapeadores australianos chateen"
@@ -11799,6 +11956,10 @@
                 "name": "Lista de correo de Talk-nz",
                 "description": "Charla comunitaria OSM de Nueva Zelanda"
             },
+            "talk-tz": {
+                "name": "Lista de correo Talk-tz",
+                "description": "Talk-tz es la lista de correo oficial para la comunidad OSM de Tanzania."
+            },
             "talk-za": {
                 "name": "Lista de correo Talk-za",
                 "description": "Talk-za es la lista de correo oficial para la comunidad sudafricana de OSM"

vendor/assets/iD/iD/locales/et.json

@@ -3,10 +3,12 @@
         "icons": {
             "information": "info",
             "remove": "eemalda",
-            "undo": "tühista",
+            "undo": "ennista",
             "copy": "kopeeri"
         },
         "toolbar": {
+            "inspect": "Uuri",
+            "undo_redo": "Ennista",
             "add_feature": "Lisa objekt"
         },
         "modes": {
@@ -283,6 +285,9 @@
         "loading_auth": "OpenStreetMapiga ühendamine...",
         "report_a_bug": "Teata veast",
         "help_translate": "Aita tõlkida",
+        "sidebar": {
+            "tooltip": "Lülita külgriba"
+        },
         "feature_info": {
             "hidden_warning": "{count} peidetud objekti",
             "hidden_details": "Need objektid on hetkel peidetud: {details}"
@@ -294,7 +299,6 @@
             "request_review": "Ma soovin, et keegi vaataks minu muudatused üle.",
             "save": "Laadi üles",
             "cancel": "Loobu",
-            "changes": "{count} muudatust",
             "download_changes": "Laadi alla osmChange-fail",
             "errors": "Vead",
             "warnings": "Hoiatused",
@@ -367,12 +371,7 @@
         },
         "inspector": {
             "zoom_to": {
-                "key": "Z",
-                "title": "Suumi selleni",
-                "tooltip_feature": "Tsentreeri ja suumi kaarti, et keskenduda sellele objektile.",
-                "tooltip_note": "Tsentreeri ja suumi kaarti, et keskenduda sellele teatele.",
-                "tooltip_data": "Tsentreeri ja suumi kaarti, et keskenduda sellele andmele.",
-                "tooltip_issue": "Tsentreeri ja suumi kaarti, et keskenduda sellele probleemile."
+                "key": "Z"
             },
             "show_more": "Näita rohkem",
             "view_on_osm": "Vaata asukohas openstreetmap.org",
@@ -578,10 +577,6 @@
             "on_wiki": "{tag} wiki.osm.org-is",
             "used_with": "kasutatakse koos liigiga {type}"
         },
-        "zoom": {
-            "in": "Suurenda",
-            "out": "Vähenda"
-        },
         "cannot_zoom": "Ei ole võimalik rohkem välja suumida selles vaates.",
         "full_screen": "Lülita täisekraanile",
         "QA": {
@@ -723,9 +718,17 @@
             "title": "Kiirklahvid",
             "browsing": {
                 "display_options": {
+                    "background": "Lülita taustpildi paani",
                     "background_switch": "Vaheta tagasi viimase tausta vastu",
+                    "map_data": "Lülita kaardiandmete paani",
+                    "sidebar": "Lülita külgriba",
                     "minimap": "Lülita pisikaart sisse või välja"
                 }
+            },
+            "editing": {
+                "commands": {
+                    "undo": "Võta tagasi viimane toiming"
+                }
             }
         },
         "wikidata": {
@@ -1012,6 +1015,10 @@
                 "denomination": {
                     "label": "Usulahk"
                 },
+                "description": {
+                    "label": "Kirjeldus",
+                    "terms": "seletus,info,lisainfo"
+                },
                 "diplomatic": {
                     "label": "Tüüp"
                 },
@@ -1073,9 +1080,6 @@
                     },
                     "placeholder": "Kontaktliin, elektriraudtee..."
                 },
-                "elevation": {
-                    "label": "Kõrgus merepinnast"
-                },
                 "email": {
                     "label": "E-posti aadress",
                     "placeholder": "näide@näide.ee"
@@ -1114,6 +1118,9 @@
                 "fixme": {
                     "label": "Vajab parandamist"
                 },
+                "flood_prone": {
+                    "label": "Üleujutusoht"
+                },
                 "ford": {
                     "label": "Tüüp"
                 },
@@ -1153,6 +1160,13 @@
                 "horse_riding": {
                     "label": "Ratsutamine"
                 },
+                "incline": {
+                    "label": "Kalle",
+                    "terms": "kallakus,nurk,kaldenurk,tõus,langus"
+                },
+                "incline_steps": {
+                    "label": "Kalle"
+                },
                 "indoor": {
                     "label": "Siseruum"
                 },
@@ -1172,7 +1186,6 @@
                     "label": "Perioodiline"
                 },
                 "internet_access": {
-                    "label": "Pääs internetti",
                     "options": {
                         "no": "Ei",
                         "terminal": "Terminal",
@@ -1181,9 +1194,6 @@
                         "yes": "Jah"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Internetipääsu tasu"
-                },
                 "lamp_type": {
                     "label": "Tüüp"
                 },
@@ -1918,9 +1928,6 @@
                     "name": "Ümbertöötluskeskus",
                     "terms": "Taaskasutuskeskus"
                 },
-                "amenity/register_office": {
-                    "name": "Perekonnaseisu osakond"
-                },
                 "amenity/restaurant": {
                     "name": "Restoran"
                 },
@@ -1974,9 +1981,6 @@
                 "amenity/studio/video": {
                     "name": "Filmistuudio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Ujumisbassein"
-                },
                 "amenity/taxi": {
                     "name": "Taksopeatus"
                 },
@@ -2076,9 +2080,17 @@
                     "name": "Astmestik",
                     "terms": "astmed"
                 },
+                "barrier/swing_gate": {
+                    "name": "Tiib-tõkkepuu",
+                    "terms": "tõkkepuu,käsitsi,manuaalne,värav,auto"
+                },
                 "barrier/toll_booth": {
                     "name": "Teemaksuputka"
                 },
+                "barrier/turnstile": {
+                    "name": "Turnikee",
+                    "terms": "pöördvärav,kolmeharuline"
+                },
                 "barrier/wall": {
                     "name": "Müür",
                     "terms": "Sein,vall"
@@ -2664,9 +2676,6 @@
                 "junction": {
                     "name": "Ristmik"
                 },
-                "landuse/allotments": {
-                    "name": "Ühisaed"
-                },
                 "landuse/aquaculture": {
                     "name": "Akvakultuur"
                 },
@@ -2883,6 +2892,10 @@
                     "name": "Slipp",
                     "terms": "Slipp, väikesadam"
                 },
+                "leisure/slipway_point": {
+                    "name": "Slipp",
+                    "terms": "vettelaskmise,paadi,laeva,merre"
+                },
                 "leisure/sports_centre": {
                     "name": "Spordikeskus",
                     "terms": "Spordikompleks"
@@ -3238,34 +3251,14 @@
                     "name": "Mittekasutatav raudtee",
                     "terms": "Kasutusest väljasolev raudtee, raudtee"
                 },
-                "railway/funicular": {
-                    "name": "Köisraudtee"
-                },
                 "railway/level_crossing": {
                     "name": "Raudtee-ülesõidukoht",
                     "terms": "ülesõit,ristumine,rongi"
                 },
-                "railway/monorail": {
-                    "name": "Monorelss",
-                    "terms": "üherööpmeline"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Kitsarööpaline raudtee"
-                },
-                "railway/rail": {
-                    "name": "Raudtee",
-                    "terms": "rongitee"
-                },
-                "railway/subway": {
-                    "name": "Metroo"
-                },
                 "railway/subway_entrance": {
                     "name": "Metroo sissepääs",
                     "terms": "sissepääs"
                 },
-                "railway/tram": {
-                    "name": "Tramm"
-                },
                 "relation": {
                     "name": "Relatsioon",
                     "terms": "seos"
@@ -3457,9 +3450,6 @@
                 "shop/fishing": {
                     "name": "Kalastustarvete pood"
                 },
-                "shop/fishmonger": {
-                    "name": "Kalakauplus"
-                },
                 "shop/florist": {
                     "name": "Lillepood",
                     "terms": "Florist"
@@ -3476,9 +3466,6 @@
                     "name": "Matusebüroo",
                     "terms": "kirstud, puusärgid, matused"
                 },
-                "shop/furnace": {
-                    "name": "Küttepood"
-                },
                 "shop/furniture": {
                     "name": "Mööblipood"
                 },
@@ -3765,6 +3752,10 @@
                     "name": "Kunstiinstallatsioon",
                     "terms": "installatsioon,kunst,püsinäitus,väljapanek"
                 },
+                "tourism/artwork/sculpture": {
+                    "name": "Skulptuur",
+                    "terms": "kuju,postament,kunstiteos,installatsioon"
+                },
                 "tourism/attraction": {
                     "name": "Turismiatraktsioon",
                     "terms": "vaatamisväärsus"

vendor/assets/iD/iD/locales/eu.json

@@ -107,7 +107,14 @@
             },
             "straighten": {
                 "title": "Zuzendu",
+                "description": {
+                    "points": "Puntu hauek zuzendu.",
+                    "line": "Lerro hau zuzendu."
+                },
                 "key": "S",
+                "annotation": {
+                    "points": "Puntu batzuk zuzendu."
+                },
                 "too_bendy": "Hau ezin da zuzendu gehiegi okertu delako."
             },
             "delete": {
@@ -202,7 +209,6 @@
         "commit": {
             "save": "Igo",
             "cancel": "Ezeztatu",
-            "changes": "{count} Aldaketak",
             "modified": "Editatuta",
             "deleted": "Ezabatua",
             "created": "Sortua"
@@ -213,7 +219,8 @@
                 "key": "B"
             },
             "history": {
-                "key": "H"
+                "key": "H",
+                "version": "Bertsioa"
             },
             "location": {
                 "key": "L"
@@ -244,19 +251,85 @@
         "map_data": {
             "key": "F"
         },
+        "photo_overlays": {
+            "photo_type": {
+                "flat": {
+                    "tooltip": "Argazki tradizionalak"
+                },
+                "panoramic": {
+                    "title": "Argazki panoramikoak",
+                    "tooltip": "360° argazkiak"
+                }
+            }
+        },
+        "feature": {
+            "points": {
+                "description": "Puntuak",
+                "tooltip": "Puntu interesgarriak"
+            },
+            "buildings": {
+                "description": "Eraikinak"
+            }
+        },
         "area_fill": {
             "wireframe": {
                 "key": "W"
             }
         },
+        "save": {
+            "title": "Gorde"
+        },
+        "success": {
+            "just_edited": "OpenStreetMap editatu berri duzu!",
+            "thank_you": "Eskerrik asko mapa hobetzeagatik.",
+            "more": "Gehiago",
+            "tell_us": "Kontaiguzu!"
+        },
         "confirm": {
             "okay": "ADOS"
         },
+        "QA": {
+            "improveOSM": {
+                "geometry_types": {
+                    "parking": "aparkalekua",
+                    "road": "errepideak"
+                },
+                "directions": {
+                    "east": "ekialde",
+                    "north": "iparra",
+                    "south": "hegoa",
+                    "west": "mendebalde"
+                }
+            },
+            "keepRight": {
+                "error_parts": {
+                    "this_crossing": "bidegurutze hau",
+                    "this_bridge": "zubi hau",
+                    "this_tunnel": "tunel hau",
+                    "railway": "trenbide",
+                    "waterway": "ubide",
+                    "university": "unibertsitatea"
+                }
+            }
+        },
+        "streetside": {
+            "title": "Bing Streetside"
+        },
+        "mapillary": {
+            "title": "Mapillary"
+        },
+        "openstreetcam": {
+            "title": "OpenStreetCam"
+        },
+        "note": {
+            "close": "Oharra itxi"
+        },
         "help": {
             "title": "Laguntza",
             "key": "H",
             "help": {
-                "title": "Laguntza"
+                "title": "Laguntza",
+                "before_start_h": "Hasi aurretik"
             },
             "editing": {
                 "select_h": "Aukeratu",
@@ -285,6 +358,19 @@
                 }
             }
         },
+        "issues": {
+            "private_data": {
+                "title": "Informazio pribatua"
+            },
+            "fix": {
+                "add_a_bridge": {
+                    "title": "Zubi bat gehitu"
+                },
+                "add_a_tunnel": {
+                    "title": "Tunel bat gehitu"
+                }
+            }
+        },
         "intro": {
             "done": "eginda",
             "ok": "ADOS",
@@ -298,12 +384,24 @@
                 "province": "<value for addr:province>",
                 "quarter": "<value for addr:quarter>",
                 "subdistrict": "<value for addr:subdistrict>",
-                "suburb": "<value for addr:suburb>"
+                "suburb": "<value for addr:suburb>",
+                "name": {
+                    "pizza-hut": "Pizza Hut"
+                }
+            },
+            "welcome": {
+                "title": "Ongi etorri"
+            },
+            "points": {
+                "title": "Puntuak"
             },
             "areas": {
                 "title": "Eremuak",
                 "choose_playground": "**Aukeratu {preset}-a zerrendatik.**"
             },
+            "lines": {
+                "title": "Lerroak"
+            },
             "buildings": {
                 "title": "Eraikuntzak"
             },
@@ -325,6 +423,12 @@
                 "title": "Editatu",
                 "drawing": {
                     "title": "Marraztu"
+                },
+                "operations": {
+                    "straighten": "Puntu lerro bat zuzendu"
+                },
+                "commands": {
+                    "save": "Aldaketak gorde"
                 }
             },
             "tools": {
@@ -340,6 +444,9 @@
             "east": "E",
             "west": "W"
         },
+        "wikidata": {
+            "label": "Etiketa"
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
@@ -805,9 +912,6 @@
                     },
                     "placeholder": "Ukipenezko linea, Errail elektrifikatua..."
                 },
-                "elevation": {
-                    "label": "Goragune"
-                },
                 "email": {
                     "label": "Posta-elektroniko",
                     "placeholder": "example@example.com"
@@ -997,7 +1101,6 @@
                     "label": "Aldizka"
                 },
                 "internet_access": {
-                    "label": "Interneterako sarbide",
                     "options": {
                         "no": "Ez",
                         "terminal": "Terminal",
@@ -1006,9 +1109,6 @@
                         "yes": "Bai"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Interneterako sarbidearen tarifa"
-                },
                 "kerb": {
                     "label": "Frenatu"
                 },
@@ -1926,18 +2026,12 @@
                 "amenity/recycling_container": {
                     "name": "Birziklatze ontzi"
                 },
-                "amenity/register_office": {
-                    "name": "Erregistro bulegoa"
-                },
                 "amenity/restaurant": {
                     "name": "Jatetxe"
                 },
                 "amenity/school": {
                     "name": "Eskola eremu"
                 },
-                "amenity/scrapyard": {
-                    "name": "Txatarra metaketa"
-                },
                 "amenity/shelter": {
                     "name": "Aterpetxe"
                 },
@@ -1977,9 +2071,6 @@
                 "amenity/studio": {
                     "name": "Estudio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Igerileku"
-                },
                 "amenity/taxi": {
                     "name": "Taxi postu"
                 },

vendor/assets/iD/iD/locales/fa.json

@@ -7,7 +7,11 @@
             "undo": "واگرد",
             "zoom_to": "بزرگ‌نمایی روی این",
             "copy": "کپی",
-            "favorite": "موردعلاقه"
+            "view_on": "نمایش در {domain}",
+            "favorite": "موردعلاقه",
+            "list": "لیست",
+            "text": "متن",
+            "deselect": "لغو انتخاب"
         },
         "toolbar": {
             "inspect": "بازرسی",
@@ -16,6 +20,14 @@
             "favorites": "موردعلاقه‌ها",
             "add_feature": "افزودن عارضه"
         },
+        "title": {
+            "format": {
+                "context": "{base} – {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} – {context}"
+            },
+            "labeled_and_more": "{labeled} و {count} تا دیگر"
+        },
         "modes": {
             "add_feature": {
                 "title": "افزودن یک عارضه",
@@ -103,7 +115,38 @@
             },
             "circularize": {
                 "title": "دایره",
-                "key": "O"
+                "description": {
+                    "single": "این عارضه را دایره‌ای کنید.",
+                    "multiple": "این عارضه‌ها را دایره‌ای کنید."
+                },
+                "key": "O",
+                "annotation": {
+                    "single": "یک عارضه دایره‌ای شد.",
+                    "multiple": "چند عارضه دایره‌ای شد."
+                },
+                "multiple_blockers": {
+                    "multiple": "به دلایل متعدد، این‌ها را نمی‌توان دایره‌ای کرد."
+                },
+                "not_closed": {
+                    "single": "دایره نمی‌شود زیرا بسته نیست.",
+                    "multiple": "دایره نمی‌شوند زیرا بسته نیستند."
+                },
+                "too_large": {
+                    "single": "دایره نمی‌شود زیرا مقدار کافی از آن دیده نمی‌شود.",
+                    "multiple": "دایره نمی‌شوند زیرا مقدار کافی از آن‌ها دیده نمی‌شود."
+                },
+                "connected_to_hidden": {
+                    "single": "دایره نمی‌شود زیرا به یک عارضهٔ پنهان متصل است.",
+                    "multiple": "دایره نمی‌شوند زیرا برخی از آن‌ها به عارضه‌های پنهان متصل است."
+                },
+                "not_downloaded": {
+                    "single": "دایره نمی‌شود زیرا بخش‌هایی از آن هنوز دانلود نشده است.",
+                    "multiple": "دایره نمی‌شوند زیرا بخش‌هایی از آن‌ها هنوز دانلود نشده است."
+                },
+                "already_circular": {
+                    "single": "بیش از این، دایره نمی‌شود.",
+                    "multiple": "بیش از این، دایره نمی‌شوند."
+                }
             },
             "orthogonalize": {
                 "title": "مربع",
@@ -144,7 +187,8 @@
                     "multiple": "قائمه نمی‌شوند زیرا شبیه قائمه نیستند."
                 },
                 "too_large": {
-                    "single": "قائمه نمی‌شود زیرا مقدار کافی از آن دیده نمی‌شود."
+                    "single": "قائمه نمی‌شود زیرا مقدار کافی از آن دیده نمی‌شود.",
+                    "multiple": "قائمه نمی‌شوند زیرا مقدار کافی از آن‌ها دیده نمی‌شود."
                 },
                 "connected_to_hidden": {
                     "single": "قائمه نمی‌شود زیرا به یک عارضهٔ پنهان متصل است.",
@@ -552,7 +596,7 @@
             "request_review": "می‌خواهم کسی ویرایش‌هایم را بررسی کند.",
             "save": "بارگذاری",
             "cancel": "لغو",
-            "changes": "{count} تغییر",
+            "changes": "تغییرات ({count})",
             "download_changes": "دانلود تغییرات در قالب osmChange",
             "errors": "خطاها",
             "warnings": "اخطارها",
@@ -641,20 +685,24 @@
         },
         "geolocate": {
             "title": "نمایش مکان من",
-            "locating": "در حال مکان‌یابی، لطفا صبر کنید..."
+            "locating": "در حال مکان‌یابی، لطفا صبر کنید...",
+            "location_unavailable": "مکان شما در دسترس نیست."
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "بزرگ‌نمایی روی این",
-                "tooltip_feature": "این عارضه را در مرکز قرار بده و روی آن بزرگنمایی کن.",
-                "tooltip_note": "این یادداشت را در مرکز قرار بده و روی آن بزرگنمایی کن.",
-                "tooltip_data": "این داده‌ها را در مرکز قرار بده و روی آن بزرگنمایی کن.",
-                "tooltip_issue": "این مسئله را در مرکز قرار بده و روی آن بزرگنمایی کن."
+                "title": "بزرگ‌نمایی روی انتخاب"
             },
             "show_more": "نمایش بیشتر",
             "view_on_osm": "نمایش در openstreetmap.org",
+            "view_on_osmose": "نمایش در osmose.openstreetmap.fr",
             "view_on_keepRight": "نمایش در keepright.at",
+            "feature_type": "نوع عارضه",
+            "fields": "خانه‌ها",
+            "tags_count": "تگ‌ها ({count})",
+            "members_count": "عضوها ({count})",
+            "relations_count": "رابطه‌ها ({count})",
+            "features_count": "عارضه‌ها ({count})",
             "add_to_relation": "این عارضه را به یک رابطه اضافه کنید",
             "new_relation": "رابطهٔ جدید...",
             "choose_relation": "یک رابطهٔ مادر انتخاب کنید",
@@ -665,16 +713,20 @@
             "edit_reference": "اصلاح/ترجمه",
             "wiki_reference": "مشاهده مستندات",
             "wiki_en_reference": "مشاهده مستندات به زبان انگلیسی",
+            "multiple_values": "چندین مقدار",
+            "multiple_types": "چندین نوع",
             "hidden_preset": {
                 "manual": "{features} مخفی هستند. آن‌ها را از طریق کادر «داده‌های نقشه» فعال کنید.",
                 "zoom": "{features} مخفی هستند. بزرگنمایی کنید تا فعال شوند."
             },
+            "back_tooltip": "تغییر نوع عارضه",
             "remove": "پاک کردن",
             "search": "جستجو",
             "unknown": "نامشخص",
             "incomplete": "<دانلود نشده>",
             "feature_list": "جستجوی عارضه‌ها",
             "edit": "ویرایش عارضه",
+            "edit_features": "ویرایش عارضه‌ها",
             "check": {
                 "yes": "بله",
                 "no": "خیر",
@@ -693,7 +745,10 @@
             "way": "راه",
             "relation": "رابطه",
             "location": "مکان",
-            "add_fields": "افزودن فیلد:"
+            "add_fields": "افزودن فیلد:",
+            "lock": {
+                "suggestion": "خانهٔ «{label}» قفل است زیرا یک تگ ویکی‌داده وجود دارد. می‌توانید عارضه را حذف کنید یا تگ‌ها را در بخش «تگ‌ها» ویرایش نمایید."
+            }
         },
         "background": {
             "title": "پس‌زمینه",
@@ -722,6 +777,7 @@
                 "description": "نمایش کادر جزئیات",
                 "tooltip": "نمایش اطلاعات پیشرفتهٔ پسزمینه"
             },
+            "fix_misalignment": "آفست تصویر",
             "offset": "برای تنظیم افست تصاویر، محدوده خاکستری زیر را بکشید یا مقادیر را به متر در کادر زیر وارد کنید."
         },
         "map_data": {
@@ -739,11 +795,17 @@
                     "title": "یادداشت‌های اوپن‌استریت‌مپ"
                 },
                 "keepRight": {
+                    "tooltip": "کشف مسائلی در داده به‌وسیلهٔ keepright.at",
                     "title": "مسائل KeepRight"
                 },
                 "improveOSM": {
+                    "tooltip": "کشف کمبود داده به‌وسیلهٔ improveosm.org",
                     "title": "مسائل ImproveOSM"
                 },
+                "osmose": {
+                    "tooltip": "کشف مسائلی در داده به‌وسیلهٔ  osmose.openstreetmap.f",
+                    "title": "مسائل Osmose"
+                },
                 "custom": {
                     "tooltip": "یک فایل اطلاعاتی را به داخل صفحه بکشید و رها کنید یا برای تنظیم روی دکمه کلیک کنید",
                     "title": "دادهٔ سفارشی برای نقشه",
@@ -863,7 +925,7 @@
             "custom_background": {
                 "tooltip": "ویرایش پس‌زمینهٔ سفارشی",
                 "header": "تنظیمات پس‌زمینهٔ سفارشی",
-                "instructions": "الگوی URL برای کاشی را وارد کنید. توکن‌های معتبر عبارت‌اند از:\n   {zoom} یا {z}،‏ {x} و {y} برای URL کاشی‌هایی که از سبک Z/X/Y استفاده می‌کنند\n   ‎{-y} or {ty} for flipped TMS-style Y coordinates\n   ‎{u} for quadtile scheme\n   ‎{switch:a,b,c} for DNS server multiplexing\nمثال:\n{example}",
+                "instructions": "الگوی نشانی وب کاشی وارد کنید. توکن‌های معتبر عبارت‌اند از:\n   {zoom} یا {z}،‏ {x}،‏ {y} برای URL کاشی‌هایی که از سبک Z/X/Y استفاده می‌کنند\n   ‎{-y} یا {ty} برای مختصات Y وارونه در قالب TMS\n   ‎{u} برای طرح quadtile\n   ‎{switch:a,b,c} برای همتافتگری کارساز DNS\nمثال:\n{example}",
                 "template": {
                     "placeholder": "یک الگوی URL بنویسید"
                 }
@@ -882,6 +944,18 @@
                 }
             }
         },
+        "preferences": {
+            "title": "ترجیحات",
+            "description": "ترجیحات",
+            "privacy": {
+                "title": "حریم خصوصی",
+                "privacy_link": "دیدن سیاست حریم خصوصی iD",
+                "third_party_icons": {
+                    "description": "نمایش آیکون‌های شخص ثالث",
+                    "tooltip": "علامت این گزینه را بردارید تا آیکون‌ها از سایت‌های ثالث مانند Wikimedia Commons،‏ Facebook یا Twitter بار نشوند."
+                }
+            }
+        },
         "restore": {
             "heading": "شما تغییرات ذخیره‌نشده دارید",
             "description": "آیا مایلید تغییرات ذخیره‌نشده از جلسهٔ قبل را بازیابی کنید؟",
@@ -948,6 +1022,9 @@
         "splash": {
             "welcome": "به ویرایشگر iD خوش آمدید",
             "text": "iD یک ابزار کاربرپسند اما قدرتمند برای مشارکت در بهترین نقشهٔ آزاد جهان است. این نسخهٔ  {version} است. برای اطلاعات بیشتر {website} را ببینید و خرابی‌های سایت را در {github} گزارش دهید.",
+            "privacy_update": "سیاست حریم خصوصی ما به‌تازگی روزآمد شده است.",
+            "privacy_policy": "سیاست حریم خصوصی iD",
+            "privacy": "{updateMessage} با استفاده از این نرم‌افزار، می‌پذیرید که از {privacyLink} پیروی کنید.",
             "walkthrough": "راهنمای گام‌به‌گام را آغاز کنید",
             "start": "اکنون ویرایش می‌کنم"
         },
@@ -970,7 +1047,20 @@
         },
         "cannot_zoom": "در حالت فعلی بیش از این نمیتوان کوچک نمایی کرد.",
         "full_screen": "تعویض صفحه‌نمایش کامل",
+        "self_intersection": {
+            "error": {
+                "lines": "خط‌ها نمی‌توانند از روی خودشان بگذرند.",
+                "areas": "محدوده‌ها نمی‌توانند از روی خودشان بگذرند."
+            }
+        },
         "QA": {
+            "osmose": {
+                "title": "مسائل Osmose",
+                "detail_title": "جزئیات",
+                "elems_title": "عارضه‌ها",
+                "fix_title": "راهنمای اصلاح",
+                "trap_title": "اشتباه‌های رایج"
+            },
             "improveOSM": {
                 "title": "تشخیص ImproveOSM",
                 "geometry_types": {
@@ -1006,11 +1096,15 @@
                 }
             },
             "keepRight": {
+                "title": "KeepRight",
                 "detail_description": "توضیح",
                 "comment": "نظردادن",
                 "comment_placeholder": "دیدگاهتان را بنویسید تا با سایر کاربران به‌اشتراک گذاشته شود.",
+                "close": "بستن (خطا اصلاح شد)",
+                "ignore": "حذف (مثبت کاذب)",
                 "save_comment": "ذخیره‌سازی پیام",
                 "close_comment": "بستن و نظردادن",
+                "ignore_comment": "حذف با نظردهی",
                 "error_parts": {
                     "this_node": "این گره",
                     "this_way": "این راه",
@@ -1397,7 +1491,7 @@
                 "before_start": "پیش از آنکه ویرایش را آغاز کنید، باید با اوپن‌استریت‌مپ و این ویرایشگر آشنا شوید. ویرایشگر iD یک راهنمای گام‌به‌گام دارد که مبانی ویرایش اوپن‌استریت‌مپ را به شما آموزش می‌دهد. در این صفحه روی «راهنمای گام‌به‌گام» کلیک کنید تا به این آموزش وارد شوید. این آموزش خیلی وقتتان را نمی‌گیرد، حداکثر ۱۵ دقیقه.",
                 "open_source_h": "کدهای باز",
                 "open_source": "ویرایشگر iD یک پروژهٔ جمعی و متن‌باز است و هم‌اکنون از نسخهٔ {version} استفاده می‌کنید. کد منبع [روی گیت‌هاب](https://github.com/openstreetmap/iD) در دسترس است.",
-                "open_source_help": "شما هم می‌توانید با [ترجمه](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) یا [گزارش باگ‌ها](https://github.com/openstreetmap/iD/issues) به ویرایشگر iD کمک کنید."
+                "open_source_help": "می‌توانید با [ترجمه](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) یا [گزارش باگ‌ها](https://github.com/openstreetmap/iD/issues) به ویرایشگر iD کمک کنید."
             },
             "overview": {
                 "title": "مرور کلی",
@@ -1431,14 +1525,16 @@
             "feature_editor": {
                 "title": "ویرایشگر عارضه",
                 "intro": "*ویرایشگر عارضه* در کنار نقشه ظاهر می‌شود و به‌وسیلهٔ آن می‌توانید همهٔ اطلاعات مربوط به عارضهٔ انتخاب‌شده را ببینید و ویرایش کنید.",
-                "definitions": "در قسمت بالای ویرایشگر عارضه، می‌توانید نوع عارضه را ببینید. در قسمت میانی *فیلد*هایی وجود دارد که خصوصیات عارضه را نشان می‌دهند، مانند نام یا نشانی آن.",
+                "definitions": "در قسمت بالای ویرایشگر عارضه، می‌توانید نوع عارضه را ببینید. در قسمت میانی *خانه*هایی وجود دارد که خصوصیات عارضه را نشان می‌دهند، مانند نام یا نشانی آن.",
                 "type_h": "نوع عارضه",
                 "type": "با کلیک‌کردن روی نوع عارضه می‌توانید نوع آن را تغییر دهید. هر چیزی که در جهان واقعی وجود دارد را می‌توانیم به اوپن‌استریت‌مپ اضافه کنیم، بنابراین هزاران نوع عارضه هست که می‌توانیم انتخاب کنیم.",
                 "type_picker": "انتخابگرِ نوع عارضه رایج‌ترین انواع عارضه‌ها را نشان می‌دهد، مانند پارک‌ها، بیمارستان‌ها، رستوران‌ها، جاده‌ها و ساختمان‌ها. خودتان می‌توانید هر آنچه را که می‌خواهید در کادر جست‌وجو بنویسید و پیدا کنید. همچنین با کلیک‌کردن روی نماد **اطلاعات** {inspect} که در کنار نوع عارضه قرار دارد می‌توانید اطلاعات بیشتری از آن عارضه کسب کنید.",
-                "fields_h": "فیلدها",
-                "fields_example": "برای هر نوع عارضه‌ای یکسری فیلدهای خاص نمایش داده می‌شود. مثلاً برای یک جاده، فیلدهایی مثل جنس سطح و محدودیت سرعت مشاهده می‌کنید؛ اما برای یک رستوران فیلدهایی برای مشخص‌کردن نوع خوراک و ساعت کاری رستوران مشاهده خواهید کرد.",
-                "fields_add_field": "همچنین می‌توانید روی منوی اُفتانِ «افزودن فیلد» کلیک کنید تا فیلدهای دیگری را اضافه کنید؛ مانند توضیحات، لینک ویکی‌پدیا، دسترسی ویلچر و... .",
+                "fields_h": "خانه‌ها",
+                "fields_all_fields": "بخش «خانه‌ها» حاوی همهٔ جزئیاتی از عارضه است که شاید بخواهید ویرایش کنید. در اوپن‌استریت‌مپ همهٔ خانه‌ها اختیاری هستند و اگر مطمئن نبودید، اشکالی ندارد آن‌ها را خالی بگذارید.",
+                "fields_example": "برای هر نوع عارضه‌ای یکسری خانه‌های خاص نمایش داده می‌شود. مثلاً برای جاده، خانه‌هایی مثل جنس سطح و محدودیت سرعت مشاهده می‌کنید؛ اما برای رستوران خانه‌هایی برای مشخص‌کردن نوع خوراک و ساعت کاری رستوران مشاهده خواهید کرد.",
+                "fields_add_field": "همچنین می‌توانید روی منوی اُفتانِ «افزودن خانه» کلیک کنید تا خانه‌های دیگری اضافه کنید؛ مانند توضیحات، لینک ویکی‌پدیا، دسترسی ویلچر و... .",
                 "tags_h": "تگ‌ها",
+                "tags_all_tags": "بعد از بخش خانه‌ها، بخش «تگ‌ها» وجود دارد که می‌توانید آن را باز کنید تا هرکدام از *تگ‌های* اوپن‌استریت‌مپ را برای عارضهٔ انتخاب‌شده تغییر دهید. هر تگ از یک *کلید* و *مقدار* تشکیل می‌شود. این دو عنصرِ اطلاعاتی همهٔ عارضه‌های ذخیره‌شده در اوپن‌استریت‌مپ را تعریف می‌کنند.",
                 "tags_resources": "برای اینکه مستقیماً تگ‌ها را ویرایش کنید باید اطلاعات متوسطی از اوپن‌استریت‌مپ کسب کنید. برای این منظور باید به منابعی مانند  [ویکی اوپن‌استریت‌مپ](https://wiki.openstreetmap.org/wiki/Main_Page) یا [Taginfo](https://taginfo.openstreetmap.org/) مراجعه کنید تا با شیوهٔ تگ‌گذاری پذیرفته‌شده در اوپن‌استریت‌مپ آشنا شوید."
             },
             "points": {
@@ -1499,6 +1595,8 @@
                 "title": "رابطه‌ها",
                 "intro": "*رابطه* یک نوع عارضهٔ خاص در اوپن‌استریت‌مپ است و در واقع یک گروه از سایر عارضه‌هاست. عارضه‌هایی که به یک رابطه تعلق دارند *عضو* نامیده می‌شوند. هر عضو می‌تواند یک *نقش* در رابطه داشته باشد.",
                 "edit_relation_h": "ویرایش رابطه‌ها",
+                "edit_relation": "در انتهای ویرایشگر عارضه، بخشی به نام «رابطه‌ها» وجود دارد. در این قسمت می‌توانید ببینید آیا عارضهٔ انتخاب‌شده عضوی از یک رابطه است یا خیر. سپس می‌توانید روی رابطه کلیک کنید تا انتخاب شود و آن را ویرایش کنید.",
+                "edit_relation_add": "برای اینکه عارضه‌ای را به یک رابطه اضافه کنید، ابتدا عارضه را انتخاب کنید. سپس در قسمت «رابطه‌ها» از ویرایشگر عارضه، روی دکمهٔ افزودن {plus} کلیک کنید. سپس می‌توانید از داخل فهرست، یکی از رابطه‌های نزدیکتان را انتخاب کنید. همچنین می‌توانید گزینهٔ «رابطهٔ جدید...» را برگزینید.",
                 "edit_relation_delete": "همچنین می‌توانید روی دکمهٔ **حذف** {delete} کلیک کنید تا عارضهٔ انتخاب‌شده را از رابطه حذف کنید. اگر همهٔ عضوها را از یک رابطه حذف کنید، آن رابطه نیز به‌طور خودکار حذف خواهد شد.",
                 "maintain_relation_h": "نگهداری رابطه‌ها",
                 "maintain_relation": "بیشتر مواقع، هنگامی که رابطه‌ها را ویرایش می‌کنید iD خودش از آن‌ها مراقبت می‌کند. شما باید هنگام جایگزین‌کردن عارضه‌هایی که عضو رابطه هستند دقت کنید. برای مثال اگر تکه‌ای از یک جاده را حذف کنید و تکهٔ جدیدی به‌جای آن رسم کنید، باید این تکهٔ جدید را به همان رابطهٔ اصلی اضافه کنید (این رابطه می‌تواند رابطهٔ مسیر، محدودیت گردش و... باشد).",
@@ -1513,8 +1611,10 @@
                 "turn_restriction_editing": "در فیلد «محدودیت‌های گردش» کلیک کنید و یک جاده را به‌عنوان «از» انتخاب کنید و ببینید گردش به کدام یک از جاده‌های «به» آزاد است و به کدام یک ممنوع است. با کلیک‌کردن روی نمادهای گردش می‌توانید آن گردش را ممنوع یا آزاد کنید. iD به‌طور خودکار رابطه را می‌سازد و نقش‌های from،‏ via و to را بر اساس انتخاب شما به عضوها می‌دهد.",
                 "route_h": "مسیرها",
                 "route": "یک رابطهٔ *مسیر* یا Route مجموعه‌ای از یک یا چند عارضهٔ خطی است که با هم یک شبکهٔ جاده‌ای تشکیل می‌دهند. مثل مسیر اتوبوس، مسیر قطار یا مسیر بزرگراه.",
+                "route_add": "برای اینکه عارضه‌ای را به یک رابطهٔ مسیر (route) اضافه کنید، آن عارضه را انتخاب کنید و در ویرایشگر عارضه به قسمت «رابطه‌ها» بروید. سپس روی دکمهٔ افزودن {plus} کلیک کنید تا این عارضه را به یک رابطهٔ نزدیک یا جدید اضافه کنید.",
                 "boundary_h": "مرزها",
-                "boundary": "یک رابطهٔ *مرز* یا boundary گروهی از یک یا چند عارضهٔ خطی است که با هم یک مرز جغرافیایی را تشکیل می‌دهند."
+                "boundary": "یک رابطهٔ *مرز* یا boundary گروهی از یک یا چند عارضهٔ خطی است که با هم یک مرز جغرافیایی را تشکیل می‌دهند.",
+                "boundary_add": "برای اینکه عارضه‌ای را به یک رابطهٔ مرز (boundary) اضافه کنید، آن عارضه را انتخاب کنید و در ویرایشگر عارضه به قسمت «رابطه‌ها» بروید. سپس روی دکمهٔ افزودن {plus} کلیک کنید تا این عارضه را به یک رابطهٔ نزدیک یا جدید اضافه کنید."
             },
             "notes": {
                 "title": "یادداشت‌ها",
@@ -1558,6 +1658,7 @@
                 "title": "تضمین کیفیت",
                 "intro": "به‌کمک ابزارهای *تضمین کیفیت* یا *Quality Assurance* (Q/A)‎ می‌توانیم تگ‌های نادرست، جاده‌های غیرمتصل و سایر مشکلات موجود در اوپن‌استریت‌مپ را پیدا کنیم و نقشه‌کش‌ها در صورت نیاز آن‌ها را اصلاح می‌کنند. برای دیدن مشکلاتی که هنوز حل نشده، روی دکمهٔ **داده‌های نقشه** {data} کلیک کنید و یکی از لایه‌های تضمین کیفیت را فعال کنید.",
                 "tools_h": "ابزارها",
+                "tools": "در حال حاضر ویرایشگر iD از این ابزارها پشتیبانی می‌کند:  [KeepRight](https://www.keepright.at/)،‏ [ImproveOSM](https://improveosm.org/en/) و [Osmose](https://osmose.openstreetmap.fr/).",
                 "issues_h": "کارکردن با مسائل",
                 "issues": "کارکردن با مسئله‌های تضمین کیفیت مثل کارکردن با یادداشت‌هاست. روی یکی از نشانه‌گذارهای نقشه کلیک کنید تا جزئیات مسئله را در کادر کنار صفحه ببینید. هر کدام از ابزارها امکانات خودشان را دارند، اما به‌طور کلی می‌توانید روی یک مسئله پیام بگذارید یا آن را ببندید. "
             },
@@ -1621,7 +1722,7 @@
                     "everything_in_view": "همهٔ چیزهای نمایان خوب به‌نظر می‌رسند",
                     "edits": "ویرایش‌های شما خوب به‌نظر می‌رسند",
                     "edits_in_view": "ویرایش‌های نمایان شما خوب به‌نظر می‌رسند",
-                    "no_edits": "هنوز ویرایشی ندارید"
+                    "no_edits": "هنوز ویرایش نکرده‌اید"
                 },
                 "hidden_issues": {
                     "none": "اگر مسئله‌ای تشخیص دهیم، اینجا نمایش می‌یابد",
@@ -1767,6 +1868,10 @@
                     "reference": "محصولات گوگل دارای حقوق انحصاری هستند و نباید مرجع قرار بگیرند."
                 }
             },
+            "incorrect_name": {
+                "message": "{feature} نام اشتباه «{name}» دارد",
+                "message_language": "{feature} در زبان {language} نام اشتباه «{name}» دارد"
+            },
             "invalid_format": {
                 "title": "قالب نامعتبر",
                 "tip": "یافتن تگ‌های با قالب غیرمنتظره",
@@ -1871,6 +1976,7 @@
                 }
             },
             "unclosed_multipolygon_part": {
+                "message": "{feature} بخش بسته‌نشده‌ای دارد",
                 "reference": "در یک multipolygon نقاط ابتدایی و انتهایی در inner و outer باید متصل باشد."
             },
             "unsquare_way": {
@@ -1947,6 +2053,9 @@
                 "remove_generic_name": {
                     "annotation": "یک نام عمومی حذف شد."
                 },
+                "remove_mistaken_name": {
+                    "annotation": "نام اشتباه حذف شد."
+                },
                 "remove_private_info": {
                     "annotation": "اطلاعات خصوصی حذف شد."
                 },
@@ -2162,12 +2271,12 @@
                 "selected_townhall": "عالی بود! نقطه را انتخاب کردید. دور عارضه‌های انتخاب‌شده یک نوار چشمک‌زن درخشان کشیده می‌شود.",
                 "editor_townhall": "هنگامی که یک عارضه را انتخاب کنید *ویرایشگر عارضه* در کنار نقشه نمایان می‌شود.",
                 "preset_townhall": "در قسمت بالای ویرایشگر عارضه نوع عارضه را می‌بینید. این نقطه یک {preset} است.",
-                "fields_townhall": "در قسمت میانی ویرایشگر عارضه، *فیلد*هایی وجود دارد که خصوصیات عارضه را نشان می‌دهند، مانند نام عارضه و نشانی آن.",
+                "fields_townhall": "در قسمت میانی ویرایشگر عارضه، *خانه*هایی وجود دارد که خصوصیات عارضه را نشان می‌دهند، مانند نام عارضه و نشانی آن.",
                 "close_townhall": "**برای بستن ویرایشگر عارضه، کلید Esc را از روی صفحه‌کلید فشار دهید یا روی دکمهٔ {button} در گوشهٔ بالا کلیک کنید.",
                 "search_street": "همچنین می‌توانید بین عارضه‌های موجود در نمای فعلی یا عارضه‌های سراسر جهان جست‌وجو کنید. **«{name}» را جست‌وجو کنید.**",
                 "choose_street": "**{name} را از لیست برگزینید تا انتخاب شود.**",
                 "selected_street": "عالی بود! اکنون {name} انتخاب شده است.",
-                "editor_street": "فیلدهایی که برای یک خیابان نشان داده می‌شود با فیلدهایی که برای شهرداری نشان داده شد، فرق می‌کند.{br}برای این خیابانی که انتخاب کرده‌ایم، ویرایشگرِ عارضه فیلدهایی مانند «{field1}» و «{field2}» را نشان می‌دهد. **با زدن کلید Esc یا کلیک روی دکمهٔ {button}، ویرایشگر عارضه را ببندید.**",
+                "editor_street": "خانه‌هایی که برای خیابان نشان داده می‌شود با خانه‌هایی که برای شهرداری نشان داده شد، فرق می‌کند.{br}برای این خیابانی که انتخاب کرده‌ایم، ویرایشگرِ عارضه خانه‌هایی مانند «{field1}» و «{field2}» را نشان می‌دهد. **با زدن کلید Esc یا کلیک روی دکمهٔ {button}، ویرایشگر عارضه را ببندید.**",
                 "play": "حالا خودتان امتحان کنید. نقشه را تکان دهید و روی عارضه‌های دیگر کلیک کنید تا با چیزهایی که می‌توان به اوپن‌استریت‌مپ اضافه کرد بیشتر آشنا شوید. **هروقت برای رفتن به فصل بعدی آماده بودید روی «{next}» کلیک کنید.**"
             },
             "points": {
@@ -2177,7 +2286,7 @@
                 "search_cafe": "عارضه‌های گوناگون و فراوانی وجود دارد که می‌توانیم با نقطه ایجادشان کنیم. نقطه‌ای که شما اضافه کردید قرار است یک کافه باشد. **«{preset}» را جست‌وجو کنید.**",
                 "choose_cafe": "**{preset} را از لیست برگزینید.**",
                 "feature_editor": "اکنون این نقطه یک کافه را نشان می‌دهد. با استفاده از ویرایشگر عارضه، می‌توانیم اطلاعات بیشتری را دربارهٔ کافه اضافه کنیم.",
-                "add_name": "در اوپن‌استریت‌مپ، همهٔ فیلدها اختیاری هستند و اگر مطمئن نبودید و فیلدی را خالی گذاشتید هیچ اشکالی ندارد.{br}بیایید فرض کنیم که شما این کافه را می‌شناسید و نامش را می‌دانید. **نامی برای کافه بنویسید.**",
+                "add_name": "در اوپن‌استریت‌مپ، همهٔ خانه‌ها اختیاری هستند و اگر مطمئن نبودید و خانه‌ای را خالی گذاشتید هیچ اشکالی ندارد.{br}بیایید فرض کنیم که شما این کافه را می‌شناسید و نامش را می‌دانید. **نامی برای کافه بنویسید.**",
                 "add_close": "ویرایشگر عارضه به‌طور خودکار همهٔ تغییرات شما را به‌خاطر می‌سپارد. **وقتی نوشتن نام به پایان رسید، Esc یا Enter را بزنید یا روی دکمهٔ {button} کلیک کنید تا ویرایشگر عارضه بسته شود.**",
                 "reselect": "خیلی وقت‌ها نقطه‌ها از قبل وجود دارند، اما اشتباهی در آن‌ها هست یا کامل نیستند. می‌توانیم نقطه‌های موجود را نیز ویرایش کنیم. **کلیک کنید و کافه‌ای که لحظاتی قبل ساختید را انتخاب کنید.**",
                 "update": "بیایید جزئیات بیشتری برای این کافه وارد کنیم. می‌توانید نام آن را عوض کنید، نوع خوراک آن را اضافه کنید یا نشانی آن را بنویسید. **جزئیات کافه را تغییر دهید.**",
@@ -2298,7 +2407,8 @@
                     "pan": "جابه‌جاکردن نقشه",
                     "pan_more": "جابه‌جاکردن نقشه به‌اندازهٔ صفحهٔ کامل",
                     "zoom": "بزرگ‌نمایی / کوچک‌نمایی",
-                    "zoom_more": "بزرگ‌نمایی / کوچک‌نمایی زیاد"
+                    "zoom_more": "بزرگ‌نمایی / کوچک‌نمایی زیاد",
+                    "geolocate": "بزرگنمایی روی مکان من"
                 },
                 "help": {
                     "title": "راهنما",
@@ -2311,6 +2421,7 @@
                     "background_switch": "بازگشت به آخرین پس‌زمینه",
                     "map_data": "باز و بسته کردن کادر داده‌های نقشه",
                     "issues": "باز و بسته کردن کادر مسئله‌های اعتبارسنجی",
+                    "preferences": "باز و بسته کردن کادر ترجیحات",
                     "fullscreen": "ورود به حالت تمام‌صفحه",
                     "sidebar": "باز و بسته کردن نوار کناری",
                     "wireframe": "تغییر وضعیت حالت سیمی",
@@ -2971,9 +3082,6 @@
                     },
                     "placeholder": "خط ارتباطی، راه‌آهن برقی..."
                 },
-                "elevation": {
-                    "label": "ارتفاع از سطح دریا"
-                },
                 "email": {
                     "label": "ایمیل",
                     "placeholder": "example@example.com"
@@ -3173,7 +3281,6 @@
                     "label": "دوره‌ای"
                 },
                 "internet_access": {
-                    "label": "دسترسی اینترنت",
                     "options": {
                         "no": "خیر",
                         "terminal": "پايانه",
@@ -3182,9 +3289,6 @@
                         "yes": "بله"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "هزینهٔ دسترسی به اینترنت"
-                },
                 "internet_access/ssid": {
                     "label": "نام شبکهٔ وای‌فای"
                 },
@@ -3351,7 +3455,8 @@
                 },
                 "name": {
                     "label": "نام",
-                    "placeholder": "نام رایج (در صورت وجود)"
+                    "placeholder": "نام رایج (در صورت وجود)",
+                    "terms": "اسم, عنوان"
                 },
                 "natural": {
                     "label": "طبیعی"
@@ -4053,10 +4158,6 @@
                     "name": "تله‌اسکی",
                     "terms": "تلسکی, بالابر, بالابر کشنده, کشنده"
                 },
-                "aerialway/gondola": {
-                    "name": "تله کابین",
-                    "terms": "گوندولا, کابین"
-                },
                 "aerialway/goods": {
                     "name": "راه هوایی محموله",
                     "terms": "راه هوایی کالا, کالا, محموله"
@@ -4387,9 +4488,6 @@
                     "name": "سطل بازیافت",
                     "terms": "بازیافت"
                 },
-                "amenity/register_office": {
-                    "name": "اداره ثبت"
-                },
                 "amenity/restaurant": {
                     "name": "رستوران",
                     "terms": "بار, صبحانه, کافه, شام, ناهار,غذا,خوردن,خوردنی,نوشیدن,نوشیدنی,پیتزا,کباب,همبرگر"
@@ -4480,9 +4578,6 @@
                 "amenity/studio": {
                     "name": "استدیو"
                 },
-                "amenity/swimming_pool": {
-                    "name": "استخر شنا"
-                },
                 "amenity/taxi": {
                     "name": "تاکسی",
                     "terms": "آژانس"
@@ -5295,10 +5390,6 @@
                     "name": "تقاطع",
                     "terms": "چهارراه، سه راه، سه راهی، دوراهی"
                 },
-                "landuse/allotments": {
-                    "name": "باغ مشارکتی",
-                    "terms": "باغچه مشارکتی"
-                },
                 "landuse/aquaculture": {
                     "name": "آبزی‌پروری",
                     "terms": "پرورش آبزیان, مزرعه ماهی"
@@ -5360,15 +5451,9 @@
                 "landuse/military/naval_base": {
                     "name": "پایگاه نیروی دریایی"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "ميدان موانع"
-                },
                 "landuse/military/range": {
                     "name": "محدوده نظامی"
                 },
-                "landuse/military/training_area": {
-                    "name": "منطقه آموزشی"
-                },
                 "landuse/orchard": {
                     "name": "باغ میوه",
                     "terms": "میوه"
@@ -5579,9 +5664,6 @@
                 "man_made/gasometer": {
                     "name": "کنتور گاز"
                 },
-                "man_made/groyne": {
-                    "name": "آبشکن"
-                },
                 "man_made/lighthouse": {
                     "name": "فانوس دریایی"
                 },
@@ -5955,32 +6037,13 @@
                 "railway/disused": {
                     "name": "راه آهن بلا استفاده"
                 },
-                "railway/funicular": {
-                    "name": "کابلی"
-                },
                 "railway/level_crossing": {
                     "name": "تقاطع راه‌آهن (با جاده)",
                     "terms": "راه آهن,قطار,ریل,رانندگی,تقاطع"
                 },
-                "railway/monorail": {
-                    "name": "مونوریل"
-                },
-                "railway/narrow_gauge": {
-                    "name": "راه آهن باریک کابلی"
-                },
-                "railway/rail": {
-                    "name": "ریل قطار"
-                },
-                "railway/subway": {
-                    "name": "مترو"
-                },
                 "railway/subway_entrance": {
                     "name": "ورودی مترو"
                 },
-                "railway/tram": {
-                    "name": "تراموا",
-                    "terms": "تراموا, واگن برقی"
-                },
                 "relation": {
                     "name": "رابطه"
                 },
@@ -6167,9 +6230,6 @@
                     "name": "فروشگاه لوازم ماهی گیری",
                     "terms": "قلاب ماهی گیری, ماهی گیری, صید"
                 },
-                "shop/fishmonger": {
-                    "name": "ماهی فروشی"
-                },
                 "shop/florist": {
                     "name": "گل فروشی"
                 },
@@ -6184,9 +6244,6 @@
                 "shop/funeral_directors": {
                     "name": "غسالخانه"
                 },
-                "shop/furnace": {
-                    "name": "فروشگاه مشعل و اجاق"
-                },
                 "shop/furniture": {
                     "name": "فروشگاه مبلمان",
                     "terms": "میز و صندلی"

vendor/assets/iD/iD/locales/fr.json

@@ -20,6 +20,14 @@
             "favorites": "Favoris",
             "add_feature": "Ajouter un élément"
         },
+        "title": {
+            "format": {
+                "context": "{base} – {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} – {context}"
+            },
+            "labeled_and_more": "{labeled} et {count} de plus"
+        },
         "modes": {
             "add_feature": {
                 "title": "Ajouter un élément",
@@ -173,6 +181,22 @@
                 "square_enough": {
                     "single": "Cet élément ne peut pas être plus orthogonal qu'il ne l'est déjà.",
                     "multiple": "Ces éléments ne peuvent pas être plus orthogonaux qu'ils ne le sont déjà."
+                },
+                "not_squarish": {
+                    "single": "Cet élément ne peut être orthogonalisé car il n'a pas une forme carrée.",
+                    "multiple": "Ces éléments ne peuvent être orthogonalisés car ils n'ont pas une forme carrée."
+                },
+                "too_large": {
+                    "single": "Cet élément ne peut être rendu orthogonal car il n'est pas assez visible.",
+                    "multiple": "Ces éléments ne peuvent être rendus orthogonaux car ils ne sont pas assez visibles."
+                },
+                "connected_to_hidden": {
+                    "single": "Cet élément ne peut être rendu orthogonal car il est connecté à un objet masqué.",
+                    "multiple": "Ces éléments ne peuvent être rendus orthogonaux car certains d'entre eux sont connectés à des objets masqués."
+                },
+                "not_downloaded": {
+                    "single": "Cet élément ne peut être rendu orthogonal car il n'a pas été complètement téléchargé.",
+                    "multiple": "Ces éléments ne peuvent être rendus orthogonaux car ils n'ont pas été complètement téléchargés."
                 }
             },
             "straighten": {
@@ -574,7 +598,7 @@
             "request_review": "Je souhaite que quelqu'un vérifie mes modifications",
             "save": "Envoyer",
             "cancel": "Annuler",
-            "changes": "{count} modification(s) :",
+            "changes": "Changements ({count})",
             "download_changes": "Télécharger le fichier osmChange",
             "errors": "Erreurs",
             "warnings": "Attention",
@@ -662,20 +686,19 @@
             "no_results_worldwide": "Aucun résultat trouvé"
         },
         "geolocate": {
+            "key": "L",
             "title": "Me localiser",
-            "locating": "Localisation, veuillez patienter…"
+            "locating": "Localisation, veuillez patienter…",
+            "location_unavailable": "Votre localisation n'est pas disponible."
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "Zoomer dessus",
-                "tooltip_feature": "Centrer et zoomer la carte sur cet élément.",
-                "tooltip_note": "Centrer et zoomer la carte sur cette note.",
-                "tooltip_data": "Centrer et zoomer la carte sur cette donnée.",
-                "tooltip_issue": "Centrer et zoomer la carte sur ce problème."
+                "title": "Zoomer sur la sélection"
             },
             "show_more": "Plus d'informations",
             "view_on_osm": "Consulter sur openstreetmap.org",
+            "view_on_osmose": "Voir sur osmose.openstreetmap.fr",
             "view_on_keepRight": "Voir sur keepright.at",
             "feature_type": "Type d'élément",
             "fields": "Champs",
@@ -701,6 +724,7 @@
                 "manual": "{features} sont cachés. Activez-les dans le panneau de données de carte.",
                 "zoom": "{features} sont cachés. Zoomez pour les afficher."
             },
+            "back_tooltip": "Changer le type d'élément",
             "remove": "Supprimer",
             "search": "Rechercher",
             "unknown": "Inconnu",
@@ -758,6 +782,7 @@
                 "description": "Afficher la barre des détails",
                 "tooltip": "Afficher les informations avancées sur le fond."
             },
+            "fix_misalignment": "Décalage d'image",
             "offset": "« Glissez » partout dans la zone grise ci-dessous pour ajuster le décalage d'image, ou entrez les valeurs de décalage en mètres."
         },
         "map_data": {
@@ -1030,12 +1055,19 @@
         },
         "cannot_zoom": "Impossible de zoomer plus en arrière dans ce mode.",
         "full_screen": "Afficher/cacher le plein écran",
+        "self_intersection": {
+            "error": {
+                "lines": "Les lignes ne peuvent pas se croiser elles-mêmes.",
+                "areas": "Les aires ne peuvent pas se croiser elles-mêmes."
+            }
+        },
         "QA": {
             "osmose": {
                 "title": "Signalement Osmose",
                 "detail_title": "Détails",
-                "trap_title": "Erreurs fréquentes",
-                "translation": "Traduction fournie par Osmose"
+                "elems_title": "Éléments",
+                "fix_title": "Guides de correction",
+                "trap_title": "Erreurs fréquentes"
             },
             "improveOSM": {
                 "title": "Détections ImproveOSM",
@@ -1072,6 +1104,7 @@
                 }
             },
             "keepRight": {
+                "title": "KeepRight",
                 "detail_description": "Description",
                 "comment": "Commentaire",
                 "comment_placeholder": "Saisissez un commentaire à partager avec d'autres utilisateurs.",
@@ -1399,21 +1432,37 @@
             "title": "Éléments de la carte",
             "tooltip": "Éléments de la carte de Mapillary",
             "request_data": "Demander les données",
+            "construction": {
+                "flat": {
+                    "crosswalk_plain": "passage piéton uni"
+                }
+            },
+            "marking": {
+                "discrete": {
+                    "crosswalk_zebra": "passage piéton à zerba"
+                }
+            },
             "object": {
+                "banner": "bannière",
                 "bench": "banc",
                 "bike_rack": "arceau à vélo",
+                "billboard": "panneau d'affichage",
+                "catch_basin": "bassin de rétention",
                 "cctv_camera": "caméra de surveillance",
                 "fire_hydrant": "borne incendie",
                 "mailbox": "boite aux lettres",
                 "manhole": "Bouche d'égout",
                 "phone_booth": "Cabine téléphonique",
                 "sign": {
-                    "advertisement": "Publicité"
+                    "advertisement": "Publicité",
+                    "information": "Panneau d'information",
+                    "store": "enseigne"
                 },
                 "street_light": "lampadaire",
                 "support": {
                     "utility_pole": "Poteau d'infrastructure"
                 },
+                "traffic_cone": "cône de signalisation",
                 "traffic_light": {
                     "cyclists": "feux tricolores pour cyclistes",
                     "general_horizontal": "feux tricolores horizontaux",
@@ -1478,7 +1527,7 @@
                 "before_start": "Vous devez maîtriser OpenStreetMap et cet éditeur avant de commencer à modifier. iD comprend un guide pour vous apprendre les bases de la modification d'OpenStreetMap. Cliquez sur « Commencer le tutoriel » sur cet écran pour suivre le guide - cela ne prend que 15 minutes environ.",
                 "open_source_h": "Open source",
                 "open_source": "L'éditeur iD est un projet collaboratif open source, et vous êtes en train d'utiliser la version {version}. Le code source est disponible [sur GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Vous pouvez contribuer à iD en [traduisant](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) ou en [déclarant des bugs](https://github.com/openstreetmap/iD/issues)."
+                "open_source_help": "Vous pouvez contribuer à iD en [traduisant](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) ou en [déclarant des bugs](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
                 "title": "Présentation",
@@ -1517,9 +1566,11 @@
                 "type": "Vous pouvez cliquer sur le type d'un élément pour le changer pour un autre type. Tout ce qui exist dans le monde réel peut être ajouter dans OpenStreetMap, Il y a donc de milliers de types possibles",
                 "type_picker": "Le sélectionneur de type affiche les types d'éléments les plus fréquents, tels que les parcs, hôpitaux, restaurants, routes et bâtiments. Vous pouvez tout cherchez en tapant ce que vous voulez dans le champs de recherche. Vous pouvez aussi cliquer sur l'icône {inspect} **Info** à côté du type de l'élément pour en apprendre plus.",
                 "fields_h": "Champs",
+                "fields_all_fields": "La section \"Champs\" contient tous les détails de l'élément que vous éditez. Dans OpenStreetMap, tous les champs sont optionnels, aussi, si vous n'êtes pas sûr de votre saisie, vous pouvez laisser un champ vide.",
                 "fields_example": "Chaque type d’élément affichera des champs différents. Par exemple, une route peut afficher des champs pour le type de surface et la limitation de vitesse et un restaurant peut afficher des champs pour le type de nourriture servie et ses horaires d'ouverture.",
                 "fields_add_field": "Vous pouvez aussi cliquer sur le menu déroulant « Ajouter un champ » pour ajouter plus d'informations, comme une description, un lien Wikipédia, un accès handicapé, et cetera…",
                 "tags_h": "Attributs",
+                "tags_all_tags": "En dessous de la partie avec les champs, vous pouvez développer la section « Attributs » pour modifier les *attributs* OpenStreetMap de l’élément sélectionné. Chaque tag consiste en une *clef* et une *valeur*, des données qui définissent tous les éléments enregistrés dans OpenStreetMap.",
                 "tags_resources": "Vous aurez besoin d'un niveau de connaissance intermédiaire sur OpenStreetMap pour modifier les attributs d'un élément. Vous devriez consulter des ressources comme le [Wiki d’OpenStreetMap](https://wiki.openstreetmap.org/wiki/Main_Page) ou [Taginfo](https://taginfo.openstreetmap.org/) pour en apprendre plus sur les pratiques de tagging acceptées dans OpenStreetMap."
             },
             "points": {
@@ -1580,6 +1631,8 @@
                 "title": "Relations",
                 "intro": "Une *relation* est un élément spécial dans OpenStreetMap qui regroupe ensemble d'autres éléments. Les éléments qui appartiennent à une relation sont appelés *membres*, et chacun de ces membres peut avoir un *rôle* dans la relation.",
                 "edit_relation_h": "Modifier des Relations",
+                "edit_relation": "En bas de l'éditeur, vous pouvez agrandir la section \"Relations\" pour voir si l'élément sélectionné est membre d'une ou plusieurs relations. Vous pouvez alors cliquer sur la relation pour la sélectionner et l'éditer.",
+                "edit_relation_add": "Pour ajouter un membre à une relation, sélectionnez l'élément, puis cliquez sur le bouton d'ajout {plus} dans la section \"Relations\" de l'éditeur. Vous pouvez sélectionner une relation parmi celles existantes à proximité, ou choisir l'option \"Nouvelle relation...\".",
                 "edit_relation_delete": "Vous pouvez également cliquer sur le bouton **Supprimer** {delete}  pour supprimer un élément d'une relation. Si vous supprimez tous les éléments d'une relation, celle-ci sera automatiquement supprimée.",
                 "maintain_relation_h": "Maintenir des Relations",
                 "maintain_relation": "La plupart du temps, iD maintient automatiquement les relations lors de l'édition.\nVous devez toutefois faire attention quand vous remplacez des éléments qui sont membres de relations. Par exemple, si vous supprimez la section d'une route et que vous en créez une nouvelle pour la remplacer, vous devez impérativement ajouter la nouvelle section aux mêmes relations que l'ancienne (itinéraires, interdictions de tourner, etc…).",
@@ -1594,6 +1647,7 @@
                 "turn_restriction_editing": "Dans le champ « interdictions de tourner », cliquez pour sélectionner une route « depuis », et voyez s'il est autorisé ou non de tourner sur une ou plusieurs routes « vers ». Vous pouvez cliquer sur l'icône de direction pour basculer la position entre autorisé et interdit. iD créera automatiquement les relations et mettra à jour les rôles selon votre saisie.",
                 "route_h": "Itinéraires",
                 "route": "Une relation *itinéraire* est un groupe d'une ou plusieurs lignes formant ensemble un réseau, comme un itinéraire de bus, un itinéraire ferroviaire, ou un itinéraire routier.",
+                "route_add": "Pour ajouter un élément à une relation itinéraire, sélectionnez cet élément et descendez jusqu'à la section \"Relations\" de l'éditeur, puis cliquez sur le bouton d'ajout {plus} pour l'intégrer à une relation existante à proximité ou à une nouvelle relation.",
                 "boundary_h": "Frontières",
                 "boundary": "Une relation *frontière* est un groupe d'une ou plusieurs lignes formant ensemble une frontière administrative.",
                 "boundary_add": "Pour ajouter un élément à une relation frontière, sélectionnez cet élément et défilez vers le bas jusqu'à la section \"Relations\" de l'éditeur d'éléments, puis cliquez sur le bouton d'ajout {plus} pour ajouter cet élément à une relation existante proche ou à une nouvelle relation."
@@ -2392,7 +2446,8 @@
                     "pan": "Déplacer la vue",
                     "pan_more": "Déplacer la vue, de la taille de tout l'écran",
                     "zoom": "Zoomer en avant / en arrière",
-                    "zoom_more": "Zoomer en avant / en arrière par grand incrément"
+                    "zoom_more": "Zoomer en avant / en arrière par grand incrément",
+                    "geolocate": "Zoomer sur ma position"
                 },
                 "help": {
                     "title": "Aide",
@@ -2628,6 +2683,7 @@
                         "block_number": "Numéro de bloc",
                         "block_number!jp": "Bloc numéro",
                         "city": "Ville",
+                        "city!cn": "Ville/Préfecture/Ligue",
                         "city!jp": "Ville/Village/Quartier spécial de Tokyo",
                         "city!vn": "Ville (plus de 10 000 habitants)",
                         "conscriptionnumber": "123",
@@ -2635,6 +2691,7 @@
                         "county": "Comté",
                         "county!jp": "District",
                         "district": "District",
+                        "district!cn": "District/Conté/Bannière",
                         "district!vn": "Arrondissement/Ville/District",
                         "floor": "Étage",
                         "hamlet": "Hameau",
@@ -2646,6 +2703,7 @@
                         "place": "attribut d'adresse (Place)",
                         "postcode": "Code postal",
                         "province": "Province",
+                        "province!cn": "Province/Municipalité/RA/RAS",
                         "province!jp": "Préfecture",
                         "quarter": "Quartier (division urbaine)",
                         "quarter!jp": "Ōaza/Machi (Quartier)",
@@ -2741,13 +2799,21 @@
                     "label": "Type"
                 },
                 "baby_feeding": {
+                    "label": "Zone pour nourrir des bébés",
                     "options": {
-                        "room": "Pièce dédiée"
-                    }
+                        "no": "Aucun",
+                        "room": "Pièce dédiée",
+                        "yes": "Emplacement marqué"
+                    },
+                    "terms": "zone pour nourrir des bébés,nourrir des bébés,bébés,mère,tétée,donner le sein,manger"
                 },
                 "baby_seat": {
                     "label": "Siège bébé"
                 },
+                "backcountry": {
+                    "label": "Hors-piste",
+                    "terms": "hors-piste, hors piste"
+                },
                 "backrest": {
                     "label": "Dossier de siège"
                 },
@@ -2775,6 +2841,9 @@
                         "onsen": "Onsen, bain japonais"
                     }
                 },
+                "beauty": {
+                    "label": "Services"
+                },
                 "bench": {
                     "label": "Banc",
                     "terms": "Banc"
@@ -2813,6 +2882,9 @@
                 "booth": {
                     "label": "Type de cabine"
                 },
+                "bottle": {
+                    "label": "Remplissage de bouteilles"
+                },
                 "boules": {
                     "label": "Type"
                 },
@@ -2840,7 +2912,8 @@
                 },
                 "building/levels": {
                     "label": "Étages",
-                    "placeholder": "2, 4, 6..."
+                    "placeholder": "2, 4, 6...",
+                    "terms": "niveaux,étages,paliers"
                 },
                 "building/levels/underground": {
                     "label": "Niveaux souterrains",
@@ -2857,7 +2930,8 @@
                     "terms": "matériaux, matière, substance"
                 },
                 "building_area": {
-                    "label": "Bâtiment"
+                    "label": "Bâtiment",
+                    "terms": "bâtiment,construction,bâtiment,batiment,building"
                 },
                 "bunker_type": {
                     "label": "Type"
@@ -2886,6 +2960,14 @@
                     "placeholder": "50, 100, 200...",
                     "terms": "capacité, quantité, nombre"
                 },
+                "capacity/disabled_parking": {
+                    "label": "Emplacements PMR",
+                    "placeholder": "1, 2, 3..."
+                },
+                "capacity_parking": {
+                    "label": "Emplacements totaux",
+                    "placeholder": "10, 20, 30..."
+                },
                 "cash_in": {
                     "label": "Dépôt"
                 },
@@ -2906,7 +2988,13 @@
                     "terms": "Tarif péage, frais d'autoroute"
                 },
                 "check_date": {
-                    "label": "Dernière date de vérification"
+                    "label": "Dernière date de vérification",
+                    "placeholder": "AAAA-MM-JJ"
+                },
+                "circumference": {
+                    "label": "Circonférence",
+                    "placeholder": "1 m, 20 cm, 30 in…",
+                    "terms": "circonférence,contour,longueur,rayon"
                 },
                 "clothes": {
                     "label": "Vêtements"
@@ -2929,6 +3017,9 @@
                     "label": "Type de communication",
                     "terms": "type,type de télécommunication,tour de télécommunication,diffusion,antenne,téléphone portable,téléphone cellulaire,gsm,tour,radio,mât de transmission,pylône de transmission"
                 },
+                "connectivity": {
+                    "label": "Connectivité"
+                },
                 "construction": {
                     "label": "Type"
                 },
@@ -2959,6 +3050,9 @@
                 "country": {
                     "label": "Pays"
                 },
+                "country_flag": {
+                    "label": "Drapeau du pays"
+                },
                 "couplings": {
                     "label": "Raccords",
                     "placeholder": "1, 2, 3..."
@@ -2988,7 +3082,8 @@
                     "label": "Île de refuge"
                 },
                 "cuisine": {
-                    "label": "Cuisines"
+                    "label": "Cuisines",
+                    "terms": "cuisines,types de nourriture,nourriture,type de nourriture"
                 },
                 "currency_multi": {
                     "label": "Types de devises",
@@ -3066,6 +3161,9 @@
                         "yes": "Oui"
                     }
                 },
+                "depth": {
+                    "label": "Profondeur (mètres)"
+                },
                 "description": {
                     "label": "Description",
                     "terms": "description,résumé"
@@ -3103,7 +3201,8 @@
                 },
                 "direction": {
                     "label": "Direction (en degrés dans le sens horaire)",
-                    "placeholder": "45, 90, 180, 270"
+                    "placeholder": "45, 90, 180, 270",
+                    "terms": "direction,orientation"
                 },
                 "direction_cardinal": {
                     "label": "Direction",
@@ -3153,6 +3252,9 @@
                 "disused/railway": {
                     "label": "Type"
                 },
+                "disused/shop": {
+                    "label": "Type"
+                },
                 "dock": {
                     "label": "Type"
                 },
@@ -3187,6 +3289,14 @@
                     "placeholder": "00:00",
                     "terms": "durée"
                 },
+                "ele": {
+                    "label": "Altitude",
+                    "terms": "altitude,hauteur,élévation"
+                },
+                "ele_node": {
+                    "label": "Altitude",
+                    "terms": "altitude,hauteur,élévation"
+                },
                 "electrified": {
                     "label": "Électrification",
                     "options": {
@@ -3195,11 +3305,8 @@
                         "rail": "Rails électrifiés",
                         "yes": "Oui (non spécifié)"
                     },
-                    "placeholder": "Caténaire, troisième rail…"
-                },
-                "elevation": {
-                    "label": "Altitude",
-                    "terms": "altitude"
+                    "placeholder": "Caténaire, troisième rail…",
+                    "terms": "électrification,électrifié,sous tension,caténaire,troisième rail"
                 },
                 "email": {
                     "label": "Courrier électronique",
@@ -3487,19 +3594,13 @@
                     "label": "Intermittent"
                 },
                 "internet_access": {
-                    "label": "Accès internet",
                     "options": {
                         "no": "Non",
                         "terminal": "Terminal",
                         "wired": "Par câble",
                         "wlan": "Wifi",
                         "yes": "Oui"
-                    },
-                    "terms": "accès internet,wifi,wlan"
-                },
-                "internet_access/fee": {
-                    "label": "Frais d'accès à Internet",
-                    "terms": "frais d'accès internet,internet,wifi,wlan,gratuit,payant"
+                    }
                 },
                 "internet_access/ssid": {
                     "label": "Nom du réseau WiFi",
@@ -3528,6 +3629,9 @@
                 "kerb/height": {
                     "label": "Hauteur"
                 },
+                "kneipp_water_cure_multi": {
+                    "label": "Types de bassin"
+                },
                 "label": {
                     "label": "Étiquette"
                 },
@@ -3761,8 +3865,7 @@
                     "terms": "réseau"
                 },
                 "network/type": {
-                    "label": "Type de réseau",
-                    "terms": "type de réseau,réseau"
+                    "label": "Type de réseau"
                 },
                 "network_bicycle": {
                     "label": "Classification du réseau",
@@ -3836,7 +3939,8 @@
                     "label": "Feux ouverts autorisés"
                 },
                 "opening_date": {
-                    "label": "Date d'ouverture prévue"
+                    "label": "Date d'ouverture prévue",
+                    "placeholder": "AAAA-MM-JJ"
                 },
                 "opening_hours": {
                     "label": "Horaires d'ouverture",
@@ -4042,7 +4146,11 @@
                     "label": "Type"
                 },
                 "pump": {
-                    "label": "Pompe"
+                    "label": "Pompe",
+                    "options": {
+                        "no": "Aucun",
+                        "yes": "Oui"
+                    }
                 },
                 "railway": {
                     "label": "Type"
@@ -4423,6 +4531,7 @@
                 },
                 "start_date": {
                     "label": "Date de début",
+                    "placeholder": "AAAA-MM-JJ",
                     "terms": "date de début,début"
                 },
                 "step_count": {
@@ -4537,6 +4646,9 @@
                 "target": {
                     "label": "Cible"
                 },
+                "telecom/medium": {
+                    "label": "Moyenne"
+                },
                 "tidal": {
                     "label": "Sous l'influence de la marée",
                     "terms": "marée,influence maritime"
@@ -4848,10 +4960,6 @@
                     "name": "Téléski",
                     "terms": "téléski, teleski, remonte-pente, tire-fesses, drag lift"
                 },
-                "aerialway/gondola": {
-                    "name": "Télécabine",
-                    "terms": "télécabine, telecabine, remontée mécanique, nacelle, cabine, téléphérique, telepherique, téléférique, teleferique, bulle, gondola"
-                },
                 "aerialway/goods": {
                     "name": "Transport par câble pour marchandises - si possible utiliser un type plus précis",
                     "terms": "Téléphérique pour marchandises"
@@ -5029,6 +5137,9 @@
                     "name": "Location de voiture",
                     "terms": "Location de voitures, loueur de voiture, loueur de véhicule, car rental"
                 },
+                "amenity/car_sharing": {
+                    "name": "Station d'auto-partage"
+                },
                 "amenity/car_wash": {
                     "name": "Station de lavage de voiture",
                     "terms": "Lavage de voiture, lave auto, station lavage, station-lavage, lave-auto, car wash"
@@ -5224,6 +5335,9 @@
                     "name": "Cybercafé",
                     "terms": "Café internet,Cybercafé"
                 },
+                "amenity/karaoke_box": {
+                    "name": "Karaoke"
+                },
                 "amenity/language_school": {
                     "name": "École de langues",
                     "terms": "école de langues,langues étrangères"
@@ -5440,9 +5554,6 @@
                     "name": "Conteneur de recyclage",
                     "terms": "recyclable,bouteille,canette,carton,verre,déchet,recyclage,poubelle,bulle à verre"
                 },
-                "amenity/register_office": {
-                    "name": "Bureau d'état-civil"
-                },
                 "amenity/restaurant": {
                     "name": "Restaurant",
                     "terms": "Restaurant,brasserie"
@@ -5527,9 +5638,6 @@
                     "name": "École élémentaire ou secondaire",
                     "terms": "école élémentaire, école primaire, école secondaire, collège, lycée, \ncycles primaires et secondaires, enseignements élémentaire et secondaire, \nenseignement élémentaire, enseignement secondaire, \nétablissement d'enseignement élémentaire, établissement d'enseignement secondaire,\nécole, écoliers, CP-CE1-CE2-CM1-CM2, ecole, college, lycee, school"
                 },
-                "amenity/scrapyard": {
-                    "name": "Casse automobile"
-                },
                 "amenity/shelter": {
                     "name": "Abri",
                     "terms": "Abri"
@@ -5606,9 +5714,6 @@
                     "name": "Studio de cinéma",
                     "terms": "studio de cinéma,films,production vidéo,tournage"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Piscine"
-                },
                 "amenity/taxi": {
                     "name": "Station de taxi",
                     "terms": "Station de taxi"
@@ -5967,6 +6072,9 @@
                     "name": "Échalier",
                     "terms": "échalier, echalier, escalier, échelle, passerelle, franchissement, passage, enclos, haie, bétail, piétons, randonneurs, stile"
                 },
+                "barrier/swing_gate": {
+                    "name": "Barrière pivotante"
+                },
                 "barrier/toll_booth": {
                     "name": "Poste de péage",
                     "terms": "péage, péage routier, péage autoroutier, poste de péage, barrière de péage, gare de péage, zone de péage, bureau de péage, pont à péage, agent de péage, peage, route à péage, autoroute, taxe, toll booth"
@@ -6469,6 +6577,9 @@
                     "name": "Kit de premiers secours",
                     "terms": "bandage, pansement, premiers secours, kit médical, kit d'urgence, trousse de secours, trousse d'urgence"
                 },
+                "emergency/landing_site": {
+                    "name": "Site d’atterrissage d’urgence"
+                },
                 "emergency/life_ring": {
                     "name": "Bouée de Sauvetage",
                     "terms": "bouée de sauvetage"
@@ -6477,6 +6588,9 @@
                     "name": "sauveteur",
                     "terms": "sauveteur, maître-nageur, secouriste, surveillant"
                 },
+                "emergency/mountain_rescue": {
+                    "name": "Secours de montagne"
+                },
                 "emergency/no": {
                     "name": "Non accessible aux services d'urgences"
                 },
@@ -6628,6 +6742,9 @@
                     "name": "Orthophoniste",
                     "terms": "Orthophoniste"
                 },
+                "highway": {
+                    "name": "Équipement autoroutier"
+                },
                 "highway/bridleway": {
                     "name": "Sentier équestre",
                     "terms": "Piste cavalière, Sentier à chevaux, Sentier pour chevaux"
@@ -7033,10 +7150,6 @@
                     "name": "Jonction routière",
                     "terms": "Jonction routière, Jonction, Carrefour, Intersection routière,  Intersection"
                 },
-                "landuse/allotments": {
-                    "name": "Jardins familiaux",
-                    "terms": "Jardins familiaux"
-                },
                 "landuse/aquaculture": {
                     "name": "Aquaculture",
                     "terms": "halieuculture,aquiculture,mariculture,pisciculture,conchyliculture,astaciculture,pénéiculture,coraliculture,algoculture"
@@ -7142,18 +7255,10 @@
                     "name": "Base Navale",
                     "terms": "Base navale"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Parcours du combattant",
-                    "terms": "Course d'obstacles"
-                },
                 "landuse/military/range": {
                     "name": "Stand de tir militaire",
                     "terms": "Champ de tir"
                 },
-                "landuse/military/training_area": {
-                    "name": "Zone d'entraînement militaire",
-                    "terms": "Zone de formation militaire"
-                },
                 "landuse/orchard": {
                     "name": "Verger",
                     "terms": "Verger"
@@ -7514,26 +7619,14 @@
                     "name": "Piste de cyclisme",
                     "terms": "piste de cyclisme,cyclisme,piste,course,vélodrome"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Piste de cyclisme",
-                    "terms": "piste de cyclisme,cyclisme,piste,course,vélodrome"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Piste de courses hippiques",
                     "terms": "piste de course,course hippique,hippique,cheval,chevaux,équestre,pari sportif"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Piste de courses hippiques",
-                    "terms": "piste de course,course hippique,hippique,cheval,chevaux,équestre,pari sportif"
-                },
                 "leisure/track/running": {
                     "name": "Piste de course à pied",
                     "terms": "piste de course à pied,course à pied,athlétisme"
                 },
-                "leisure/track/running_point": {
-                    "name": "Piste de course à pied",
-                    "terms": "piste de course à pied,course à pied,athlétisme"
-                },
                 "leisure/water_park": {
                     "name": "Parc à thème aquatique",
                     "terms": "Parc d'attractions aquatiques"
@@ -7610,10 +7703,6 @@
                     "name": "Gazomètre",
                     "terms": "Gazomètre"
                 },
-                "man_made/groyne": {
-                    "name": "Épi maritime",
-                    "terms": "épi maritime"
-                },
                 "man_made/lighthouse": {
                     "name": "Phare",
                     "terms": "Phare"
@@ -7811,8 +7900,7 @@
                     "terms": "Bunker, Casemate, Combat, Garde, Marine, Navy, Troupes, Armée"
                 },
                 "military/checkpoint": {
-                    "name": "Poste de contrôle militaire",
-                    "terms": "Poste-frontière, Point de contrôle, Poste de contrôle, Checkpoint"
+                    "name": "Poste de contrôle militaire"
                 },
                 "military/nuclear_explosion_site": {
                     "name": "Site d'explosion nucléaire",
@@ -7844,7 +7932,7 @@
                 },
                 "natural/cave_entrance": {
                     "name": "Entrée de caverne",
-                    "terms": "Abri sous roche"
+                    "terms": "Abri sous roche,grotte"
                 },
                 "natural/cliff": {
                     "name": "Falaise",
@@ -8561,6 +8649,9 @@
                     "name": "Emplacement où s'arrête le trolley",
                     "terms": "emplacement où s'arrête le trolley,arrêt de trolley,stop de trolley,trolley"
                 },
+                "railway": {
+                    "name": "Équipement ferroviaire"
+                },
                 "railway/abandoned": {
                     "name": "Voie ferrée déposée",
                     "terms": "Voie ferrée abandonnée"
@@ -8585,10 +8676,6 @@
                     "name": "Voie ferrée désaffectée",
                     "terms": "Voie ferrée non utilisée"
                 },
-                "railway/funicular": {
-                    "name": "Funiculaire",
-                    "terms": "Funiculaire"
-                },
                 "railway/halt": {
                     "name": "Gare ferroviaire (arrêt à la demande)"
                 },
@@ -8596,37 +8683,13 @@
                     "name": "Passage à niveau (route)",
                     "terms": "Passage à niveau (voiture)"
                 },
-                "railway/light_rail": {
-                    "name": "Métro léger",
-                    "terms": "Métro léger"
-                },
                 "railway/milestone": {
                     "name": "Borne kilométrique ferroviaire",
                     "terms": "borne kilométrique ferroviaire"
                 },
-                "railway/miniature": {
-                    "name": "Train miniature à passagers",
-                    "terms": "train miniature,mini train"
-                },
-                "railway/monorail": {
-                    "name": "Monorail",
-                    "terms": "Monorail"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Voie étroite",
-                    "terms": "Voie ferrée étroite"
-                },
                 "railway/platform": {
                     "name": "Quai de gare ferroviaire"
                 },
-                "railway/rail": {
-                    "name": "Voie ferrée",
-                    "terms": "Rail"
-                },
-                "railway/rail/highspeed": {
-                    "name": "Ligne à grande vitesse",
-                    "terms": "Ligne à grande vitesse,LGV,TGV,train rapide"
-                },
                 "railway/signal": {
                     "name": "Feux tricolores ferroviaires",
                     "terms": "feux tricolores ferroviaires,signalisation ferroviaire"
@@ -8634,10 +8697,6 @@
                 "railway/station": {
                     "name": "Gare ferroviaire"
                 },
-                "railway/subway": {
-                    "name": "Métropolitain",
-                    "terms": "Métro, Métropolitain"
-                },
                 "railway/subway_entrance": {
                     "name": "Bouche de métro",
                     "terms": "Entrée de métro, Bouche de métro"
@@ -8650,10 +8709,6 @@
                     "name": "Lavage de Train",
                     "terms": "lavage de train,nettoyage de train"
                 },
-                "railway/tram": {
-                    "name": "Tramway",
-                    "terms": "Tram, Tramway"
-                },
                 "railway/tram_stop": {
                     "name": "Emplacement où s'arrête le tram"
                 },
@@ -8785,6 +8840,9 @@
                     "name": "Boucher",
                     "terms": "Boucherie, charcuterie, charcutier, boucher"
                 },
+                "shop/camera": {
+                    "name": "Photographe"
+                },
                 "shop/candles": {
                     "name": "Magasin de bougies",
                     "terms": "Vente de bougies et d'accessoires"
@@ -8797,6 +8855,9 @@
                     "name": "Concessionnaire automobile",
                     "terms": "Concessionnaire,garage,garagiste"
                 },
+                "shop/car/second_hand": {
+                    "name": "Concessionnaire de voiture d'occasion"
+                },
                 "shop/car_parts": {
                     "name": "Magasin de pièces automobiles",
                     "terms": "Magasin de pièces automobiles"
@@ -8876,6 +8937,9 @@
                     "name": "Magasin de campagne",
                     "terms": "campagne,chasse,pêche,équitation,cheval,chevaux"
                 },
+                "shop/craft": {
+                    "name": "Magasin d'arts et loisirs créatifs"
+                },
                 "shop/curtain": {
                     "name": "Magasin de rideaux",
                     "terms": "Magasin de rideaux"
@@ -8946,9 +9010,6 @@
                     "name": "Magasin de pêche",
                     "terms": "pêche"
                 },
-                "shop/fishmonger": {
-                    "name": "Poissonnier"
-                },
                 "shop/florist": {
                     "name": "Fleuriste",
                     "terms": "Fleuriste"
@@ -8957,10 +9018,6 @@
                     "name": "Magasin d'encadrements",
                     "terms": "Vente de cadres"
                 },
-                "shop/frozen_food": {
-                    "name": "Surgelés",
-                    "terms": "surgelés,nourriture surgelée"
-                },
                 "shop/fuel": {
                     "name": "Revendeur de carburant",
                     "terms": "magasin,essence,station-service,pétrole,fuel,carburant,diesel"
@@ -8969,9 +9026,6 @@
                     "name": "Funérarium",
                     "terms": "Funérarium, Maison funéraire"
                 },
-                "shop/furnace": {
-                    "name": "Chauffagiste"
-                },
                 "shop/furniture": {
                     "name": "Magasin de meubles",
                     "terms": "Magasin de meubles"
@@ -9345,6 +9399,9 @@
                     "name": "Centre de données",
                     "terms": "data center,technologie,télécommunications,nuage,cloud,ordinateurs,serveurs,hébergeur,hébergement"
                 },
+                "tourism": {
+                    "name": "Équipement touristiques"
+                },
                 "tourism/alpine_hut": {
                     "name": "Refuge de montagne",
                     "terms": "Refuge de montagne, cabane"
@@ -9726,6 +9783,9 @@
                     "name": "Canal d'évacuation des eaux pluviales",
                     "terms": "Drain"
                 },
+                "waterway/fish_pass": {
+                    "name": "Échelle à poissons"
+                },
                 "waterway/fuel": {
                     "name": "Station-service marine",
                     "terms": "Station-service nautique, nautisme, bateaux, essence"
@@ -10021,6 +10081,13 @@
                 "description": "La carte décrit de manière globale la ville de Göteborg. Elle contient des informations générales sur le terrain, les communications, l'hydrographie, les bâtiments, les adresses et les noms de rues, les divisions administratives.",
                 "name": "Carte de la ville de Göteborg"
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© Municipalité de Göteborg, CC0"
+                },
+                "description": "Orthophoto pour la municipalité de Göteborg",
+                "name": "Orthophoto de Göteborg"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI Japon"
@@ -10188,6 +10255,12 @@
                 },
                 "name": "Thunderforest Landscape"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Cartes © Thunderforest, Données © Contributeurs d'OpenStreetMap"
+                },
+                "name": "Thunderforest Outdoors"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -10229,6 +10302,12 @@
                 },
                 "description": "Réseau routier de la NVDB suédoise avec plusieurs possibilités pour les couches",
                 "name": "Options pour le réseau routier Trafikverket"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Urząd Miasta Wrocław"
+                },
+                "name": "Wrocław : Ortho 2018 (imagerie aérienne)"
             }
         },
         "community": {
@@ -10258,7 +10337,7 @@
             "Dallas-Fort-Worth-OSM": {
                 "name": "Dallas-Fort Worth OSM",
                 "description": "Groupe d'utilisateurs OpenStreetMap de Dallas-Fort Worth",
-                "extendedDescription": "Dallas, Fort Worth et les villes au milieu abondent de personnes créatives et douées en informatique. La volonté de ce groupe est de trouver de nouvelles manières d'utiliser les supers ressources d'OSM."
+                "extendedDescription": "Dallas, Fort Worth et les villes environnantes abondent de personnes créatives et douées en informatique. La volonté de ce groupe est de trouver de nouvelles manières d’utiliser les supers ressources d’OSM.<br><br>"
             },
             "Galicia-Telegram": {
                 "name": "Telegram d'OpenStreetMap Galice",
@@ -10278,7 +10357,8 @@
                 "description": "Liste de diffusion de Mapeado Colaborativo / Geoinquietos Saragosse"
             },
             "MapColabora-meetup": {
-                "name": "Mapeado Colaborativo / Geoinquietos Saragosse"
+                "name": "Mapeado Colaborativo / Geoinquietos Saragosse",
+                "description": "Page rencontre Mapeado Colaborativo / Geoinquietos Saragosse"
             },
             "MapColabora-twitter": {
                 "name": "Mapeado Colaborativo / Geoinquietos Saragosse",
@@ -10876,6 +10956,11 @@
                 "name": "Wikiprojet OpenStreetMap Bulgarie",
                 "description": "Page du wikiprojet pour la Bulgarie"
             },
+            "bi-vc-cvl_wiki": {
+                "name": "OSMers BI-VC-CVL",
+                "description": "Cartographes du nord du Piémont",
+                "extendedDescription": "En plus de nos réunions mensuelles, nous disposons d'un groupe WhatsApp."
+            },
             "bw-facebook": {
                 "name": "Mapping Botswana sur Facebook",
                 "description": "Page OpenStreetMap au Botswana"
@@ -10905,6 +10990,10 @@
                 "name": "Fil Twitter d'OpenStreetMap Suisse",
                 "description": "Suivez-nous sur Twitter: {url}"
             },
+            "cuneo-telegram": {
+                "name": "Cartographes d'OpenStreetMap Coni",
+                "description": "Chat Telegram d'OpenStreetMap Coni"
+            },
             "czech-community": {
                 "name": "Communauté OSM tchèque",
                 "description": "Portail cartographique, site web et contacts des membres OSM en République Tchèque"
@@ -10953,6 +11042,10 @@
                 "name": "Telegram d'OpenStreetMap Allemagne",
                 "description": "Rejoignez le groupe Telegram d'OpenStreetMap Allemagne sur {url}"
             },
+            "de-viersen-meetup": {
+                "name": "Rencontre d'OpenStreetMap Viersen",
+                "description": "Rencontre de la communauté et des utilisateurs d'OSM Viersen et Mönchengladbach"
+            },
             "dk-forum": {
                 "name": "Forum web d'OpenStreetMap Danemark",
                 "description": "Forum web d'OpenStreetMap Danemark"
@@ -11043,8 +11136,21 @@
                 "description": "Talk-gb est la liste de diffusion principale pour la communauté OSM du Royaume-Uni (incluant l'Irlande du Nord)"
             },
             "geogeeks_perth_meetup": {
+                "name": "Rencontre GeoGeeks Perth",
                 "description": "Groupe de rencontre basé à Perth pour les personnes intéressées par la cartographie, les données géospatiales et les logiciels libres. Nous travaillerons sur tout ce qui implique un sens du lieu."
             },
+            "gr-forum": {
+                "name": "Forum OpenStreetMap GR",
+                "description": "Forum web d'OpenStreetMap Grèce"
+            },
+            "gr-mailinglist": {
+                "name": "Liste de diffusion Talk-gr",
+                "description": "Talk-gr est la liste de diffusion officielle de la communauté grecque d'OSM"
+            },
+            "gr-matrix": {
+                "name": "Matrix d'OpenStreetMap Grèce",
+                "description": "Rejoignez #osm-gr:matrix.org à l'adresse https://riot.im/app/#/room/sm-gr:matrix.org"
+            },
             "guatemala-telegram": {
                 "name": "OSM Guatemala sur Telegram",
                 "description": "Chat Telegram d'OpenStreetMap Guatemala"
@@ -11159,7 +11265,8 @@
                 "description": "Groupe Telegram public semi-officiel pour tout le Kosovo.  Nous accueillons tous les cartographes de n'importe où dans toutes les langues."
             },
             "latam-facebook": {
-                "name": "Facebook d'OpenStreetMap Amérique Latine"
+                "name": "Facebook d'OpenStreetMap Amérique Latine",
+                "description": "Cartographes et OpenStreetMap sur Facebook en Amérique Latine"
             },
             "latam-irc": {
                 "name": "IRC d'OpenStreetMap Amérique Latine",
@@ -11169,14 +11276,20 @@
                 "name": "Liste de diffusion Talk-latam",
                 "description": "Talk-latam est la liste de diffusion officielle pour la communauté latino-américaine d'OpenStreetMap"
             },
+            "latam-matrix": {
+                "name": "Matrix d'OpenStreetMap Amérique Latine",
+                "description": "Discutez avec d'autres membres de la communauté d'OSM Amérique Latine, il y a un pont avec le canal du chat Telegram"
+            },
             "latam-telegram": {
-                "name": "Telegram d'OpenStreetMap Amérique Latine"
+                "name": "Telegram d'OpenStreetMap Amérique Latine",
+                "description": "Discutez avec d'autres membres de la communauté d'OSM Amérique Latine, il y a un pont avec le canal du chat Matrix"
             },
             "latam-twitter": {
                 "name": "Twitter d'OpenStreetMap Amérique Latine",
                 "description": "OpenStreetMap Amérique Latine sur Twitter: {url}"
             },
             "latam-wiki": {
+                "name": "Wikiprojet d'OpenStreetMap Amérique Latine",
                 "description": "Tout ce que vous devez savoir sur la cartographie en Amérique Latine"
             },
             "lu-mailinglist": {
@@ -11189,7 +11302,8 @@
             },
             "map-kibera": {
                 "name": "Carte Kibera certifiée",
-                "description": "\"Map Kibera\" est une organisation reconnue travaillant au Kenya"
+                "description": "\"Map Kibera\" est une organisation reconnue travaillant au Kenya",
+                "extendedDescription": "La mission de Map Kibera est d'accroître l'influence et la représentation des communautés marginalisées à travers l'utilisation créative d'outils numériques"
             },
             "mappa-mercia-group": {
                 "name": "Groupe local Mappa Mercia",
@@ -11433,7 +11547,20 @@
                 "description": "Page Facebook de la communauté Slovaque de Freemap.sk"
             },
             "sk-freemap": {
-                "name": "Site web Slovaque de \"Freemap\" d'OpenStreetMap"
+                "name": "Site web Slovaque de \"Freemap\" d'OpenStreetMap",
+                "description": "Site web de la carte OpenStreetMap avec des outils pour la Slovaquie et les régions proches"
+            },
+            "sk-freemap-wiki": {
+                "name": "Wiki OpenStreetMap Freemap Slovaquie",
+                "description": "Wiki OpenStreetMap pour la communauté slovaque et ses cartographes"
+            },
+            "sk-twitter": {
+                "name": "OpenStreetMap Freemap Slovaquie sur Twitter",
+                "description": "OpenStreetMap Freemap Slovaquie sur Twitter: {url}"
+            },
+            "talk-africa": {
+                "name": "Liste de diffusion Talk-africa",
+                "description": "Talk-africa est la liste de diffusion officielle pour la communauté africaine d'OSM."
             },
             "talk-au": {
                 "name": "Liste de diffusion talk-au",
@@ -11453,6 +11580,7 @@
                 "extendedDescription": "Liste de diffusion pour Rome et la région du Lazio"
             },
             "talk-it-piemonte_mailinglist": {
+                "name": "Liste de diffusion régionale d'OSM Italie pour le Piémont",
                 "description": "Tout le monde est bienvenu! Inscrivez-vous à l'adresse {signupUrl}",
                 "extendedDescription": "Liste de diffusion pour la région du Piémont."
             },
@@ -11464,6 +11592,10 @@
                 "name": "Liste de diffusion Talk-nz",
                 "description": "Discussion de la communauté OSM en Nouvelle-Zélande"
             },
+            "talk-tz": {
+                "name": "Liste de diffusion Talk-tz",
+                "description": "Talk-tz est la liste de diffusion officielle pour la communauté tanzanienne d'OSM."
+            },
             "talk-za": {
                 "name": "Liste de diffusion Talk-za",
                 "description": "Talk-za est la liste de diffusion officielle pour la communauté sud-africaine d'OSM."
@@ -11542,6 +11674,11 @@
                 "name": "Telegram d'OpenStreetMap Venezuela",
                 "description": "Rejoignez la communauté d'OpenStreetMap Venezuela sur Telegram"
             },
+            "ym-AASTU": {
+                "name": "AASTU Youth Mappers",
+                "description": "Chapitre YouthMappers à l'Université des Sciences et Technologies d'Addis-Abeba",
+                "extendedDescription": "L'Association des Étudiants en Ingénierie Géomatique (AGES) vise tant à promouvoir les produits et services SIG qu'à entraîner les étudiants à leur utilisation. Elle ne se limite pas à la socialisation entre les étudiants et les professionnels, mais développe également une plate-forme d'échange d'idées sur de nouveaux SIG, une veille sur les évènements à venir, et la pratique à l'université."
+            },
             "ym-Abia-State-University": {
                 "name": "AbsuMappersTeam",
                 "description": "Chapitre YouthMappers à l'Université d'état d'Abia",
@@ -11775,6 +11912,10 @@
                 "description": "Chapitre YouthMappers de l'Université de Moi",
                 "extendedDescription": "L'association étudiante de géographie à l'Université de Moi (GEOSAMU) explore, découvre et essaye de développer le monde entier à travers l'analyse géospatiale. GEOSAMU fait partie du département de Géographie."
             },
+            "ym-Monroe-Community-College": {
+                "name": "MCC Mapping Corps",
+                "description": "Chapitre YouthMappers au Monroe Community College"
+            },
             "ym-Montgomery-College": {
                 "name": "GeoMC",
                 "description": "Chapitre YouthMappers au Montgomery College"
@@ -11799,9 +11940,13 @@
                 "name": "YouthMappers Njala University, Njala Campus",
                 "description": "Chapitre YouthMappers à l'université de Njala, campus de Njala"
             },
+            "ym-Oklahoma-State-University": {
+                "description": "Chapitre YouthMappers à l'Université d’État de l'Oklahoma"
+            },
             "ym-Open-University-of-Tanzania": {
                 "name": "Jeunes cartographes de l'Open University of Tanzania",
-                "description": "Groupe des jeunes cartographes de l'Open University of Tanzania"
+                "description": "Chapitre YouthMappers à l'Université Ouverte de Tanzanie",
+                "extendedDescription": "Chapitre YouthMappers à l'Université Ouverte de Tanzanie\n\nCe groupe a été fondé par des étudiants du Département de Géographie de l'Université Ouverte de Tanzanie afin de développer leurs compétences et d'aider la communauté des jeunes, à travers des projets et des partenariats avec des groupes locaux tels que Mikoko Scout Group (www.msg.or.tz), et de mener des coopérations avec des universités internationales par des programmes d'échanges en relation avec les études en Géographie, comme ceux préparés par Mikoko Scout Group qui lient des universités locales ou lointaines par leur intérêt pour l' International Nature & Environmental Youth Camp 2019 (www.campsite.msg.or.tz/nature.html )\n\nNotre chapitre sera bientôt reconnu comme membre du réseau  pour la jeunesse, ce qui offrira aux étudiants des opportunités d'étudier et de mener des recherches dans ce cadre."
             },
             "ym-Politecnico-di-Milano": {
                 "name": "PoliMappers",

vendor/assets/iD/iD/locales/gu.json

@@ -114,7 +114,6 @@
         },
         "commit": {
             "cancel": "રદ કરો",
-            "changes": "{count} ફેરફારો",
             "warnings": "ચેતવણીઓ",
             "modified": "બદલેલ",
             "deleted": "દૂર કરેલ",

vendor/assets/iD/iD/locales/hr.json

@@ -337,7 +337,6 @@
             "request_review": "Želim da netko pregleda moja uređivanja.",
             "save": "Postavi",
             "cancel": "Otkaži",
-            "changes": "{count} Promjena",
             "download_changes": "Preuzmi osmChange datoteku promjena",
             "warnings": "Upozorenja",
             "modified": "Uređeno",
@@ -617,10 +616,6 @@
             "on_wiki": "{tag} na wiki.osm.org",
             "used_with": "koristi se sa {type}"
         },
-        "zoom": {
-            "in": "Približi",
-            "out": "Udalji"
-        },
         "cannot_zoom": "Nije moguće više udaljiti u trenutnom môdu.",
         "full_screen": "Slika preko cijelog zaslona",
         "streetside": {
@@ -1492,9 +1487,15 @@
                         "reversible": "Izmjenjiv smjer"
                     }
                 },
+                "conveying_escalator": {
+                    "label": "Pokretne stepenice"
+                },
                 "country": {
                     "label": "Država"
                 },
+                "country_flag": {
+                    "label": "Država zastave"
+                },
                 "covered": {
                     "label": "Pokriven"
                 },
@@ -1598,7 +1599,12 @@
                 "diameter": {
                     "label": "Promjer"
                 },
+                "direction": {
+                    "label": "Smjer (stupnjeva u smjeru kazaljke na satu)",
+                    "placeholder": "45, 90, 180, 270"
+                },
                 "direction_cardinal": {
+                    "label": "Smjer",
                     "options": {
                         "E": "Istok",
                         "ENE": "Istok-sjeveroistok",
@@ -1662,9 +1668,6 @@
                     },
                     "placeholder": "Kontaktni vod, elektrificirana šina..."
                 },
-                "elevation": {
-                    "label": "Nadmorska visina"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "primjer@primjer.hr"
@@ -1795,8 +1798,10 @@
                 "information": {
                     "label": "Vrsta"
                 },
+                "inscription": {
+                    "label": "Natpis"
+                },
                 "internet_access": {
-                    "label": "Dostupan internet",
                     "options": {
                         "no": "Ne",
                         "terminal": "Terminal",
@@ -2367,10 +2372,6 @@
                     "name": "Sjedežnica",
                     "terms": "sedežnica"
                 },
-                "aerialway/gondola": {
-                    "name": "Kabinska žičara",
-                    "terms": "Gondola"
-                },
                 "aerialway/magic_carpet": {
                     "name": "Skijaški tepih"
                 },
@@ -2553,6 +2554,10 @@
                 "amenity/hunting_stand": {
                     "name": "Lovačka čeka"
                 },
+                "amenity/kindergarten": {
+                    "name": "Zemljište dječjeg vrtića",
+                    "terms": "dječji vrtić,vrtić"
+                },
                 "amenity/library": {
                     "name": "Knjižnica",
                     "terms": "knjižnica,biblioteka,čitaonica,zbirka knjiga"
@@ -2571,6 +2576,9 @@
                     "name": "Parkiralište za automobile",
                     "terms": "parking,kamione"
                 },
+                "amenity/parking_entrance": {
+                    "name": "Ulaz/izlaz iz garaže za automobile"
+                },
                 "amenity/parking_space": {
                     "name": "Parkirališno mjesto"
                 },
@@ -2626,9 +2634,6 @@
                 "amenity/recycling_container": {
                     "name": "Kontejner za reciklažu"
                 },
-                "amenity/register_office": {
-                    "name": "Matični ured"
-                },
                 "amenity/restaurant": {
                     "name": "Restoran",
                     "terms": "restoran,buffet,zdravljak,zalogajnica"
@@ -2700,9 +2705,6 @@
                 "amenity/studio": {
                     "name": "Studio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Sportski bazen"
-                },
                 "amenity/taxi": {
                     "name": "Taksi stajalište",
                     "terms": "taksi stajalište,parkirno mjesto za taksi,parkirališno mjesto za taksi,mjesto za taksi,taksi mjesto"
@@ -2937,6 +2939,9 @@
                 "building/industrial": {
                     "name": "Industrijska zgrada"
                 },
+                "building/kindergarten": {
+                    "name": "Zgrada vrtića"
+                },
                 "building/mosque": {
                     "name": "Zgrada džamije"
                 },
@@ -3146,6 +3151,10 @@
                 "emergency/phone": {
                     "name": "Telefon za nuždu"
                 },
+                "entrance": {
+                    "name": "Ulaz / izlaz",
+                    "terms": "vrata"
+                },
                 "ford": {
                     "name": "Prijelaz preko potoka"
                 },
@@ -3572,9 +3581,6 @@
                 "leisure/track/running": {
                     "name": "Staza za trčanje"
                 },
-                "leisure/track/running_point": {
-                    "name": "Staza za trčanje"
-                },
                 "leisure/water_park": {
                     "name": "Vodeni park",
                     "terms": "Aquapark, akvapark, bazeni"
@@ -4022,45 +4028,18 @@
                     "name": "Željeznička pruga izvan uporabe",
                     "terms": "željeznička pruga izvan uporabe,pruga koja se ne koristi,nekorištena željeznička pruga,nekorištena željeznica,pruga izvan uporabe"
                 },
-                "railway/funicular": {
-                    "name": "Uspinjača"
-                },
                 "railway/halt": {
                     "name": "Željeznička postaja"
                 },
                 "railway/level_crossing": {
                     "name": "Cestovni prijelaz preko pruge"
                 },
-                "railway/light_rail": {
-                    "name": "Laka željeznica"
-                },
-                "railway/miniature": {
-                    "name": "Minijaturna željeznica"
-                },
-                "railway/monorail": {
-                    "name": "Jednotračna željeznička pruga",
-                    "terms": "monorail željeznička pruga,pruga sa jednim kolosjekom"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Uskotračna željeznica"
-                },
                 "railway/platform": {
                     "name": "Željezničko stajalište"
                 },
-                "railway/rail": {
-                    "name": "Željeznička pruga",
-                    "terms": "željeznička pruga,pruga pune širine,željeznica pune veličine"
-                },
-                "railway/rail/highspeed": {
-                    "name": "Brza željeznica"
-                },
                 "railway/station": {
                     "name": "Željeznička stanica"
                 },
-                "railway/subway": {
-                    "name": "Podzemna željeznica",
-                    "terms": "podzemna željeznica,željeznica ispod zemlje,metro,gradska željeznica,gradska podzemna željeznica"
-                },
                 "railway/subway_entrance": {
                     "name": "Ulaz u podzemnu željeznicu",
                     "terms": "ulaz u podzemnu željeznicu,ulaz podzemne željeznice,ulaz u metro"
@@ -4068,10 +4047,6 @@
                 "railway/train_wash": {
                     "name": "Praonica vagona"
                 },
-                "railway/tram": {
-                    "name": "Tramvaj",
-                    "terms": "tramvaj,tramvajska pruga,električni tramvaj,pruga za tramvaj"
-                },
                 "railway/tram_stop": {
                     "name": "Mjesto stajanja tramvaja"
                 },
@@ -4086,6 +4061,9 @@
                 "seamark": {
                     "name": "Morska oznaka"
                 },
+                "seamark/mooring": {
+                    "name": "Brodski vez"
+                },
                 "shop": {
                     "name": "Prodavaonica",
                     "terms": "prodavaonica,trgovina,trgovanje,promet robe,dućan"
@@ -4240,9 +4218,6 @@
                 "shop/fishing": {
                     "name": "Prodavaonica ribolovne opreme"
                 },
-                "shop/fishmonger": {
-                    "name": "Ribarnica"
-                },
                 "shop/florist": {
                     "name": "Cvjećarna",
                     "terms": "cvjećara,cvjećarna,cvjećarnica,trgovina cvijećem,prodavaonica cvijeća"

vendor/assets/iD/iD/locales/hu.json

@@ -7,7 +7,9 @@
             "undo": "visszavonás",
             "zoom_to": "nagyítás ide:",
             "copy": "másolás",
-            "favorite": "kedvenc"
+            "favorite": "kedvenc",
+            "list": "lista",
+            "text": "szöveg"
         },
         "toolbar": {
             "inspect": "Vizsgálat",
@@ -531,7 +533,7 @@
             "request_review": "Szeretném, ha valaki ellenőrizné ezt a szerkesztésemet.",
             "save": "Feltöltés",
             "cancel": "Mégsem",
-            "changes": "{count} módosítás",
+            "changes": "Változás ({count})",
             "download_changes": "osmChange fájl letöltése",
             "errors": "Hibák",
             "warnings": "Figyelmeztetések",
@@ -625,15 +627,12 @@
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "Nagyítás erre",
-                "tooltip_feature": "Térkép fókuszálása erre az elemre.",
-                "tooltip_note": "Térkép fókuszálása erre a jegyzetre.",
-                "tooltip_data": "Térkép fókuszálása erre az adatra.",
-                "tooltip_issue": "Térkép fókuszálása erre a problémára."
+                "title": "Nagyítás a kijelölésre"
             },
             "show_more": "Mutass többet",
             "view_on_osm": "Megtekintés openstreetmap.org-on",
             "view_on_keepRight": "Megtekintés a keepright.at-en",
+            "fields": "Mezők",
             "add_to_relation": "Hozzáadás kapcsolathoz",
             "new_relation": "Új kapcsolat…",
             "choose_relation": "Szülő kapcsolat kiválasztása",
@@ -840,7 +839,6 @@
             "custom_background": {
                 "tooltip": "Egyedi háttér szerkesztése",
                 "header": "Egyedi háttér beállításai",
-                "instructions": "Adj meg egy csempe URL sablont. Érvényes tokenek:\n  {zoom} vagy {z}, {x}, {y} a Z/X/Y sémához\n  {-y} vagy {ty} a tükrözött TMS stílusú Y koordinátákhoz\n  {u} a quadtile sémához\n  {switch:a,b,c} a DNS szerver multiplexeléshez\n\nPéldául:\n{example}",
                 "template": {
                     "placeholder": "Adj meg egy URL sablont"
                 }
@@ -906,7 +904,7 @@
                 "format": "{place}{separator}{region}",
                 "separator": ", "
             },
-            "help_html": "Módosításaidnak pár perc kell, hogy megjelenjenek az OpenStreetMap felületén. Más térképeken a frissítésekig hosszabb idő szükséges.",
+            "help_html": "Módosításaid pár perc után megjelennek az OpenStreetMap felületén. Más térképeken a frissítésig hosszabb idő szükséges.",
             "help_link_text": "Részletek",
             "help_link_url": "https://wiki.openstreetmap.org/wiki/Hu:FAQ#V.C3.A1ltoztat.C3.A1sokat_eszk.C3.B6z.C3.B6ltem_a_t.C3.A9rk.C3.A9pen.2C_hogyan_l.C3.A1thatom_ezeket.3F",
             "view_on_osm": "Változtatások megtekintése OSM-en",
@@ -941,13 +939,12 @@
             "on_wiki": "{tag} a wiki.osm.org-on",
             "used_with": "a következővel használva: {type}"
         },
-        "zoom": {
-            "in": "Nagyítás",
-            "out": "Kicsinyítés"
-        },
         "cannot_zoom": "Nem lehet jobban távolítani ebben a módban.",
         "full_screen": "Váltás teljes képernyőre",
         "QA": {
+            "osmose": {
+                "detail_title": "Részletek"
+            },
             "improveOSM": {
                 "title": "ImproveOSM Detection",
                 "geometry_types": {
@@ -1386,8 +1383,7 @@
                 "before_start_h": "Mielőtt nekikezdenél",
                 "before_start": "Szerkesztés előtt érdemes megismerned az OpenStreetMap-et és ezt a szerkesztőfelületet. Az iD tartalmaz egy útmutatót, amellyel megtanulhatod az OpenStreetMap szerkesztésének alapjait. Kattints a „Gyakorlás indítása” gombra - csak 15 percet vesz igénybe.",
                 "open_source_h": "Nyílt forrású",
-                "open_source": "Az iD szerkesztő egy közös fejlesztésű, nyílt forrású projekt, amiből te most a(z) {version} verziót használod. A forráskód elérhető [a GitHub-on](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Segíthetsz a [fordításban](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) vagy [hibák jelentésével](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "Az iD szerkesztő egy közös fejlesztésű, nyílt forrású projekt, amiből te most a(z) {version} verziót használod. A forráskód elérhető [a GitHub-on](https://github.com/openstreetmap/iD)."
             },
             "overview": {
                 "title": "Áttekintő",
@@ -1711,6 +1707,7 @@
             },
             "generic_name": {
                 "message": "{feature} gyanús névvel: \"{name}\"",
+                "message_language": "{feature} gyanús névvel: \"{name}\"  {language} nyelven",
                 "reference": "A névnek az aktuálisan használt névnek kell lennie."
             },
             "help_request": {
@@ -1732,6 +1729,7 @@
                 "tip": "Formailag hibás címkék",
                 "email": {
                     "message": "{feature}  hibás email címmel",
+                    "message_multi": "{feature} több hibás email címmel",
                     "reference": "Egy email címnek valahogy így kell kinéznie: \"felhasznalo@pelda.com\""
                 }
             },
@@ -3006,9 +3004,6 @@
                     },
                     "placeholder": "Felsővezetékes, sínes áramfelvétel…"
                 },
-                "elevation": {
-                    "label": "Tengerszint feletti magasság"
-                },
                 "email": {
                     "label": "E-mail",
                     "placeholder": "minta@minta.hu",
@@ -3259,18 +3254,13 @@
                     "label": "Időszakos"
                 },
                 "internet_access": {
-                    "label": "Internetcsatlakozás",
                     "options": {
                         "no": "Nincs",
                         "terminal": "Munkaállomás",
                         "wired": "Vezetékes",
                         "wlan": "WiFi",
                         "yes": "Van"
-                    },
-                    "terms": "hálózati hozzáférés"
-                },
-                "internet_access/fee": {
-                    "label": "Internetcsatlakozás díja"
+                    }
                 },
                 "internet_access/ssid": {
                     "label": "Wifi hálózat neve"
@@ -4476,10 +4466,6 @@
                     "name": "Húzólift",
                     "terms": "sífelvonó, csákányos, tányéros"
                 },
-                "aerialway/gondola": {
-                    "name": "Gondola",
-                    "terms": "gondolakabinos felvonó, kabinos felvonó"
-                },
                 "aerialway/goods": {
                     "name": "Teherfelvonó",
                     "terms": "teherlift"
@@ -4989,9 +4975,6 @@
                 "amenity/recycling_container": {
                     "name": "Szelektív hulladékgyűjtő konténer"
                 },
-                "amenity/register_office": {
-                    "name": "Anyakönyvi hivatal"
-                },
                 "amenity/restaurant": {
                     "name": "Étterem",
                     "terms": "étkezde, vendéglő, csárda, fogadó, ebédlő, kisvendéglő, bisztró, gyorsétterem"
@@ -5061,9 +5044,6 @@
                     "name": "Iskola",
                     "terms": "suli, tanítás, oktatás, nevelés, közoktatás, köznevelés"
                 },
-                "amenity/scrapyard": {
-                    "name": "Szeméttelep"
-                },
                 "amenity/shelter": {
                     "name": "Esőbeálló",
                     "terms": "fedett, fedél, esőház, esőkunyhó, menedékház"
@@ -5129,9 +5109,6 @@
                 "amenity/studio/video": {
                     "name": "Filmstúdió"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Úszómedence"
-                },
                 "amenity/taxi": {
                     "name": "Taxiállomás",
                     "terms": "Taxidroszt, droszt, taxiállomás, taxibeálló"
@@ -6414,10 +6391,6 @@
                     "name": "Elágazás",
                     "terms": "Elágazás, útkereszteződés, csomópont"
                 },
-                "landuse/allotments": {
-                    "name": "Közpark",
-                    "terms": "közösségi kert"
-                },
                 "landuse/aquaculture": {
                     "name": "Akvakultúra",
                     "terms": "halgazdaság, haltenyésztés, kagylótenyésztés, ráktenyésztés, algakultúra"
@@ -6516,18 +6489,10 @@
                     "name": "Haditengerészeti támaszpont",
                     "terms": "tengerészeti,haditengerészeti,bázis,hadikikötő"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Akadálypálya",
-                    "terms": "akadálypálya"
-                },
                 "landuse/military/range": {
                     "name": "Katonai lőtér",
                     "terms": "katonai,honvédségi,lőtér"
                 },
-                "landuse/military/training_area": {
-                    "name": "Kiképzési terület",
-                    "terms": "katonai,honvédségi,kiképző,terület"
-                },
                 "landuse/orchard": {
                     "name": "Gyümölcsös",
                     "terms": "Gyümölcsöskert, gyümölcsfás, ültetvény"
@@ -6838,21 +6803,12 @@
                 "leisure/track/cycling": {
                     "name": "Kerékpárpálya"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Kerékpárpálya"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Lóversenypálya"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Lóversenypálya"
-                },
                 "leisure/track/running": {
                     "name": "Futópálya"
                 },
-                "leisure/track/running_point": {
-                    "name": "Futópálya"
-                },
                 "leisure/water_park": {
                     "name": "Élményfürdő",
                     "terms": "strand,akvapark,aquapark,vízi szórakoztatópark"
@@ -6919,10 +6875,6 @@
                     "name": "Gáztartály",
                     "terms": "gazométer"
                 },
-                "man_made/groyne": {
-                    "name": "Keresztgát",
-                    "terms": "védőgát, hullámtörő"
-                },
                 "man_made/lighthouse": {
                     "name": "Világítótorony",
                     "terms": "Világítótorony, jelzőfény"
@@ -7077,9 +7029,6 @@
                     "name": "Katonai bunker",
                     "terms": "géppuskafészek"
                 },
-                "military/checkpoint": {
-                    "name": "Ellenőrzőpont"
-                },
                 "military/nuclear_explosion_site": {
                     "name": "Nukleáris robbantás helyszíne"
                 },
@@ -7693,10 +7642,6 @@
                     "name": "Használaton kívüli vasút",
                     "terms": "megszűnt vasútvonal"
                 },
-                "railway/funicular": {
-                    "name": "Sikló",
-                    "terms": "Siklóvasút, kötélvasút"
-                },
                 "railway/halt": {
                     "name": "Vasúti megálló (feltételes)"
                 },
@@ -7704,35 +7649,13 @@
                     "name": "Vasúti átjáró (közút)",
                     "terms": "vasúti kereszteződés,átkelő,átjáró"
                 },
-                "railway/light_rail": {
-                    "name": "HÉV",
-                    "terms": "helyiérdekű vasút"
-                },
                 "railway/milestone": {
                     "name": "Vasúti mérföldkő",
                     "terms": "mérföldkő, vasút, kilométerkő"
                 },
-                "railway/miniature": {
-                    "name": "Miniatűrvasút"
-                },
-                "railway/monorail": {
-                    "name": "Egysínű vasút",
-                    "terms": "nyeregvasút, mágnesvasút"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Kisvasút",
-                    "terms": "Keskeny nyomtávú vasút"
-                },
                 "railway/platform": {
                     "name": "Vasúti peron"
                 },
-                "railway/rail": {
-                    "name": "Vasúti pálya",
-                    "terms": "Vasútvonal"
-                },
-                "railway/rail/highspeed": {
-                    "name": "Nagysebességű vasút"
-                },
                 "railway/signal": {
                     "name": "Vasúti jelző",
                     "terms": "jelző, jelzés, vasút"
@@ -7740,10 +7663,6 @@
                 "railway/station": {
                     "name": "Vasútállomás"
                 },
-                "railway/subway": {
-                    "name": "Metró",
-                    "terms": "földalatti"
-                },
                 "railway/subway_entrance": {
                     "name": "Metrólejáró",
                     "terms": "Metróbejárat, lejárat"
@@ -7756,10 +7675,6 @@
                     "name": "Mozdonymosó",
                     "terms": "vasút, mozdony, vonat, mosó, kocsimosó"
                 },
-                "railway/tram": {
-                    "name": "Villamos",
-                    "terms": "Villamos"
-                },
                 "railway/tram_stop": {
                     "name": "Villamosmegállási pont"
                 },
@@ -7997,9 +7912,6 @@
                 "shop/fishing": {
                     "name": "Horgászbolt"
                 },
-                "shop/fishmonger": {
-                    "name": "Halbolt"
-                },
                 "shop/florist": {
                     "name": "Virágárus",
                     "terms": "virágos, virágbolt, szobanövény, dísznövény, bonsai"
@@ -8008,10 +7920,6 @@
                     "name": "Képkeretező",
                     "terms": "Képkeretes"
                 },
-                "shop/frozen_food": {
-                    "name": "Fagyasztott élelmiszer",
-                    "terms": "mirelit"
-                },
                 "shop/fuel": {
                     "name": "Üzemanyagot árusító bolt"
                 },
@@ -8019,9 +7927,6 @@
                     "name": "Temetkezési iroda",
                     "terms": "Temetkezési ügyintézés, temetkezési intézet,  temetkezési és hamvasztási ügyintézés"
                 },
-                "shop/furnace": {
-                    "name": "Kazánbolt (elavult)"
-                },
                 "shop/furniture": {
                     "name": "Bútorbolt",
                     "terms": "bútor, lakberendezés"
@@ -9166,7 +9071,7 @@
         },
         "community": {
             "Bay-Area-OpenStreetMappers": {
-                "name": "A San Francisco-öböl környéki (Bay Area) OpenStreetMap-szerkesztők",
+                "name": "A San Francisco-öböl környéki (Bay Area) OpenStreetMap szerkesztők",
                 "description": "Az OpenStreetMap tökéletesítése a San Francisco-öböl környékén",
                 "extendedDescription": "Ez a csoport az itteni, öbölkörnyéki OpenStreetMap-közösség gyarapításával foglalkozik. Rendezvényeink mindenki számára nyitottak a nyílt forráskódú szoftverek híveitől kezdve a kerékpárosokon, térinformatikusokon és geocaching-játékosokon át bárki másig. Örömmel látunk mindenkit, akit érdekelnek a térképek, a térképészet és a nyílt térképadatok, hogy csatlakozzék csoportunkhoz és részt vegyen a rendezvényeinken."
             },
@@ -9179,6 +9084,9 @@
                 "description": "A Dallas-Fort Worth-ban működő OpenStreetMap felhasználói csoport",
                 "extendedDescription": "Dallas, Fort Worth és a köztük lévő városok bővelkednek kreatív, műszakilag jártas emberekben. A felhasználói csoport jövőképe, hogy új utakat találjon az OSM lenyűgöző erőforrásainak kihasználásra."
             },
+            "Galicia-Twitter": {
+                "description": "Kövess minket Twitteren: {url}"
+            },
             "GeoPhilly": {
                 "name": "GeoPhilly",
                 "description": "Térképrajongók találkozója Philadelphia térségében"

vendor/assets/iD/iD/locales/hy.json

@@ -178,7 +178,6 @@
             "upload_explanation": "Փոփոխութիւնները տեսանելի կը լինեն ՕփենՍթրիթՄէփ տուեալներ օգտագործող բոլոր քարտէզներում։",
             "upload_explanation_with_user": "Փոփոխութիւններն, որ վերբեռնում էք որպէս {user} տեսանելի կը լինեն ՕփենՍթրիթՄէփ տուեալներ օգտագործող բոլոր քարտէզներում։",
             "cancel": "Չեղարկել",
-            "changes": "{count} Փոփոխութիւն",
             "warnings": "Զգուշացումներ",
             "modified": "Փոփոխուել է",
             "deleted": "Ջնջուել է",

vendor/assets/iD/iD/locales/id.json

@@ -188,7 +188,6 @@
             "upload_explanation_with_user": "Perubahan yang anda unggah sebagai {user} akan tampil di seluruh peta yang menggunakan data OpenStreetMap.",
             "save": "Unggah",
             "cancel": "Batal",
-            "changes": "{count} Perubahan",
             "warnings": "Peringatan",
             "modified": "Diubah",
             "deleted": "Terhapus",
@@ -405,29 +404,92 @@
             }
         },
         "presets": {
+            "categories": {
+                "category-barrier": {
+                    "name": "Fitur Penghalang"
+                },
+                "category-building": {
+                    "name": "Fitur Bangunan"
+                },
+                "category-golf": {
+                    "name": "Fitur Golf"
+                },
+                "category-landuse": {
+                    "name": "Fitur Lahan"
+                },
+                "category-natural": {
+                    "name": "Fitur Alam"
+                },
+                "category-path": {
+                    "name": "Jalan Kecil / Gang"
+                },
+                "category-rail": {
+                    "name": "Rel"
+                },
+                "category-restriction": {
+                    "name": "Fitur Larangan"
+                },
+                "category-road_major": {
+                    "name": "Jalan Besar"
+                },
+                "category-road_minor": {
+                    "name": "Jalan Kecil"
+                },
+                "category-road_service": {
+                    "name": "Jalan Layanan"
+                },
+                "category-route": {
+                    "name": "Fitur Rute"
+                },
+                "category-utility": {
+                    "name": "Fitur Utilitas"
+                },
+                "category-water": {
+                    "name": "Badan Air"
+                },
+                "category-waterway": {
+                    "name": "Jalur Air"
+                }
+            },
             "fields": {
                 "access": {
                     "label": "Akses diperbolehkan",
                     "options": {
                         "designated": {
+                            "description": "Akses diperbolehkan tergantung tanda/rambu atau hukum daerah yang ada",
                             "title": "Ditunjuk"
                         },
                         "destination": {
+                            "description": "Akses dibolehkan hanya untuk mencapai tujuan",
                             "title": "Tujuan"
                         },
+                        "dismount": {
+                            "description": "Akses dibolehkan tapi pengendara harus turun",
+                            "title": "turun dari kendaraan"
+                        },
                         "no": {
+                            "description": "Akses tidak diperbolehkan untuk umum",
                             "title": "Terlarang"
                         },
                         "permissive": {
+                            "description": "Akses diperbolehkan sampai waktu pemilik merubah izin akses",
                             "title": "Dibolehkan"
                         },
+                        "permit": {
+                            "description": "Akses dibolehkan jika ada izin valid atau lisensi",
+                            "title": "Minta izin"
+                        },
                         "private": {
+                            "description": "Akses dibolehkan hanya seijin pemilik atau individu terkait",
                             "title": "Pribadi"
                         },
                         "yes": {
+                            "description": "Akses dibolehkan hukum; hak jalan",
                             "title": "Diizinkan"
                         }
                     },
+                    "placeholder": "Tidak dispesifikasikan",
+                    "terms": "Boleh masuk,Boleh akses,bisa masuk,bisa akses, akses diperbolehkan",
                     "types": {
                         "access": "Semua",
                         "bicycle": "Sepeda",
@@ -436,27 +498,54 @@
                         "motor_vehicle": "Kendaraan Bermotor"
                     }
                 },
+                "access_aisle": {
+                    "label": "Tipe/Jenis"
+                },
                 "access_simple": {
                     "label": "Akses diperbolehkan"
                 },
+                "addr/interpolation": {
+                    "label": "Tipe",
+                    "options": {
+                        "all": "Semua",
+                        "alphabetic": "Berdasar Abjad",
+                        "even": "Genap",
+                        "odd": "Ganjil"
+                    }
+                },
                 "address": {
                     "label": "Alamat",
                     "placeholders": {
+                        "block_number": "Nomor Blok",
+                        "block_number!jp": "Blok No.",
                         "city": "Kota",
+                        "city!cn": "Kota/Prefektur/Ligqa",
+                        "city!jp": "Kota/Kota/Kampung",
+                        "city!vn": "Kota",
                         "conscriptionnumber": "123",
                         "country": "Negara",
+                        "county": "Negara",
+                        "county!jp": "Distrik/Kabupaten",
                         "district": "Kabupaten",
+                        "district!cn": "Distrik//",
+                        "floor": "Lantai",
                         "hamlet": "Dusun",
                         "housename": "Nama rumah",
                         "housenumber": "123",
+                        "housenumber!jp": "Bangunan No.",
                         "place": "Tempat",
                         "postcode": "Kode pos",
                         "province": "Provinsi",
+                        "province!cn": "Provinsi",
+                        "province!jp": "Prefektur",
+                        "quarter": "Seperempat",
                         "state": "Negara Bagian",
                         "street": "Jalan",
                         "subdistrict": "Kecamatan",
-                        "suburb": "Kelurahan"
-                    }
+                        "suburb": "Kelurahan",
+                        "unit": "Unit"
+                    },
+                    "terms": "Alamat,Lokasi,Denah,Tempat"
                 },
                 "admin_level": {
                     "label": "Tingkat Admin"
@@ -498,9 +587,28 @@
                 "aeroway": {
                     "label": "Tipe"
                 },
+                "agrarian": {
+                    "label": "Produk"
+                },
                 "amenity": {
                     "label": "Tipe"
                 },
+                "animal_boarding": {
+                    "label": "Untuk hewan"
+                },
+                "animal_breeding": {
+                    "label": "Untuk hewan"
+                },
+                "animal_shelter": {
+                    "label": "Untuk hewan"
+                },
+                "architect": {
+                    "label": "Arsitek",
+                    "terms": "Arsitek,Pembangun,Pembuat,Perancang"
+                },
+                "area/highway": {
+                    "label": "Tipe"
+                },
                 "artist": {
                     "label": "Seniman"
                 },
@@ -510,43 +618,179 @@
                 "atm": {
                     "label": "ATM"
                 },
+                "attraction": {
+                    "label": "Tipe"
+                },
+                "baby_feeding": {
+                    "label": "Tempat merawat bayi",
+                    "options": {
+                        "no": "Tidak ada",
+                        "room": "Ruangan Khusus",
+                        "yes": "Ruangan bertanda"
+                    }
+                },
+                "baby_seat": {
+                    "label": "Tempat duduk bayi"
+                },
                 "backrest": {
                     "label": "Sandaran"
                 },
+                "bar": {
+                    "label": "Bar"
+                },
                 "barrier": {
                     "label": "Tipe"
                 },
+                "basin": {
+                    "label": "Tipe"
+                },
+                "bath/open_air": {
+                    "label": "Tempat Terbuka"
+                },
+                "bath/sand_bath": {
+                    "label": "Mandi Pasir"
+                },
+                "bath/type": {
+                    "options": {
+                        "foot_bath": "Mandi Kaki",
+                        "hot_spring": "Mata Air Panas",
+                        "onsen": "Onsen Jepang"
+                    }
+                },
+                "beauty": {
+                    "label": "Layanan"
+                },
                 "bench": {
-                    "label": "Bangku"
+                    "label": "Bangku",
+                    "terms": "Bangku,Kursi"
                 },
                 "bicycle_parking": {
                     "label": "Tipe"
                 },
+                "bin": {
+                    "label": "Tong Sampah",
+                    "terms": "Tempat Sampah, Tempat Pembuangan, Tempat Limbah"
+                },
+                "blind": {
+                    "label": "Akses Tunanetra",
+                    "options": {
+                        "limited": "Terbatas",
+                        "no": "Tidak",
+                        "yes": "Ya"
+                    },
+                    "terms": "Akses Orang Buta,Akses ramah tunanetra"
+                },
+                "blood_components": {
+                    "label": "Komponen Darah",
+                    "options": {
+                        "plasma": "plasma",
+                        "platelets": "platelet"
+                    }
+                },
+                "board_type": {
+                    "label": "tipe"
+                },
+                "bollard": {
+                    "label": "tipe"
+                },
+                "bottle": {
+                    "label": "Pengisian Botol"
+                },
+                "boules": {
+                    "label": "Tipe"
+                },
                 "boundary": {
                     "label": "Tipe"
                 },
                 "brand": {
-                    "label": "Merek"
+                    "label": "Merek",
+                    "terms": "Brand"
                 },
                 "building": {
                     "label": "Bangunan"
                 },
+                "building/levels/underground": {
+                    "label": "Jumlah lantai bawah tanah"
+                },
+                "building/levels_building": {
+                    "label": "Jumlah Lantai Bangunan"
+                },
                 "building_area": {
                     "label": "Bangunan"
                 },
+                "cables": {
+                    "label": "Kabel"
+                },
+                "camera/mount": {
+                    "label": "Pemasangan Kamera"
+                },
+                "camera/type": {
+                    "label": "Tipe kamera",
+                    "options": {
+                        "dome": "Kubah",
+                        "fixed": "Tetap",
+                        "panning": "Bisa bergerak"
+                    }
+                },
                 "capacity": {
                     "label": "Kapasitas",
-                    "placeholder": "50, 100, 200..."
+                    "placeholder": "50, 100, 200...",
+                    "terms": "Kapasitas"
+                },
+                "cash_in": {
+                    "label": "Tunai"
+                },
+                "changing_table": {
+                    "label": "Meja ganti popok"
+                },
+                "charge_fee": {
+                    "label": "Biaya pengunaan"
+                },
+                "check_date": {
+                    "label": "Tanggal terakhir dicek"
+                },
+                "circumference": {
+                    "label": "Keliling",
+                    "placeholder": "1 m, 20 cm, 30 inci…"
+                },
+                "clothes": {
+                    "label": "Baju"
                 },
                 "collection_times": {
                     "label": "Waktu Pengumpulan"
                 },
+                "colour": {
+                    "terms": "Warna"
+                },
+                "comment": {
+                    "label": "Komentar perubahan",
+                    "placeholder": "Deskripsi singkat tentang kontribusi (diperlukan)"
+                },
+                "communication_multi": {
+                    "label": "Tipe komunikasi"
+                },
+                "connectivity": {
+                    "label": "Konektivitas"
+                },
                 "construction": {
                     "label": "Tipe"
                 },
+                "contact/webcam": {
+                    "label": "URL Webcam",
+                    "placeholder": "http://contoh.com/"
+                },
+                "content": {
+                    "label": "Konten"
+                },
+                "conveying": {
+                    "label": "Arah gerak"
+                },
                 "country": {
                     "label": "Negara"
                 },
+                "country_flag": {
+                    "label": "Bendera Negara"
+                },
                 "covered": {
                     "label": "Terlindungi"
                 },
@@ -556,11 +800,21 @@
                 "crossing": {
                     "label": "Tipe"
                 },
+                "crossing/island": {
+                    "label": "Pulau Pengungsi"
+                },
+                "cuisine": {
+                    "label": "Masakan"
+                },
+                "currency_multi": {
+                    "label": "Tipe Mata Uang"
+                },
                 "cycleway": {
                     "label": "Jalur Sepeda",
                     "options": {
                         "lane": {
-                            "description": "Jalur sepeda dipisahkan dari lalu lintas oleh garis"
+                            "description": "Jalur sepeda dipisahkan dari lalu lintas oleh garis",
+                            "title": "Lajur Sepeda Standar"
                         },
                         "none": {
                             "description": "Tidak ada jalur sepeda",
@@ -573,10 +827,12 @@
                             "description": "Jalur sepeda yang melintas berlawanan arah dengan lalu lintas"
                         },
                         "share_busway": {
-                            "description": "Jalur sepeda berbagi dengan jalur bus"
+                            "description": "Jalur sepeda berbagi dengan jalur bus",
+                            "title": "Lajur sepeda berbagi dengan bus"
                         },
                         "shared_lane": {
-                            "description": "Jalur sepeda yang tak dipisahkan dari lalu lintas"
+                            "description": "Jalur sepeda yang tak dipisahkan dari lalu lintas",
+                            "title": "Lajur sepeda berbagi"
                         },
                         "track": {
                             "description": "Jalur sepeda dipisahkan dari lalu lintas oleh pembatas",
@@ -589,24 +845,117 @@
                         "cycleway:right": "Sisi kanan"
                     }
                 },
+                "dance/style": {
+                    "label": "Gaya tarian"
+                },
+                "date": {
+                    "label": "Tanggal"
+                },
+                "delivery": {
+                    "label": "Pesan Antar"
+                },
                 "denomination": {
                     "label": "Satuan"
                 },
                 "denotation": {
                     "label": "Penunjuk"
                 },
+                "departures_board": {
+                    "options": {
+                        "realtime": "Langsung"
+                    }
+                },
+                "depth": {
+                    "label": "Kedalaman (Meter)"
+                },
                 "description": {
                     "label": "Deskripsi"
                 },
+                "design": {
+                    "label": "Desain"
+                },
+                "destination/ref_oneway": {
+                    "label": "Nomor Jalan Tujuan"
+                },
+                "destination/symbol_oneway": {
+                    "label": "Simbol Tujuan"
+                },
+                "destination_oneway": {
+                    "label": "Tujuan"
+                },
+                "devices": {
+                    "label": "Perangkat"
+                },
+                "diameter": {
+                    "label": "Diameter",
+                    "placeholder": "5 mm, 10 cm, 15 in…"
+                },
+                "diet_multi": {
+                    "label": "Tipe diet"
+                },
+                "direction_cardinal": {
+                    "options": {
+                        "E": "Timur",
+                        "ENE": "Timur-Timur Laut",
+                        "ESE": "Timur-Tenggara",
+                        "N": "Utara",
+                        "NE": "Timur Laut",
+                        "NNE": "Utara-Timur Laut",
+                        "NNW": "Utara-Barat laut",
+                        "NW": "Barat Laut",
+                        "S": "Selatan",
+                        "SE": "Tenggara",
+                        "SSE": "Selatan-tenggara",
+                        "SSW": "Selatan-barat daya",
+                        "SW": "Barat Daya",
+                        "W": "Barat",
+                        "WNW": "Barat-Barat Laut",
+                        "WSW": "Barat-Barat Daya"
+                    }
+                },
+                "direction_clock": {
+                    "options": {
+                        "anticlockwise": "Berlawanan Jarum Jam",
+                        "clockwise": "Searah Jarum Jam"
+                    }
+                },
+                "display": {
+                    "label": "Tampilan"
+                },
+                "distance": {
+                    "label": "Jarak"
+                },
+                "dog": {
+                    "label": "Anjing",
+                    "options": {
+                        "leashed": "Diikat",
+                        "no": "Tidak dibolehkan"
+                    }
+                },
+                "door": {
+                    "label": "Pintu"
+                },
+                "drink_multi": {
+                    "label": "Minuman"
+                },
+                "drinking_water": {
+                    "label": "Bisa diminum"
+                },
+                "duration": {
+                    "label": "Durasi",
+                    "placeholder": "00:00"
+                },
                 "electrified": {
+                    "label": "Memiliki Listrik",
                     "options": {
                         "no": "Tidak",
                         "rail": "Rel kereta listrik",
                         "yes": "Ya (umum)"
                     }
                 },
-                "elevation": {
-                    "label": "Ketinggian"
+                "email": {
+                    "label": "Email",
+                    "placeholder": "example@example.com"
                 },
                 "emergency": {
                     "label": "Darurat"
@@ -624,47 +973,121 @@
                 "fee": {
                     "label": "Biaya"
                 },
+                "fire_hydrant/diameter": {
+                    "label": "Diameter (mm, inci, atau letters)"
+                },
+                "fire_hydrant/pressure": {
+                    "label": "Tekanan (bar)"
+                },
                 "fire_hydrant/type": {
                     "options": {
                         "underground": "Bawah tanah",
                         "wall": "Tembok"
                     }
                 },
+                "fireplace": {
+                    "label": "Perapian"
+                },
+                "fishing": {
+                    "label": "Pemancingan"
+                },
+                "fitness_station": {
+                    "label": "Tipe peralatan"
+                },
                 "fixme": {
                     "label": "Perbaiki Saya"
                 },
+                "flag/type": {
+                    "label": "Tipe bendera"
+                },
+                "floating": {
+                    "label": "Mengapung"
+                },
+                "flood_prone": {
+                    "label": "Rawan Banjir"
+                },
+                "from": {
+                    "label": "Dari"
+                },
                 "fuel": {
                     "label": "Bahan bakar"
                 },
+                "fuel_multi": {
+                    "label": "Tipe Bahan Bakar"
+                },
+                "gambling": {
+                    "label": "Judi"
+                },
                 "gender": {
                     "label": "Kelamin",
                     "options": {
                         "female": "Perempuan",
-                        "male": "Laki-laki"
+                        "male": "Laki-laki",
+                        "unisex": "Unisex"
                     },
-                    "placeholder": "Tidak diketahui"
+                    "placeholder": "Tidak diketahui",
+                    "terms": "Kelamin"
                 },
                 "generator/method": {
                     "label": "Metode"
                 },
+                "generator/output/electricity": {
+                    "placeholder": "50 MW, 100 MW, 200 MW..."
+                },
                 "generator/source": {
                     "label": "Sumber"
                 },
                 "generator/type": {
                     "label": "Tipe"
                 },
+                "geyser/height": {
+                    "label": "Tinggi Erupsi"
+                },
+                "gnis/feature_id": {
+                    "label": "Fitur ID GNIS"
+                },
+                "grape_variety": {
+                    "label": "Varietas Anggur"
+                },
                 "handicap": {
                     "placeholder": "1-18"
                 },
+                "healthcare/speciality": {
+                    "label": "Keahlian"
+                },
+                "height": {
+                    "label": "Tinggi (Meter)"
+                },
+                "height_building": {
+                    "label": "Tinggi Bangunan (Meter)"
+                },
+                "highspeed": {
+                    "label": "Ngebut"
+                },
                 "highway": {
                     "label": "Tipe"
                 },
                 "historic": {
                     "label": "Tipe"
                 },
+                "historic/civilization": {
+                    "label": "Peradaban Bersejarah"
+                },
+                "historic/wreck/date_sunk": {
+                    "label": "Tanggal Tenggelam"
+                },
+                "historic/wreck/visible_at_high_tide": {
+                    "label": "Kelihatan saat air pasang"
+                },
+                "historic/wreck/visible_at_low_tide": {
+                    "label": "Kelihatan saat air surut"
+                },
                 "hoops": {
                     "placeholder": "1, 2, 4..."
                 },
+                "hot_water": {
+                    "label": "Air panas"
+                },
                 "incline": {
                     "label": "Lereng"
                 },
@@ -674,11 +1097,13 @@
                         "up": "Atas"
                     }
                 },
+                "informal": {
+                    "label": "Tidak formal"
+                },
                 "information": {
                     "label": "Tipe"
                 },
                 "internet_access": {
-                    "label": "Akses Internet",
                     "options": {
                         "no": "Tidak",
                         "terminal": "Terminal",
@@ -687,6 +1112,27 @@
                         "yes": "Ya"
                     }
                 },
+                "internet_access/ssid": {
+                    "label": "Nama jaringan Wi-Fi"
+                },
+                "interval": {
+                    "label": "Interval"
+                },
+                "junction_line": {
+                    "options": {
+                        "circular": "Bundaran Kecil Jalan",
+                        "roundabout": "Bundaran"
+                    }
+                },
+                "kerb/height": {
+                    "label": "Tinggi"
+                },
+                "kneipp_water_cure_multi": {
+                    "label": "Tipe Basin"
+                },
+                "label": {
+                    "label": "Label"
+                },
                 "lamp_type": {
                     "label": "Tipe"
                 },
@@ -697,6 +1143,9 @@
                     "label": "Jalur",
                     "placeholder": "1, 2, 3..."
                 },
+                "language_multi": {
+                    "label": "Bahasa"
+                },
                 "layer": {
                     "label": "Lapis"
                 },
@@ -716,19 +1165,58 @@
                 "length": {
                     "label": "Panjang (Meter)"
                 },
+                "level": {
+                    "label": "Tingkatan"
+                },
                 "lit": {
                     "label": "Disinari"
                 },
                 "location": {
                     "label": "Lokasi"
                 },
+                "location_pool": {
+                    "options": {
+                        "outdoor": "Luar Ruangan",
+                        "roof": "Atap"
+                    }
+                },
+                "lock": {
+                    "label": "Kunci"
+                },
+                "lockable": {
+                    "label": "Bisa Dikunci"
+                },
                 "man_made": {
                     "label": "Tipe"
                 },
+                "manufacturer": {
+                    "label": "Manufaktur",
+                    "terms": "Pembuat,Produsen,Pabrik"
+                },
+                "max_age": {
+                    "label": "Umur maksimal"
+                },
+                "maxheight": {
+                    "label": "Tinggi Maksimal",
+                    "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
+                },
                 "maxspeed": {
                     "label": "Batas Kecepatan",
                     "placeholder": "40, 50, 60..."
                 },
+                "maxspeed/advisory": {
+                    "label": "Batas Kecepatan yang disarankan"
+                },
+                "min_age": {
+                    "label": "Umur minimal"
+                },
+                "minspeed": {
+                    "label": "Batas kecepatan minimal",
+                    "placeholder": "20, 30, 40..."
+                },
+                "monitoring_multi": {
+                    "label": "Monitoring"
+                },
                 "mtb/scale": {
                     "placeholder": "0, 1, 2, 3..."
                 },
@@ -956,9 +1444,6 @@
                 "aerialway/cable_car": {
                     "name": "Kereta Gantung"
                 },
-                "aerialway/gondola": {
-                    "name": "Gondola"
-                },
                 "aeroway/aerodrome": {
                     "name": "Bandar udara",
                     "terms": "Bandara,Lapangan Terbang,"
@@ -1123,9 +1608,6 @@
                 "amenity/pub": {
                     "name": "Pub"
                 },
-                "amenity/register_office": {
-                    "name": "Dinas Catatan Sipil"
-                },
                 "amenity/restaurant": {
                     "name": "Restoran",
                     "terms": "Rumah Makan"
@@ -1145,9 +1627,6 @@
                 "amenity/studio": {
                     "name": "Studio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Kolam Renang"
-                },
                 "amenity/taxi": {
                     "name": "Tempat Tunggu Taksi"
                 },
@@ -1912,25 +2391,9 @@
                 "railway/disused": {
                     "name": "Rel Tidak Terpakai"
                 },
-                "railway/monorail": {
-                    "name": "Monorel"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Sepur Sempit",
-                    "terms": "Narrow Gauge Rail, Trek, Trak, Lebar Jalur Kereta Api"
-                },
-                "railway/rail": {
-                    "name": "Rel Kereta"
-                },
-                "railway/subway": {
-                    "name": "Jalur Bawah Tanah"
-                },
                 "railway/subway_entrance": {
                     "name": "Pintu Terowongan"
                 },
-                "railway/tram": {
-                    "name": "Tram"
-                },
                 "relation": {
                     "name": "Relasi"
                 },
@@ -2051,9 +2514,6 @@
                 "shop/fashion": {
                     "name": "Toko Mode"
                 },
-                "shop/fishmonger": {
-                    "name": "Penjual Ikan"
-                },
                 "shop/florist": {
                     "name": "Toko Bunga"
                 },
@@ -2063,9 +2523,6 @@
                 "shop/funeral_directors": {
                     "name": "Rumah Pemakaman"
                 },
-                "shop/furnace": {
-                    "name": "Toko Perapian"
-                },
                 "shop/furniture": {
                     "name": "Toko Furnitur"
                 },
@@ -2351,6 +2808,12 @@
                 "type/route/tram": {
                     "name": "Rute Trem"
                 },
+                "type/waterway": {
+                    "name": "Jalur Air"
+                },
+                "waterway": {
+                    "name": "Fitur Jalur Air"
+                },
                 "waterway/canal": {
                     "name": "Kanal"
                 },
@@ -2373,11 +2836,61 @@
                 "waterway/stream": {
                     "name": "Aliran"
                 },
+                "waterway/waterfall": {
+                    "name": "Air terjun"
+                },
                 "waterway/weir": {
                     "name": "Tanggul",
                     "terms": "Sungai, Bendung"
                 }
             }
+        },
+        "imagery": {
+            "Bing": {
+                "description": "Citra satelit dan udara",
+                "name": "Citra udara Bing"
+            },
+            "EsriWorldImagery": {
+                "attribution": {
+                    "text": "Ketentuan & Saran"
+                },
+                "description": "Citra Esri world",
+                "name": "Citra Esri World"
+            },
+            "EsriWorldImageryClarity": {
+                "attribution": {
+                    "text": "Ketentuan & Saran"
+                },
+                "description": "Arsip citra Esri mungkin lebih bersih dan lebih akurat daripada layer default."
+            },
+            "Mapbox": {
+                "attribution": {
+                    "text": "Ketentuan & Saran"
+                },
+                "description": "Citra satelit dan udara.",
+                "name": "Satelit Mapbox"
+            },
+            "US-TIGER-Roads-2017": {
+                "description": "Kuning = Data peta publik dari sensus Amerika. Merah = Data tidak ditemukan di OpenStreetMap"
+            },
+            "US-TIGER-Roads-2018": {
+                "description": "Kuning = Data peta publik dari sensus Amerika. Merah = Data tidak ditemukan di OpenStreetMap"
+            },
+            "US-TIGER-Roads-2019": {
+                "description": "Kuning = Data peta publik dari sensus Amerika. Merah = Data tidak ditemukan di OpenStreetMap"
+            },
+            "USDA-NAIP": {
+                "name": "Program Nasional Pemetaan Pertanian "
+            },
+            "US_Forest_Service_roads_overlay": {
+                "description": "Jalan tol: Berwarna hijau = tidak bisa diklasifikasikan. Berwarna coklat = jalur. Permukaan: jalan makadam = coklat muda, Aspal = hitam, trotoar=putih, beton = biru, semak = hijau. Musiman = salur putih"
+            },
+            "gsi.go.jp_std_map": {
+                "attribution": {
+                    "text": "GSI Jepang"
+                },
+                "name": "Peta standar GSI Jepang"
+            }
         }
     }
 }

vendor/assets/iD/iD/locales/is.json

@@ -6,16 +6,32 @@
             "remove": "fjarlægja",
             "undo": "afturkalla",
             "zoom_to": "renna að",
-            "copy": "afrita"
+            "copy": "afrita",
+            "view_on": "skoða á {domain}",
+            "favorite": "eftirlæti",
+            "list": "listi",
+            "text": "texti",
+            "deselect": "afvelja"
         },
         "toolbar": {
-            "recent": "Nýlega"
+            "inspect": "Yfirfara",
+            "undo_redo": "Afturkalla / Endurtaka",
+            "recent": "Nýlegt",
+            "favorites": "Eftirlæti",
+            "add_feature": "Bæta við fitju"
         },
         "modes": {
+            "add_feature": {
+                "title": "Bæta við fitju",
+                "description": "Leita að fitjum til að bæta við landakortið.",
+                "result": "{count} niðurstaða",
+                "results": "{count} niðurstöður"
+            },
             "add_area": {
                 "title": "Svæði",
                 "description": "Bættu landsvæðum, byggingum, vötnum eða öðrum svæðum á kortið.",
-                "tail": "Smelltu á kortið til að teikna svæði, til dæmis garð, vatn eða byggingu."
+                "tail": "Smelltu á kortið til að teikna svæði, til dæmis garð, vatn eða byggingu.",
+                "filter_tooltip": "svæði"
             },
             "add_line": {
                 "title": "Lína",
@@ -27,12 +43,17 @@
                 "title": "Punktur",
                 "description": "Bættu veitingastöðum, minnismerkjum, póstkössum eða öðrum punktum við kortið.",
                 "tail": "Smelltu á kortið til að bæta við punkti.",
-                "filter_tooltip": "stig"
+                "filter_tooltip": "punktar"
             },
             "add_note": {
                 "title": "Minnispunktur",
+                "label": "Bæta við minnispunkti",
                 "description": "Fannstu hnökra? Láttu annað kortagerðarfólk vita.",
-                "tail": "Smelltu á kortið til að bæta við minnispunkti."
+                "tail": "Smelltu á kortið til að bæta við minnispunkti.",
+                "key": "N"
+            },
+            "add_preset": {
+                "title": "Bæta við {feature}"
             },
             "browse": {
                 "title": "Fletta",
@@ -51,7 +72,7 @@
         "operations": {
             "add": {
                 "annotation": {
-                    "point": "Bætti punkti við.",
+                    "point": "Bætti við punkti.",
                     "vertex": "Bætti hnúti við leið.",
                     "relation": "Bætti við venslum.",
                     "note": "Bætti við minnispunkti."
@@ -78,21 +99,44 @@
                 "annotation": "Hætti við að teikna."
             },
             "change_role": {
-                "annotation": "Breytti hlutverki tengds aðila."
+                "annotation": "Breytti hlutverki tengds staks."
             },
             "change_tags": {
                 "annotation": "Breytti merkingum."
             },
             "circularize": {
                 "title": "Hringlaga",
-                "key": "O"
+                "description": {
+                    "single": "Gera þessa fitju hringlaga.",
+                    "multiple": "Gera þessar fitjur hringlaga."
+                },
+                "key": "O",
+                "annotation": {
+                    "single": "Gerði fitju hringlaga.",
+                    "multiple": "Gerði fitjur hringlaga."
+                }
             },
             "orthogonalize": {
-                "title": "Hornrétta"
+                "title": "Hornrétta",
+                "description": {
+                    "corner": {
+                        "single": "Rétta þetta horn.",
+                        "multiple": "Rétta þessi horn."
+                    }
+                },
+                "key": "Q"
             },
             "straighten": {
                 "title": "Slétta",
+                "description": {
+                    "points": "Slétta þessa punkta.",
+                    "line": "Slétta þessa línu."
+                },
                 "key": "S",
+                "annotation": {
+                    "points": "Slétti nokkra punkta.",
+                    "line": "Slétti úr línu."
+                },
                 "too_bendy": "Það er ekki hægt að slétta úr þessu því að það beygir of skarplega"
             },
             "delete": {
@@ -127,10 +171,13 @@
                 }
             },
             "add_member": {
-                "annotation": "Bætti við vensl"
+                "annotation": "Bætti staki við vensl"
             },
             "delete_member": {
-                "annotation": "Fjarlægði úr venslum"
+                "annotation": "Fjarlægði stak úr venslum"
+            },
+            "reorder_members": {
+                "annotation": "Endurraðaði stökum vensla."
             },
             "connect": {
                 "annotation": {
@@ -159,7 +206,7 @@
                 "annotation": "Aðskilja línur/svæði.",
                 "not_connected": "Það eru ekki nógu margar línur/svæði hérna til að aftengja.",
                 "connected_to_hidden": "Ekki er hægt að aftengja þetta því að það tengist földu eigindi.",
-                "relation": "Ekki hægt að aftengja þetta því það tengir saman meðlimi í venslum."
+                "relation": "Ekki hægt að aftengja þetta því það tengir saman stök í venslum."
             },
             "merge": {
                 "title": "Sameina",
@@ -369,7 +416,6 @@
             "request_review": "Ég myndi vilja að einhver yfirfæri breytingarnar mínar.",
             "save": "Senda inn",
             "cancel": "Hætta við",
-            "changes": "{count} breytingar",
             "download_changes": "Sækja osmChange-skrá",
             "errors": "Villur",
             "warnings": "Aðvaranir",
@@ -460,12 +506,7 @@
         },
         "inspector": {
             "zoom_to": {
-                "key": "Z",
-                "title": "Renna að þessu",
-                "tooltip_feature": "Miðja og renna að þessari fitju á kortinu.",
-                "tooltip_note": "Miðja og renna að þessum minnispunkti á kortinu.",
-                "tooltip_data": "Miðja og renna að þessum gögnum á kortinu.",
-                "tooltip_issue": "Miðja og renna að þessu vandamáli á kortinu."
+                "key": "Z"
             },
             "show_more": "Sýna meira",
             "view_on_osm": "Skoða á openstreetmap.org",
@@ -634,7 +675,6 @@
             "custom_background": {
                 "tooltip": "Breyta sérsniðnum bakgrunni",
                 "header": "Sérsniðnar bakgrunnsstillingar",
-                "instructions": "Settu inn sniðmát slóðar á kortatígul. Gild viðföng eru:\n   {zoom} eða {z}, {x}, {y} fyrir Z/X/Y tíglaskema\n   {-y} eða {ty} fyrir flett TMS-stíls Y-hnit\n   {u} fyrir fjórtígla skema (quadtile)\n   {switch:a,b,c} fyrir fléttugreiningu á DNS-þjóni (multiplexing)\n\nDæmi:\n{example}",
                 "template": {
                     "placeholder": "Settu inn slóð á sniðmát"
                 }
@@ -682,7 +722,7 @@
                 "deleted": "Þessari fitju var eytt af {user}.",
                 "location": "Þessi fitja var færð bæði af þér og af {user}.",
                 "nodelist": "Hnútum var breytt bæði af þér og af {user}.",
-                "memberlist": "Meðlimum vensla var breytt bæði af þér og af {user}.",
+                "memberlist": "Stökum vensla var breytt bæði af þér og af {user}.",
                 "tags": "Þú breyttir <b>{tag}</b> merkinu í \"{local}\" og {user} breytti því í \"{remote}\"."
             }
         },
@@ -715,10 +755,6 @@
             "on_wiki": "{tag} á wiki.osm.org",
             "used_with": "notað með {type}"
         },
-        "zoom": {
-            "in": "Renna að",
-            "out": "Renna frá"
-        },
         "cannot_zoom": "Get ekki rennt lengra frá í núverandi ham.",
         "full_screen": "Víxla skjáfylli af/á",
         "QA": {
@@ -774,7 +810,7 @@
                     "this_turn_restriction": "þessi takmörkun á beygju",
                     "this_roundabout": "þetta hringtorg",
                     "this_mini_roundabout": "þetta smáhringtorg",
-                    "this_track": "þessi slóð",
+                    "this_track": "þessi ferill",
                     "this_feature": "þessi fitja",
                     "highway": "þjóðvegur",
                     "railway": "lestarteinar",
@@ -885,6 +921,10 @@
                     "370": {
                         "title": "Tvíteknir staðir"
                     },
+                    "390": {
+                        "title": "Vantar gerð brautar (tracktype)",
+                        "description": "{var1} er ekki með \"tracktype\" merki."
+                    },
                     "401": {
                         "title": "Takmörkun á beygju vantar"
                     },
@@ -958,8 +998,7 @@
                 "before_start_h": "Áður en þú byrjar",
                 "before_start": "Þú þyrftir að vera kunnug(ur) OpenStreetMap og þessum ritli áður en þú hefst handa við breytingar. iD kemur með skref-fyrir-skref leiðarvísi sem getur kennt þér grunnatriði við breytingar á OpenStreetMap. Smelltu á \"Skoða leiðarvísi\" á þessum skjá til að fara í kennsluna - þetta tekur einungis um 15 mínútur.",
                 "open_source_h": "Opinn hugbúnaður",
-                "open_source": "iD ritillinn er samstarfsverkefni um opinn og frjálsan hugbúnað, og ert þú að nota núna útgáfu {version}. Grunnkóðinn er til taks [á GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Þú getur hjálpað iD með því að [þýða](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) hann eða með því að [tilkynna villur](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "iD ritillinn er samstarfsverkefni um opinn og frjálsan hugbúnað, og ert þú að nota núna útgáfu {version}. Grunnkóðinn er til taks [á GitHub](https://github.com/openstreetmap/iD)."
             },
             "overview": {
                 "title": "Yfirlit",
@@ -1059,16 +1098,16 @@
             },
             "relations": {
                 "title": "Vensl",
-                "intro": "*Vensl* (relation) er sérstök tegund eiginda í OpenStreetMap sem hópar saman önnur eigindi/fitjur. Fitjur eða eigindi sem tilheyra venslum kallast *meðlimir* (members), og getur hver meðlimur haft *hlutverk* (role) í venslunum.",
+                "intro": "*Vensl* (relation) er sérstök tegund eiginda í OpenStreetMap sem hópar saman önnur eigindi/fitjur. Fitjur eða eigindi sem tilheyra venslum kallast *stök* (members), og getur hvert stak haft *hlutverk* (role) í venslunum.",
                 "edit_relation_h": "Breytingar á venslum",
-                "edit_relation_delete": "Þú getur einnig smellt á {delete} **Eyða** hnappin til að fjarlægja völdu fitjuna úr venslunum. Ef þú fjarlægir alla meðlimi úr venslum, verður þeim venslum eytt sjálfvirkt.",
+                "edit_relation_delete": "Þú getur einnig smellt á {delete} **Eyða** hnappin til að fjarlægja völdu fitjuna úr venslunum. Ef þú fjarlægir öll stök úr venslum, verður þeim venslum eytt sjálfvirkt.",
                 "maintain_relation_h": "Viðhalda venslum",
-                "maintain_relation": "Oftast nær mun iD viðhalda venslum um leið og þú sýslar með breytingar. Þú ættir að fara varlega þegar þú ert að skipta út fitjum sem gætu verið meðlimir í venslum. Til dæmis ef þú eyðir vegbút og teiknar nýjan veghluta í stað hans, ættirðu að bæta nýja veghlutanum í sömu vensl (vegir, beygjutakmarkanir, o.s.frv.) eins og upprunalegi vegurinn hafði.",
+                "maintain_relation": "Oftast nær mun iD viðhalda venslum um leið og þú sýslar með breytingar. Þú ættir að fara varlega þegar þú ert að skipta út fitjum sem gætu verið stök í venslum. Til dæmis ef þú eyðir vegbút og teiknar nýjan veghluta í stað hans, ættirðu að bæta nýja veghlutanum í sömu vensl (vegir, beygjutakmarkanir, o.s.frv.) eins og upprunalegi vegurinn hafði.",
                 "relation_types_h": "Tegundir vensla",
                 "multipolygon_h": "Fjölhyrningar (Flákar)",
                 "multipolygon": "Venslin *fjölhyrningur* er hópur af einni eða fleiri *ytri* fitjum og einni eða fleiri *innri* fitjum. Ytri fitjurnar skilgreina útjaðra fjölhyrningsins og innri fitjurnar skilgreina undirsvæði eða holur sem skornar eru út úr innri fleti fjölhyrningsins.",
                 "multipolygon_create": "Til að búa til fjölhyrning, til dæmis byggingu með inngarði, teiknaðu þá útjaðarinn sem svæði og svo innri jaðrana sem línu eða annarskonar svæði. Síðan skaltu nota `{shift}`+{leftclick} vinstri-smell til að velja báðar fitjurnar, {rightclick} hægri-smella til að birta breytingavalmyndina, og velja síðan {merge} **Sameina** skipunina.",
-                "multipolygon_merge": "Sameining nokkurra lína eða svæða mun útbúa ný fjölhyrningsvensl með öll valin svæði sem meðlimi. iD mun velja innri og ytri hlutverkin sjálfvirkt, byggt á því hvaða fitjur eru innan í öðrum fitjum.",
+                "multipolygon_merge": "Sameining nokkurra lína eða svæða mun útbúa ný fjölhyrningsvensl með öll valin svæði sem stök. iD mun velja innri og ytri hlutverkin sjálfvirkt, byggt á því hvaða fitjur eru innan í öðrum fitjum.",
                 "turn_restriction_h": "Takmarkanir á beygjum",
                 "turn_restriction": "Venslin *takmörkun á beygjum* er hópur nokkurra vegbúta á vegamótum. Takmarkanir á beygjum samanstanda af *frá* (from) vegi, *gegnum* (via) hnút eða vegi, og *til* (to) vegar.",
                 "turn_restriction_field": "Til að breyta beygjutakmörkunum, veldu þá tengihnút þar sem tveir eða fleiri vegir mætast. Fitjuritillinn mun birta sérstakt \"Takmarkanir á beygjum\" gagnasvið sem sýnir líkan af gatnamótunum.",
@@ -1165,6 +1204,12 @@
             "warnings": {
                 "list_title": "Aðvaranir ({count})"
             },
+            "missing_role": {
+                "message": "{member} hefur ekkert hlutverk innan {relation}"
+            },
+            "impossible_oneway": {
+                "title": "Ómögulegar einstefnur"
+            },
             "fix": {
                 "connect_endpoints": {
                     "title": "Tengdu endana"
@@ -1574,6 +1619,15 @@
                 "category-landuse": {
                     "name": "Fitjur fyrir landnotkun"
                 },
+                "category-natural": {
+                    "name": "Náttúrufyrirbæri"
+                },
+                "category-path": {
+                    "name": "Stígar"
+                },
+                "category-rail": {
+                    "name": "Lestarteinar"
+                },
                 "category-restriction": {
                     "name": "Takmörkunareigindi"
                 },
@@ -1591,6 +1645,9 @@
                 },
                 "category-utility": {
                     "name": "Eigindi aðstöðu"
+                },
+                "category-waterway": {
+                    "name": "Siglingaleiðir"
                 }
             },
             "fields": {
@@ -1963,7 +2020,7 @@
                         },
                         "track": {
                             "description": "Hjólabraut sem aðskilin er frá annarri umferð með eiginlegri hindrun",
-                            "title": "Hjólaslóð"
+                            "title": "Hjólabraut"
                         }
                     },
                     "placeholder": "ekkert",
@@ -2087,9 +2144,6 @@
                     },
                     "placeholder": "Snertistrengur, rafteinar..."
                 },
-                "elevation": {
-                    "label": "Hæð"
-                },
                 "email": {
                     "label": "Tölvupóstur",
                     "placeholder": "dæmi@dæmi.is"
@@ -2295,7 +2349,6 @@
                     "label": "Tímabundið rennsli"
                 },
                 "internet_access": {
-                    "label": "Internetaðgangur",
                     "options": {
                         "no": "Nei",
                         "terminal": "Útstöð",
@@ -2304,9 +2357,6 @@
                         "yes": "Já"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Gjald fyrir internetaðgang"
-                },
                 "junction_line": {
                     "options": {
                         "roundabout": "Hringtorg"
@@ -3330,9 +3380,6 @@
                 "aerialway/drag_lift": {
                     "name": "Toglyfta"
                 },
-                "aerialway/gondola": {
-                    "name": "Eggjalyfta"
-                },
                 "aerialway/goods": {
                     "name": "Vöruvíralyfta"
                 },
@@ -3658,9 +3705,6 @@
                 "amenity/recycling_container": {
                     "name": "Endurvinnslugámur"
                 },
-                "amenity/register_office": {
-                    "name": "Skráningarskrifstofa"
-                },
                 "amenity/restaurant": {
                     "name": "Veitingahús"
                 },
@@ -3724,9 +3768,6 @@
                 "amenity/school": {
                     "name": "Skólalóð"
                 },
-                "amenity/scrapyard": {
-                    "name": "Brotajárnshaugur"
-                },
                 "amenity/shelter": {
                     "name": "Skýli"
                 },
@@ -3757,9 +3798,6 @@
                 "amenity/studio": {
                     "name": "Upptökustúdíó"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Sundlaug"
-                },
                 "amenity/taxi": {
                     "name": "Leigubílastæði"
                 },
@@ -4446,6 +4484,12 @@
                 "highway/primary_link": {
                     "name": "Stofnrein"
                 },
+                "highway/raceway": {
+                    "name": "Kappakstursbraut"
+                },
+                "highway/raceway/motocross": {
+                    "name": "Mótocrossbraut"
+                },
                 "highway/residential": {
                     "name": "Íbúðagata"
                 },
@@ -4505,7 +4549,8 @@
                     "name": "Safnbrautarrein"
                 },
                 "highway/track": {
-                    "name": "Vegslóði án viðhalds"
+                    "name": "Vegslóði án viðhalds",
+                    "terms": "vegslóði án þjónustu,skógarvegur,aðkoma slökkviliðs,bændaslóðar,virkjanavegir,fjórhjóladrifs,4x4,utanvegaslóð"
                 },
                 "highway/traffic_mirror": {
                     "name": "Umferðarspegill"
@@ -4570,9 +4615,6 @@
                 "junction": {
                     "name": "Tenging"
                 },
-                "landuse/allotments": {
-                    "name": "Samfélagsgarður"
-                },
                 "landuse/aquaculture": {
                     "name": "Vatnseldi"
                 },
@@ -4645,15 +4687,9 @@
                 "landuse/military/naval_base": {
                     "name": "Flotastöð"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Hindrunarhlaupabraut"
-                },
                 "landuse/military/range": {
                     "name": "Hersvæði"
                 },
-                "landuse/military/training_area": {
-                    "name": "Æfingasvæði"
-                },
                 "landuse/orchard": {
                     "name": "Aldingarður"
                 },
@@ -4879,6 +4915,12 @@
                 "leisure/track": {
                     "name": "Keppnisbraut (ekki mótorsport)"
                 },
+                "leisure/track/cycling": {
+                    "name": "Hjólreiðabraut"
+                },
+                "leisure/track/horse_racing": {
+                    "name": "Kappreiðabraut"
+                },
                 "leisure/track/running": {
                     "name": "Hlaupabraut"
                 },
@@ -4915,9 +4957,6 @@
                 "man_made/gasometer": {
                     "name": "Gasmælir"
                 },
-                "man_made/groyne": {
-                    "name": "Öldubrjótur"
-                },
                 "man_made/lighthouse": {
                     "name": "Viti"
                 },
@@ -5425,42 +5464,21 @@
                 "railway/disused": {
                     "name": "Ónotaðir lestarteinar"
                 },
-                "railway/funicular": {
-                    "name": "Toglest"
-                },
                 "railway/halt": {
                     "name": "Lestarstöð (stöðvun / beiðni)"
                 },
                 "railway/level_crossing": {
                     "name": "Þverun járnbrautar (vegur)"
                 },
-                "railway/light_rail": {
-                    "name": "Léttlest"
-                },
                 "railway/milestone": {
                     "name": "Vegalengdarmerki járnbrautar"
                 },
-                "railway/miniature": {
-                    "name": "Smájárnbraut"
-                },
-                "railway/monorail": {
-                    "name": "Einteinungur"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Mjótt lestarspor"
-                },
-                "railway/rail": {
-                    "name": "Lestarteinar"
-                },
                 "railway/signal": {
                     "name": "Lestarmerki"
                 },
                 "railway/station": {
                     "name": "Lestarstöð"
                 },
-                "railway/subway": {
-                    "name": "Neðanjarðarlest"
-                },
                 "railway/subway_entrance": {
                     "name": "Inngangur að neðanjarðarlest"
                 },
@@ -5470,9 +5488,6 @@
                 "railway/train_wash": {
                     "name": "Lestarvagnaþvottur"
                 },
-                "railway/tram": {
-                    "name": "Sporvagn"
-                },
                 "railway/tram_stop": {
                     "name": "Staðsetning stöðvunar sporvagna"
                 },
@@ -5647,24 +5662,15 @@
                 "shop/fashion": {
                     "name": "Tískuverslun"
                 },
-                "shop/fishmonger": {
-                    "name": "Fisksali"
-                },
                 "shop/florist": {
                     "name": "Blómabúð"
                 },
                 "shop/frame": {
                     "name": "Innrömmun"
                 },
-                "shop/frozen_food": {
-                    "name": "Frosin matvæli"
-                },
                 "shop/funeral_directors": {
                     "name": "Útfararheimili"
                 },
-                "shop/furnace": {
-                    "name": "Arinvöruverslun"
-                },
                 "shop/furniture": {
                     "name": "Húsgagnaverslun"
                 },

vendor/assets/iD/iD/locales/it.json

@@ -7,6 +7,7 @@
             "undo": "annulla",
             "zoom_to": "zoom a",
             "copy": "copia",
+            "view_on": "visualizza su [dominio]",
             "favorite": "preferisci",
             "list": "lista",
             "text": "testo",
@@ -106,7 +107,38 @@
             },
             "circularize": {
                 "title": "Rendi rotondo",
-                "key": "O"
+                "description": {
+                    "single": "Rendi circolare questo elemento.",
+                    "multiple": "Rendi circolari questi elementi"
+                },
+                "key": "O",
+                "annotation": {
+                    "single": "Realizzato un elemento circolare.",
+                    "multiple": "Realizzato elementi circolari."
+                },
+                "multiple_blockers": {
+                    "multiple": "Questi non possono essere realizzati circolari per diversi motivi."
+                },
+                "not_closed": {
+                    "single": "Questo non può essere realizzato circolare perché non è un anello.",
+                    "multiple": "Questi non possono essere realizzati circolari perché non sono anelli."
+                },
+                "too_large": {
+                    "single": "Questo non può essere reso circolare in quanto non ne è visibile abbastanza.",
+                    "multiple": "Questi non possono essere resi circolai in quanto non ne sono visibili abbastanza."
+                },
+                "connected_to_hidden": {
+                    "single": "Questo non può essere reso circolare in quanto connesso a un elemento nascosto.",
+                    "multiple": "Questi non possono essere resi circolari in quanto alcuni sono connessi ad elementi nascosti."
+                },
+                "not_downloaded": {
+                    "single": "Questo non può essere reso circolare in quanto alcune parti non sono ancora state scaricate.",
+                    "multiple": "Questo non può essere reso circolare in quanto alcune parti non sono ancora state scaricate."
+                },
+                "already_circular": {
+                    "single": "Questo non può essere reso più circolare di quanto è già.",
+                    "multiple": "Questi non possono essere resi più circolare di quanto già siano."
+                }
             },
             "orthogonalize": {
                 "title": "Ortogonalizza",
@@ -121,6 +153,16 @@
                     }
                 },
                 "key": "Q",
+                "annotation": {
+                    "corner": {
+                        "single": "Squadrato un angolo.",
+                        "multiple": "Squadrati più angoli."
+                    },
+                    "feature": {
+                        "single": "Squadrati gli angoli di un elemento.",
+                        "multiple": "Squadrati gli angoli di più elementi."
+                    }
+                },
                 "multiple_blockers": {
                     "multiple": "Impossibile renderli retti per vari motivi."
                 },
@@ -131,6 +173,22 @@
                 "square_enough": {
                     "single": "Impossibile renderlo più retto di quanto non sia già.",
                     "multiple": "Impossibile renderli retti più di quanto non siano già."
+                },
+                "not_squarish": {
+                    "single": "Non può essere squadrato in quanto non sembra quadrato.",
+                    "multiple": "Non possono essere squadrati in quanto non sembrano quadrati."
+                },
+                "too_large": {
+                    "single": "Questo non può essere squadrato in quanto non ne è visibile abbastanza.",
+                    "multiple": "Questi non possono essere squadrati in quanto non ne sono visibili abbastanza."
+                },
+                "connected_to_hidden": {
+                    "single": "Questo non può essere squadrato perché è connetto a un elemento nascosto.",
+                    "multiple": "Questi non possono essere squadrati perché alcuni sono connessi a elementi nascosti."
+                },
+                "not_downloaded": {
+                    "single": "Non può essere squadrato perché alcune parti non sono state scaricate.",
+                    "multiple": "Non possono essere squadrati perché alcune parti non sono state scaricate."
                 }
             },
             "straighten": {
@@ -517,6 +575,12 @@
             "hidden_details": "Questi sono gli elementi attualmente nascosti: {details}"
         },
         "osm_api_status": {
+            "message": {
+                "error": "Impossibile raggiungere le API di OpenStreetMap. Le tue modifiche sono al sicuro in locale. Verifica la tua connessione.",
+                "offline": "Le API OpenStreetMap sono offline. Le tue modifiche sono al sicuro in locale. Per favore riprova più tardi.",
+                "readonly": "Le API OpenStreetMap sono disponibili in sola lettura. Puoi proseguire con le modifiche ma dovrai aspettare per salvare le tue modifche.",
+                "rateLimit": "Le API OpenStreetMap stanno limitando le connessioni anonime. Puoi risolvere effettuando l'accesso."
+            },
             "retry": "Riprova"
         },
         "commit": {
@@ -526,7 +590,7 @@
             "request_review": "Vorrei che qualcuno controllasse le mie modifiche.",
             "save": "Carica",
             "cancel": "Annulla",
-            "changes": "{count} Cambiamenti",
+            "changes": "Modifiche ({count})",
             "download_changes": "Scarica file in formato osmChange",
             "errors": "Errori",
             "warnings": "Avvertimenti",
@@ -614,20 +678,19 @@
             "no_results_worldwide": "Nessun risultato trovato"
         },
         "geolocate": {
+            "key": "L",
             "title": "Mostra la mia posizione",
-            "locating": "Localizzazione in corso, attendere..."
+            "locating": "Localizzazione in corso, attendere...",
+            "location_unavailable": "La tua posizione non è disponibile."
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "Ingrandisci su questo",
-                "tooltip_feature": "Centra e ingrandisci la mappa per focalizzare su questo elemento.",
-                "tooltip_note": "Centra e ingrandisci la mappa per focalizzare su questa nota.",
-                "tooltip_data": "Centra e ingrandisci la mappa per focalizzare su questi dati.",
-                "tooltip_issue": "Centra e ingrandisci la mappa per focalizzare su questo problema."
+                "title": "Ingrandisci sulla selezione"
             },
             "show_more": "Mostra di più",
             "view_on_osm": "Vedi su openstreetmap.org",
+            "view_on_osmose": "Vedi su osmose.openstreetmap.fr",
             "view_on_keepRight": "Vedi su keepright.at",
             "feature_type": "Tipo di elemento",
             "fields": "Campi",
@@ -648,6 +711,7 @@
             "key_value": "chiave=valore",
             "multiple_values": "Valori multipli",
             "multiple_types": "Tipi multipli",
+            "unshared_value_tooltip": "non condiviso da tutti gli elementi",
             "hidden_preset": {
                 "manual": "{elementi} sono nascosti. Abilitale nel pannello Dati della mappa.",
                 "zoom": "{elementi} sono nascosti. Ingrandisci per abilitarle."
@@ -678,7 +742,10 @@
             "way": "Linea",
             "relation": "Relazione",
             "location": "Posizione",
-            "add_fields": "Aggiungi campo:"
+            "add_fields": "Aggiungi campo:",
+            "lock": {
+                "suggestion": "Il campo \"{label}\" è bloccato perché esiste un tag Wikidata. Puoi cancellarlo o modificare il tag nella sezione \"Tags\"."
+            }
         },
         "background": {
             "title": "Sfondo",
@@ -707,6 +774,7 @@
                 "description": "Mostra pannello dettagli",
                 "tooltip": "Mostra informazioni avanzate sullo sfondo."
             },
+            "fix_misalignment": "Offset delle immagini",
             "offset": "Per correggere lo spostamento delle immagini trascina dove preferisci all'interno dell'area grigia sottostante o inserisci i valori correttivi in metri."
         },
         "map_data": {
@@ -724,11 +792,17 @@
                     "title": "Note di OpenStreetMap"
                 },
                 "keepRight": {
+                    "tooltip": "Problemi con i dati rilevato da keepright.at",
                     "title": "Problemi KeepRight"
                 },
                 "improveOSM": {
+                    "tooltip": "Dati mancanti rilevati da improveosm.org",
                     "title": "Problemi ImproveOSM"
                 },
+                "osmose": {
+                    "tooltip": "Problemi con i dati rilevato da osmose.openstreetmap.fr",
+                    "title": "Problemi di Osmose"
+                },
                 "custom": {
                     "tooltip": "Trascina un file dati sulla pagina oppure clicca il pulsante per impostarlo.",
                     "title": "Dati della mappa personalizzati",
@@ -874,7 +948,12 @@
             "description": "Preferenze",
             "key": "P",
             "privacy": {
-                "title": "Privacy"
+                "title": "Privacy",
+                "privacy_link": "Visualizza la privacy policy di iD",
+                "third_party_icons": {
+                    "description": "Mostra icone di terze parti",
+                    "tooltip": "Togli la spunta a questa casella per impedire il caricamento di icone di terze parti come Wikimedia Commons, Facebook e Twitter."
+                }
             }
         },
         "restore": {
@@ -943,6 +1022,9 @@
         "splash": {
             "welcome": "Benvenuti nell'editor OpenStreetMap iD",
             "text": "iD è un intuitivo ma potente strumento per contribuire alla migliore mappa libera del mondo. Questa è la versione {version}. Per ulteriori informazioni vai su {website} o segnala gli errori su {github}.",
+            "privacy_update": "La nostra privacy policy è stata recentemente aggiornata.",
+            "privacy_policy": "Privacy policy di iD",
+            "privacy": "{updateMessage} utilizzando questo software accetti di farlo secondo le indicazioni di {privacyLink}.",
             "walkthrough": "Inizia il tutorial",
             "start": "Modifica"
         },
@@ -965,7 +1047,20 @@
         },
         "cannot_zoom": "Impossibile rimpicciolire ulteriormente nella modalità attuale.",
         "full_screen": "Passa a schermo intero",
+        "self_intersection": {
+            "error": {
+                "lines": "Le linee non devono incrociarsi.",
+                "areas": "Le aree non devono incrociarsi."
+            }
+        },
         "QA": {
+            "osmose": {
+                "title": "Problemi di Osmose",
+                "detail_title": "Dettagli",
+                "elems_title": "Elementi",
+                "fix_title": "Sistema le linee guida",
+                "trap_title": "Errori comuni"
+            },
             "improveOSM": {
                 "title": "Rilevamento ImproveOSM",
                 "geometry_types": {
@@ -1001,11 +1096,15 @@
                 }
             },
             "keepRight": {
+                "title": "KeepRight",
                 "detail_description": "Descrizione",
                 "comment": "Commento",
                 "comment_placeholder": "Inserisci un commento da condividere con gli altri utenti.",
+                "close": "Chiudi (problema risolto)",
+                "ignore": "Rimuovi (falso positivo)",
                 "save_comment": "Salva commento",
                 "close_comment": "Chiudi e commenta",
+                "ignore_comment": "Rimuovi e commenta",
                 "error_parts": {
                     "this_node": "questo nodo",
                     "this_way": "questa linea",
@@ -1324,7 +1423,48 @@
         "mapillary_map_features": {
             "title": "Elementi della mappa",
             "tooltip": "Elementi della mappa da Mapillary",
-            "request_data": "Richiedi dati"
+            "request_data": "Richiedi dati",
+            "construction": {
+                "flat": {
+                    "crosswalk_plain": "attraversamento semplice"
+                }
+            },
+            "marking": {
+                "discrete": {
+                    "crosswalk_zebra": "attraversamento con zebre"
+                }
+            },
+            "object": {
+                "banner": "striscione",
+                "bench": "panchina",
+                "bike_rack": "portabici",
+                "billboard": "cartellone pubblicitario",
+                "catch_basin": "caditoia",
+                "cctv_camera": "telecamera a circuito chiuso",
+                "fire_hydrant": "idrante antincendio",
+                "mailbox": "casella postale",
+                "manhole": "tombino",
+                "phone_booth": "cabina telefonica",
+                "sign": {
+                    "advertisement": "pubblicità",
+                    "information": "cartello informativo",
+                    "store": "insegna"
+                },
+                "street_light": "lampione",
+                "support": {
+                    "utility_pole": "palo"
+                },
+                "traffic_cone": "cono di segnalazione",
+                "traffic_light": {
+                    "cyclists": "semaforo per ciclisti",
+                    "general_horizontal": "semaforo orizzontale",
+                    "general_single": "semaforo singolo",
+                    "general_upright": "semaforo verticale",
+                    "other": "semaforo",
+                    "pedestrians": "semaforo pedonale"
+                },
+                "trash_can": "cestino dell'immondizia"
+            }
         },
         "mapillary": {
             "title": "Mapillary",
@@ -1418,9 +1558,11 @@
                 "type": "Puoi cliccare sul tipo dell'elemento per cambiarlo in un tipo differente. Tutto ciò che esiste nel mondo reale può essere aggiunto ad OpenStreetMap, pertanto ci sono migliaia di tipologie tra le quali scegliere.",
                 "type_picker": "Il raccoglitore dei tipi mostra i tipi di elementi più comuni, come ad esempio i parchi pubblici, gli ospedali, i ristoranti, le strade e gli edifici. Cerca qualsiasi oggetto scrivendo nel riquadro di ricerca. Per conoscere i dettagli del tipo di elemento clicca l'icona {inspect} **Informazioni** a fianco.",
                 "fields_h": "Campi",
+                "fields_all_fields": "La sezione \"Campi\" contiene il dettaglio di tutti gli elementi che puoi modificare. In OpenStreetMap tutti i campi sono opzionali e è accettabile lasciare un campo in bianco se non si è sicuri.",
                 "fields_example": "Ogni elemento mostrerà campi differenti. Per esempio, per una una strada sarà possibile impostare la sua superficie e il limite di velocità, mentre per un ristorante saranno mostrati campi del cibo servito e degli orari di apertura.",
                 "fields_add_field": "Per aggiungere delle informazioni puoi cliccare \"Aggiungi campo\"",
                 "tags_h": "Etichette",
+                "tags_all_tags": "Sotto la sezione campi puoi espandere la sezione \"Tag\" per modificare qualsiasi *tag* OpenStreetMap dell'elemento selezionato. Ciascun tag consiste di una *chiave* ed un *valore* che definiscono tutti gli elementi memorizzati in OpenStreetMap.",
                 "tags_resources": "La modifica dei tag di un elemento richiede una conoscenza intermedia di OpenStreetMap. Dovresti consultare la [wiki di OpenStreetMap](https://wiki.openstreetmap.org/wiki/Main_Page) o [Taginfo](https://taginfo.openstreetmap.org/) per imparare quali usare di volta in volta."
             },
             "points": {
@@ -1481,6 +1623,8 @@
                 "title": "Relazioni",
                 "intro": "Una *relazione* è un tipo speciale di elemento di OpenStreetMap che serve a raggruppare insieme altri elementi. Gli elementi appartenenti ad una relazione sono chiamati *membri* e ogni membro può avere un *ruolo* nella relazione.",
                 "edit_relation_h": "Modificare le relazioni",
+                "edit_relation": "Alla fine dell'editor degli elementi puoi espandere a sezione \"Relazioni\" per verificare se gli elementi selezionati sono membri di qualche relazione. Puoi quindi cliccare sulla relazione per selezionarla e modificarla.",
+                "edit_relation_add": "Per aggiungere un elemento alla relazione seleziona l'elemento quindi clicca il bottone aggiungi {plus} nella sezione \"Relazioni\" dell'editor degli elementi. Puoi scegliere tra una lista di relazioni vicine oppure scegliere l'opzione \"Nuova relazione...\"",
                 "edit_relation_delete": "Puoi anche cliccare il pulsante {delete} **Cancella** per rimuovere l'elemento selezionato dalla relazione. Se rimuovi tutti i membri di una relazione, questa verrà eliminata a sua volta.",
                 "maintain_relation_h": "Manutenere le relazioni",
                 "maintain_relation": "Nella maggior parte dei casi, iD si occuperà automaticamente delle relazioni mentre fai le tue modifiche. Dovresti comunque prestare attenzione quando rimpiazzi elementi che potrebbero essere membri di una relazione. Per esempio, se elimini una parte di strada e tracci un altro pezzo al suo posto, dovresti poi aggiungere anche la nuova strada alle stesse relazioni (percorsi, divieti di svolta, etc.) dell'originale.",
@@ -1495,8 +1639,10 @@
                 "turn_restriction_editing": "Nel campo \"Obblighi di svolta\", clicca per selezionare una strada \"da\" e decidi se le svolte sono consentite oppure vietate per ogni strada \"verso\". Clicca nelle icone di svolta per alternare lo stato tra consentito e vietato. iD creerà automaticamente le relazione e imposterà i ruoli \"da\", \"via\" e \"verso\" basandosi sulle tue scelte.",
                 "route_h": "Percorsi",
                 "route": "Una relazione *percorso* consiste in un gruppo di uno o più elementi linea che formano insieme una rete di percorsi, come per esempio la linea di un autobus, quella di un treno oppure un percorso stradale.",
+                "route_add": "Per aggiungere un elemento alla relazione itinerario seleziona l'elemento e scorri fino alla sezione \"Relazioni\" nell'editor degli elementi, clicca quindi il bottone aggiungi {plus} per aggiungere questo elemento a una relazione esistente o ad una nuova relazione.",
                 "boundary_h": "Confini",
-                "boundary": "Una relazione *Confine* consiste in un gruppo di uno o più elementi linea che insieme formano un confine amministrativo."
+                "boundary": "Una relazione *Confine* consiste in un gruppo di uno o più elementi linea che insieme formano un confine amministrativo.",
+                "boundary_add": "Per aggiungere un elemento ad una relazione di confine seleziona l'elemento e scorri fino alla sezione \"Relazioni\" nell'editor degli elementi, clicca quindi il bottone aggiungi {plus} per aggiungere questo elemento a una relazione esistente o ad una nuova relazione. "
             },
             "notes": {
                 "title": "Note",
@@ -1540,6 +1686,7 @@
                 "title": "Controllo qualità.",
                 "intro": "Gli strumenti di controllo della qualità (Q/A in inglese) individuano etichette improprie, strade separate dalle altre e altri problemi in OpenStreetMap che gli altri mappatori possono risolvere. Per vedere i problemi esistenti, clicca sul pannello {data} **Dati della mappa** per abilitare uno specifico livello Q/A. ",
                 "tools_h": "Strumenti",
+                "tools": "I seguenti strumenti sono attualmente supportati: [KeepRight](https://www.keepright.at/), [ImproveOSM](https://improveosm.org/en/) e [Osmose](https://osmose.openstreetmap.fr/).",
                 "issues_h": "Gestire i problemi",
                 "issues": "La gestione dei problemi di qualità è simile a quella delle note. Clicca su un segnaposto per vedere i dettagli del problema sulla barra laterale. Ogni strumento ha le sue proprietà a sé ma in genere è possibile commentare e/o chiudere un problema."
             },
@@ -1856,6 +2003,10 @@
                     }
                 }
             },
+            "unclosed_multipolygon_part": {
+                "message": "{feature} ha una parte non chiusa",
+                "reference": "Tutte le parti interne ed esterne di un multipoligono devono avere gli estremi connessi."
+            },
             "unsquare_way": {
                 "title": "Angoli non retti (fino a {val}°)",
                 "message": "{feature} ha angoli non retti",
@@ -1873,6 +2024,10 @@
                     "title": "Aggiungi un ponte",
                     "annotation": "Aggiunto un ponte."
                 },
+                "add_a_tunnel": {
+                    "title": "Aggiungi una galleria",
+                    "annotation": "Galleria aggiunta."
+                },
                 "address_the_concern": {
                     "title": "Affronta il problema"
                 },
@@ -2283,7 +2438,8 @@
                     "pan": "Scorri la mappa",
                     "pan_more": "Scorri la mappa di una schermata",
                     "zoom": "Ingrandisci / Rimpicciolisci",
-                    "zoom_more": "Ingrandisci / Rimpicciolisci molto"
+                    "zoom_more": "Ingrandisci / Rimpicciolisci molto",
+                    "geolocate": "Ingrandisci sulla mia posizione"
                 },
                 "help": {
                     "title": "Aiuto",
@@ -2292,7 +2448,11 @@
                 },
                 "display_options": {
                     "title": "Mostra opzioni",
+                    "background": "Commuta pannello delle immagini",
                     "background_switch": "Ritorna all'ultimo sfondo",
+                    "map_data": "Commuta pannello dei dati",
+                    "issues": "Commuta pannello dei problemi di validazione",
+                    "preferences": "Commuta pannello delle preferenze utente",
                     "fullscreen": "Entra in modalità a tutto schermo",
                     "sidebar": "Commuta barra laterale",
                     "wireframe": "Commuta modalità \"fil di ferro\"",
@@ -2308,7 +2468,9 @@
                     "search": "Trova gli elementi che corrispondono al testo della ricerca"
                 },
                 "with_selected": {
-                    "edit_menu": "Commuta il menù edit"
+                    "title": "Con gli elementi selezionati",
+                    "edit_menu": "Commuta il menù edit",
+                    "zoom_to": "Ingrandisci agli elementi selezionati"
                 },
                 "vertex_selected": {
                     "title": "Con il nodo selezionato",
@@ -2491,6 +2653,9 @@
                         "motor_vehicle": "Veicoli a motore"
                     }
                 },
+                "access_aisle": {
+                    "label": "Tipo"
+                },
                 "access_simple": {
                     "label": "Accesso consentito",
                     "terms": "Accesso Consentito, Accesso Permesso, Accesso Pubblico"
@@ -2517,7 +2682,7 @@
                         "county": "Contea (in Italia NON usare)",
                         "county!jp": "Distretto",
                         "district": "Distretto",
-                        "district!vn": "Circoscrizione/Città/Distretto",
+                        "district!vn": "Circoscrizione/Cittadina/Distretto",
                         "floor": "Piano",
                         "hamlet": "Borgo",
                         "housename": "Numero civico",
@@ -2715,6 +2880,11 @@
                     "label": "Edificio",
                     "terms": "Edificio, Palazzo, Stabile, Costruzione"
                 },
+                "building/levels": {
+                    "label": "Piani",
+                    "placeholder": "2, 4, 6...",
+                    "terms": "piani,livelli"
+                },
                 "building/levels/underground": {
                     "label": "Piani sotterranei",
                     "placeholder": "2, 4, 6...",
@@ -2778,7 +2948,12 @@
                     "placeholder": "1 EUR, 5 USD, 10 JPY…"
                 },
                 "check_date": {
-                    "label": "Data dell'ultimo controllo"
+                    "label": "Data dell'ultimo controllo",
+                    "placeholder": "AAAA-MM-GG"
+                },
+                "circumference": {
+                    "label": "Circonferenza",
+                    "placeholder": "1 m, 20 cm, 30 in..."
                 },
                 "clothes": {
                     "label": "Abbigliamento"
@@ -3037,9 +3212,6 @@
                     },
                     "placeholder": "Linea aerea, rotaia elettrificata..."
                 },
-                "elevation": {
-                    "label": "Altitudine"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "esempio@esempio.com"
@@ -3295,7 +3467,6 @@
                     "label": "Intermittente"
                 },
                 "internet_access": {
-                    "label": "Accesso ad Internet",
                     "options": {
                         "no": "No",
                         "terminal": "Terminale",
@@ -3304,9 +3475,6 @@
                         "yes": "Sì"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Accesso ad Internet a pagamento"
-                },
                 "internet_access/ssid": {
                     "label": "Nome rete Wifi"
                 },
@@ -4482,10 +4650,6 @@
                     "name": "Sciovia",
                     "terms": "sci,teleferica,skilift,lift"
                 },
-                "aerialway/gondola": {
-                    "name": "Cabinovia",
-                    "terms": "cabinovia, ovovia"
-                },
                 "aerialway/goods": {
                     "name": "Teleferica",
                     "terms": "funivia,cavo,gru,merci"
@@ -4838,6 +5002,10 @@
                     "name": "Scuola di lingue straniere",
                     "terms": "scuola,lingue,lingua,inglese,tedesco,arabo,cinese,spagnolo"
                 },
+                "amenity/lavoir": {
+                    "name": "Lavatoio",
+                    "terms": "lavatoio,lavanderia,abiti,pulizia,risciacquo"
+                },
                 "amenity/letter_box": {
                     "name": "Cassetta delle lettere"
                 },
@@ -5008,9 +5176,6 @@
                     "name": "Contenitore per il riciclaggio",
                     "terms": "cestino,contenitore,bidone,vetro,plastica,metallo,alluminio,batterie,pile,lampadine,cartone,giornali,carta,bottiglie,spazzatura,immondizia,rifiuti,riciclo,riciclaggio,differenziata"
                 },
-                "amenity/register_office": {
-                    "name": "Anagrafe"
-                },
                 "amenity/restaurant": {
                     "name": "Ristorante",
                     "terms": "bar,caffetteria,caffè,ristorante self-service,braceria,trattoria,negozio di ciambelle,bettola,griglieria,venditore di hamburger,venditore di hotdog,pizzeria"
@@ -5087,9 +5252,6 @@
                     "name": "Area scolastica",
                     "terms": "scuola,accademia,alma mater,lavagna,collegio,dipartimento,disciplina,classe,facoltà,aula,istituto,istituzione,riformatorio,scuola,edificio scolastico,seminario,università"
                 },
-                "amenity/scrapyard": {
-                    "name": "Sfasciacarrozze"
-                },
                 "amenity/shelter": {
                     "name": "Riparo",
                     "terms": "ricovero,rifugio,tettoia,pensilina,bivacco,grotta"
@@ -5155,9 +5317,6 @@
                 "amenity/studio/video": {
                     "name": "Studio di produzione video"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Piscina"
-                },
                 "amenity/taxi": {
                     "name": "Posteggio Taxi",
                     "terms": "taxi"
@@ -5248,6 +5407,10 @@
                     "name": "Macchinetta del gelato",
                     "terms": "gelato,cioccolata,ghiaccoli,ghiacciato,vaniglia,grattachecca,gelati,panna,fragola,pistacchio"
                 },
+                "amenity/vending_machine/ice_cubes": {
+                    "name": "Macchinetta del ghiaccio",
+                    "terms": "cubetti,ghiaccio"
+                },
                 "amenity/vending_machine/newspapers": {
                     "name": "Distributore automatico di quotidiani",
                     "terms": "distributore automatico,macchinetta,giornali,riviste,quotidiani"
@@ -5729,6 +5892,10 @@
                 "craft/chimney_sweeper": {
                     "name": "Spazzacamino"
                 },
+                "craft/cleaning": {
+                    "name": "Ditta di pulizie",
+                    "terms": "pulizia,disinfezione"
+                },
                 "craft/clockmaker": {
                     "name": "Costruttore di orologi",
                     "terms": "orologi"
@@ -5941,6 +6108,10 @@
                 "emergency/yes": {
                     "name": "Accesso di emergenza"
                 },
+                "entrance/emergency": {
+                    "name": "Uscita di emergenza",
+                    "terms": "porta antincendio,antincendio,incendio,fuoco"
+                },
                 "ford": {
                     "name": "Guado",
                     "terms": "guado"
@@ -6422,10 +6593,6 @@
                     "name": "Svincolo",
                     "terms": "svincolo,uscita"
                 },
-                "landuse/allotments": {
-                    "name": "Orti in concessione",
-                    "terms": "orti,orto,pubblico,concessione,lotto,orti urbani"
-                },
                 "landuse/aquaculture": {
                     "name": "Acquacoltura",
                     "terms": "pesci,crostacei,alghe,gambero,gamberi,gamberetti,aragoste,maricoltura,algacoltura,allevamento,molluschi,cozze,ostriche,orate"
@@ -6524,18 +6691,10 @@
                     "name": "Base navale",
                     "terms": "base,navi,marina,marina militare"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Percorso ad ostacoli",
-                    "terms": "Percorso a ostacoli"
-                },
                 "landuse/military/range": {
                     "name": "Poligono di tiro militare",
                     "terms": "poligono,militare,militari,tiro,lancio,bombe,missile,missili,forze militari,forza aerea,forza,guardia,armi,fuoco,marina,fucile,cecchino,cecchini,truppe,truppa,addestramento,guerra,battaglia,battaglione"
                 },
-                "landuse/military/training_area": {
-                    "name": "Area di addestramento",
-                    "terms": "campo di addestramento,addestramento,militare"
-                },
                 "landuse/orchard": {
                     "name": "Frutteto",
                     "terms": "Frutteto"
@@ -6850,26 +7009,14 @@
                     "name": "Pista per ciclismo",
                     "terms": "pista bici,pista bicicletta,pista,pista ciclismo,ciclismo,bici,velodromo,circuito"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Pista ciclistica",
-                    "terms": "ciclo,cicli,bicicletta,biciclette,pista,velocipede,velocipedi,velodromo,corsa,gara"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Pista per la corsa dei cavalli",
                     "terms": "corsa equestre,pista da gara,corsa dei cavalli,scommesse,pista,cavalli"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Pista ippica",
-                    "terms": "equestre,equino,corsa,pista,cavalli,gara,scommesse,galoppo,ippodromo"
-                },
                 "leisure/track/running": {
                     "name": "Pista da corsa",
                     "terms": "pista di atletica,decathlon,gara podistica,distanza,maratona,sprint,camminata,camminare,pista"
                 },
-                "leisure/track/running_point": {
-                    "name": "Pista da corsa",
-                    "terms": "atletica,pista,decathlon,piede,piedi,a piedi,gara,lunga distanza,maratona,media distanza,running,percorso,camminata,cammino"
-                },
                 "leisure/water_park": {
                     "name": "Parco acquatico",
                     "terms": "piscina,immersione,scivoli,acquapark"
@@ -6935,10 +7082,6 @@
                     "name": "Gasometro",
                     "terms": "gazometro"
                 },
-                "man_made/groyne": {
-                    "name": "Pennello",
-                    "terms": "briglia,pennelli"
-                },
                 "man_made/lighthouse": {
                     "name": "Faro",
                     "terms": "Faro"
@@ -7070,9 +7213,6 @@
                 "military/bunker": {
                     "name": "Bunker militare"
                 },
-                "military/checkpoint": {
-                    "name": "Posto di blocco"
-                },
                 "military/nuclear_explosion_site": {
                     "name": "Sito esplosione nucleare"
                 },
@@ -7369,18 +7509,18 @@
                 },
                 "place/city": {
                     "name": "Città",
-                    "terms": "Città"
+                    "terms": "metropoli,cittadina,luogo"
                 },
                 "place/city_block": {
-                    "name": "Isolato",
-                    "terms": "isolato,blocco,manzana,gruppo"
+                    "name": "Isolato urbano",
+                    "terms": "blocco,caseggiato,manzana,gruppo,edifici,palazzi"
                 },
                 "place/farm": {
-                    "name": "Azienda agricola"
+                    "name": "Fattoria o cascina"
                 },
                 "place/hamlet": {
-                    "name": "Paese",
-                    "terms": "Borgo"
+                    "name": "Piccolo borgo",
+                    "terms": "paese,villaggio,frazione,luogo,località,insediamento"
                 },
                 "place/island": {
                     "name": "Isola"
@@ -7389,12 +7529,12 @@
                     "name": "Isoletta"
                 },
                 "place/isolated_dwelling": {
-                    "name": "Case Sparse",
-                    "terms": "Insediamento rurale isolato"
+                    "name": "Abitazione isolata",
+                    "terms": "borgo,frazione,luogo,località,insediamento,dimora,alloggio,isolato"
                 },
                 "place/locality": {
-                    "name": "Località",
-                    "terms": "Località (luogo con nome, non popolato)"
+                    "name": "Località non popolata",
+                    "terms": "luogo,località,zona,posto,sito,isolato"
                 },
                 "place/neighbourhood": {
                     "name": "Quartiere",
@@ -7415,12 +7555,12 @@
                     "terms": "borgo,quartiere"
                 },
                 "place/town": {
-                    "name": "Centro abitato tra 10000 e 100000 abitanti",
-                    "terms": "Paese"
+                    "name": "Cittadina",
+                    "terms": "città,paese,luogo"
                 },
                 "place/village": {
-                    "name": "Villaggio",
-                    "terms": "Paese,villaggio,frazione"
+                    "name": "Paese",
+                    "terms": "cittadina,villaggio,borgo,frazione,luogo,località"
                 },
                 "playground": {
                     "name": "Giochi"
@@ -7684,46 +7824,19 @@
                     "name": "Ferrovia in disuso",
                     "terms": "Ferrovia di disuso"
                 },
-                "railway/funicular": {
-                    "name": "Funicolare",
-                    "terms": "funicolare,treno,trenino"
-                },
                 "railway/halt": {
                     "name": "Fermata ferroviaria (facoltativa/su richiesta)"
                 },
                 "railway/level_crossing": {
                     "name": "Passaggio a livello (strada)"
                 },
-                "railway/light_rail": {
-                    "name": "Metropolitana di superficie",
-                    "terms": "tranvia,metrotranvia,metropolitana,metropolitana di superficie"
-                },
                 "railway/milestone": {
                     "name": "Pietra miliare ferroviaria",
                     "terms": "pietra,miliare,marcatore"
                 },
-                "railway/miniature": {
-                    "name": "Ferrovia in miniatura",
-                    "terms": "trenino,treno in miniatura,scartamento ridotto,scartamento minimo,ferrovia,binario"
-                },
-                "railway/monorail": {
-                    "name": "Monorotaia",
-                    "terms": "Monorotaia"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Ferrovia a scartamento ridotto",
-                    "terms": "scartamento ridotto"
-                },
                 "railway/platform": {
                     "name": "Banchina ferroviaria"
                 },
-                "railway/rail": {
-                    "name": "Ferrovia",
-                    "terms": "Ferrovia"
-                },
-                "railway/rail/highspeed": {
-                    "name": "Alta velocità"
-                },
                 "railway/signal": {
                     "name": "Segnale ferroviario",
                     "terms": "segnale,semaforo,luci"
@@ -7731,10 +7844,6 @@
                 "railway/station": {
                     "name": "Stazione ferroviaria"
                 },
-                "railway/subway": {
-                    "name": "Metropolitana",
-                    "terms": "Metropolitana"
-                },
                 "railway/subway_entrance": {
                     "name": "Entrata di metropolitana",
                     "terms": "Entrata metropolitana"
@@ -7747,9 +7856,6 @@
                     "name": "Lavaggio treni",
                     "terms": "lavaggio,pulizia,treni,treno"
                 },
-                "railway/tram": {
-                    "name": "Tram"
-                },
                 "railway/tram_stop": {
                     "name": "Fermata del tram"
                 },
@@ -8004,9 +8110,6 @@
                     "name": "Negozio di pesca",
                     "terms": "pesca,pescatori,esca,esche vive,lenze,lenza,mosche,canne da pesca,canna da pesca,rocchetto,mulinello"
                 },
-                "shop/fishmonger": {
-                    "name": "Pescivendolo"
-                },
                 "shop/florist": {
                     "name": "Fioraio",
                     "terms": "Fioraio"
@@ -8015,10 +8118,6 @@
                     "name": "Negozio di cornici",
                     "terms": "Corniceria"
                 },
-                "shop/frozen_food": {
-                    "name": "Cibo surgelato",
-                    "terms": "surgelati,ghiaccio,cibo surgelato,pesce surgelato"
-                },
                 "shop/fuel": {
                     "name": "Negozio di carburanti"
                 },
@@ -8026,9 +8125,6 @@
                     "name": "Casa funeraria",
                     "terms": "funerale,cimitero"
                 },
-                "shop/furnace": {
-                    "name": "Negozio di caldaie"
-                },
                 "shop/furniture": {
                     "name": "Negozio di mobili",
                     "terms": "Negozio di mobili"
@@ -8805,6 +8901,9 @@
                 "name": "Esri World Imagery (Clarity) Beta"
             },
             "MAPNIK": {
+                "attribution": {
+                    "text": "© collaboratori OpenStreetMap, CC-BY-SA"
+                },
                 "description": "Il livello base di OpenStreetMap.",
                 "name": "OpenStreetMap (Standard)"
             },
@@ -8988,6 +9087,20 @@
                 "description": "GSI Kiban 2500 via finds.jp. Buono per la tracciatura ma un po’ vecchio.",
                 "name": "GSI KIBAN 2500 Giappone"
             },
+            "gothenburg-citymap": {
+                "attribution": {
+                    "text": "© comune di Göteborg, CC0"
+                },
+                "description": "La mappa della città è una mappa panoramica che descrive Göteborg. Contiene informazioni generali su terreni, comunicazioni, idrografia, edifici, nomi di strada e numeri civici, divisione amministrativa e altro testo di orientamento.",
+                "name": "Mappa della città di Göteborg"
+            },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© comune di Göteborg, CC0"
+                },
+                "description": "Ortofoto del comune di Göteborg",
+                "name": "Ortofoto di Göteborg"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI del Giappone"
@@ -9155,6 +9268,12 @@
                 },
                 "name": "Thunderforest Landscape"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Mappe © Thunderforest, Data © OpenStreetMap contributors"
+                },
+                "name": "Thunderforest Outdoors"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -9196,6 +9315,12 @@
                 },
                 "description": "Rete stradale NVDB svedese con diverse opzioni per gli strati della mappa",
                 "name": "Opzioni della rete stradale di Trafikverket"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Comune di Breslavia"
+                },
+                "name": "Breslavia: mappe ortofoto 2018 (immagini aeree)"
             }
         },
         "community": {

vendor/assets/iD/iD/locales/ja.json

@@ -590,7 +590,7 @@
             "request_review": "編集のレビューを希望します。",
             "save": "アップロード",
             "cancel": "キャンセル",
-            "changes": "{count} 個の変更",
+            "changes": "変更 ({count})",
             "download_changes": "osmChangeファイルをダウンロード",
             "errors": "エラー",
             "warnings": "注意",
@@ -678,20 +678,19 @@
             "no_results_worldwide": "検索結果がありません"
         },
         "geolocate": {
+            "key": "L",
             "title": "編集画面を現在地へ移動",
-            "locating": "位置情報を取得中です。しばらくお待ちください。"
+            "locating": "位置情報を取得中です。しばらくお待ちください。",
+            "location_unavailable": "あなたの現在地情報が取得できません"
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "ここにズーム",
-                "tooltip_feature": "マップを中央寄せ・ズームしてこの地物にフォーカス。",
-                "tooltip_note": "マップを中央寄せ・ズームしてこのメモにフォーカス。",
-                "tooltip_data": "マップを中央寄せ・ズームしてこのデータにフォーカス。",
-                "tooltip_issue": "マップを中央寄せ・ズームしてこの課題にフォーカス。"
+                "title": "ズームして選択"
             },
             "show_more": "次を表示",
             "view_on_osm": "openstreetmap.orgで確認",
+            "view_on_osmose": "osmose.openstreetmap.fr で見る",
             "view_on_keepRight": "keepright.at 上で閲覧",
             "feature_type": "地物の種類",
             "fields": "すべての項目",
@@ -1048,14 +1047,19 @@
         },
         "cannot_zoom": "現在のモードでは、これ以上ズームアウトできません。",
         "full_screen": "フルスクリーンにする",
+        "self_intersection": {
+            "error": {
+                "lines": "ラインは自身と交差できません。",
+                "areas": "エリアは自身と交差できません。"
+            }
+        },
         "QA": {
             "osmose": {
                 "title": "Osmose の改善提案",
                 "detail_title": "詳細",
                 "elems_title": "地物",
                 "fix_title": "修正ガイドライン",
-                "trap_title": "よくある間違い",
-                "translation": "Osmose による翻訳"
+                "trap_title": "よくある間違い"
             },
             "improveOSM": {
                 "title": "ImproveOSM 検知内容",
@@ -1514,8 +1518,7 @@
                 "before_start_h": "始める前に",
                 "before_start": "編集を始める前に、少しOpenStreetMapとこのエディタに慣れたほうが良いでしょう。iDにはウォークスルーがあり、OpenStreetMap編集の基礎を教えてくれます。この画面にある「チュートリアルを開始」をクリックしてチュートリアルで学んでください - 15分ほどで終わります。",
                 "open_source_h": "オープンソース",
-                "open_source": "iDエディタは共同作業のオープンソースプロジェクトであり、現在のバージョンは{version} です。ソースコードは[GitHub上](https://github.com/openstreetmap/iD)にあります。",
-                "open_source_help": "あなたも[翻訳](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)したり[バグ報告](https://github.com/openstreetmap/iD/issues)したりすることでiDを支援できます。"
+                "open_source": "iDエディタは共同作業のオープンソースプロジェクトであり、現在のバージョンは{version} です。ソースコードは[GitHub上](https://github.com/openstreetmap/iD)にあります。"
             },
             "overview": {
                 "title": "概要",
@@ -2434,7 +2437,8 @@
                     "pan": "マップを動かす",
                     "pan_more": "マップを1画面分動かす",
                     "zoom": "拡大/縮小",
-                    "zoom_more": "ロット単位でズームイン/ズームアウト"
+                    "zoom_more": "ロット単位でズームイン/ズームアウト",
+                    "geolocate": "現在地にズーム"
                 },
                 "help": {
                     "title": "ヘルプ",
@@ -2964,7 +2968,13 @@
                     "terms": "通行料金, 料金"
                 },
                 "check_date": {
-                    "label": "最終確認日"
+                    "label": "最終確認日",
+                    "placeholder": "YYYY-MM-DD"
+                },
+                "circumference": {
+                    "label": "円周",
+                    "placeholder": "1 m, 20 cm, 30 in…",
+                    "terms": "円周, 外周, 周囲"
                 },
                 "clothes": {
                     "label": "服"
@@ -3131,6 +3141,9 @@
                         "yes": "あり"
                     }
                 },
+                "depth": {
+                    "label": "深さ (メートル)"
+                },
                 "description": {
                     "label": "説明",
                     "terms": "説明, 概要, サマリー"
@@ -3264,10 +3277,6 @@
                     "placeholder": "架線、集電レール...",
                     "terms": "電化"
                 },
-                "elevation": {
-                    "label": "標高",
-                    "terms": "高度"
-                },
                 "email": {
                     "label": "メールアドレス",
                     "placeholder": "example@example.com",
@@ -3559,7 +3568,7 @@
                     "label": "間欠性"
                 },
                 "internet_access": {
-                    "label": "インターネット環境",
+                    "label": "インターネット接続",
                     "options": {
                         "no": "無し",
                         "terminal": "情報端末",
@@ -3567,11 +3576,10 @@
                         "wlan": "Wi-Fi",
                         "yes": "有り"
                     },
-                    "terms": "インターネット, ネット, アクセスポイント"
+                    "terms": "インターネット, ネット, アクセスポイント, インターネット接続, wifi"
                 },
                 "internet_access/fee": {
-                    "label": "インターネット接続利用料金",
-                    "terms": "インターネットアクセス料金, アクセス料金, 使用料, 料金"
+                    "label": "インターネット接続利用料金"
                 },
                 "internet_access/ssid": {
                     "label": "SSID (Wifiネットワーク名)",
@@ -3836,8 +3844,7 @@
                     "terms": "ネットワーク"
                 },
                 "network/type": {
-                    "label": "ネットワークの種類",
-                    "terms": "ネットワークの種類, ネットワーク"
+                    "label": "ネットワークの種類"
                 },
                 "network_bicycle": {
                     "label": "ネットワーク",
@@ -3912,7 +3919,8 @@
                     "terms": "焚き火可否, 焚き火, キャンプファイア, キャンプ"
                 },
                 "opening_date": {
-                    "label": "開始予定日"
+                    "label": "開始予定日",
+                    "placeholder": "YYYY-MM-DD"
                 },
                 "opening_hours": {
                     "label": "営業時間",
@@ -4509,6 +4517,7 @@
                 },
                 "start_date": {
                     "label": "供用開始日",
+                    "placeholder": "YYYY-MM-DD",
                     "terms": "開始日"
                 },
                 "step_count": {
@@ -4623,6 +4632,9 @@
                 "target": {
                     "label": "目標国"
                 },
+                "telecom/medium": {
+                    "label": "通信線の素材"
+                },
                 "tidal": {
                     "label": "潮間帯",
                     "terms": "潮間帯, 干潟"
@@ -4942,10 +4954,6 @@
                     "name": "ドラッグリフト",
                     "terms": "ドラッグリフト,牽引リフト"
                 },
-                "aerialway/gondola": {
-                    "name": "循環式ロープウェイ",
-                    "terms": "ゴンドラ, ロープウェイ, ロープウェー, ゴンドラリフト, 索道"
-                },
                 "aerialway/goods": {
                     "name": "貨物索道",
                     "terms": "貨物ロープウェイ"
@@ -5569,9 +5577,6 @@
                     "name": "リサイクルボックス",
                     "terms": "リサイクルボックス, リサイクルコンテナ, リサイクル箱, コンテナ, 公園, 廃棄物, 資源ごみ, 資源ゴミ, ゴミ, ごみ箱, 再生利用, リサイクル"
                 },
-                "amenity/register_office": {
-                    "name": "登記所"
-                },
                 "amenity/research_institute": {
                     "name": "研究所",
                     "terms": "研究所, 研究施設"
@@ -5660,9 +5665,6 @@
                     "name": "学校（代表点または敷地）",
                     "terms": "学校の敷地, 学校, 小学校, 中学校, 高校, 教育"
                 },
-                "amenity/scrapyard": {
-                    "name": "自動車解体場"
-                },
                 "amenity/shelter": {
                     "name": "シェルター全般（休憩所、避難所）",
                     "terms": "避難所, シェルター, 逃げ場, 雨宿り, 東屋, あずまや, 四阿, しあ, 休憩所, 屋根, アウトドア, 小屋, 保護施設"
@@ -5739,9 +5741,6 @@
                     "name": "映画スタジオ",
                     "terms": "映画スタジオ, フィルムスタジオ, スタジオ"
                 },
-                "amenity/swimming_pool": {
-                    "name": "遊泳プール（旧）"
-                },
                 "amenity/taxi": {
                     "name": "タクシー乗り場",
                     "terms": "タクシー乗り場, タクシー"
@@ -7202,10 +7201,6 @@
                 "landuse": {
                     "name": "土地利用関連"
                 },
-                "landuse/allotments": {
-                    "name": "市民農園",
-                    "terms": "市民菜園, 市民農園, コミュニティガーデン, ガーデン, 農業, 畑, 農園"
-                },
                 "landuse/aquaculture": {
                     "name": "養殖場（水域）",
                     "terms": "養殖場, 養魚場, いけす, 生簀"
@@ -7311,18 +7306,10 @@
                     "name": "海軍基地",
                     "terms": "海軍, 軍事基地"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "障害物コース",
-                    "terms": "障害物コース, アスレチックコース"
-                },
                 "landuse/military/range": {
                     "name": "軍事演習場",
                     "terms": "軍事演習場"
                 },
-                "landuse/military/training_area": {
-                    "name": "訓練場",
-                    "terms": "練習場, トレーニングエリア, 訓練場"
-                },
                 "landuse/orchard": {
                     "name": "果樹園",
                     "terms": "果樹園, 果物畑, リンゴ畑, ミカン畑, 農業, 樹木, 森林"
@@ -7688,26 +7675,14 @@
                     "name": "自転車競技場",
                     "terms": "自転車競技場, 自転車, 自転車トラック, 自転車レース場"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "自転車競技場",
-                    "terms": "自転車競技場, 自転車, 自転車トラック, 自転車レース場"
-                },
                 "leisure/track/horse_racing": {
                     "name": "競馬トラック",
                     "terms": "競馬トラック, 競馬場, 競馬, レース, トラック, 馬場, ギャンブル"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "競馬トラック",
-                    "terms": "競馬トラック, 競馬場, 競馬, レース, トラック, 馬場, ギャンブル"
-                },
                 "leisure/track/running": {
                     "name": "ランニングトラック",
                     "terms": "ランニングトラック, ランニング用周回走路, トラック, 周回走路, 競技トラック, スポーツ"
                 },
-                "leisure/track/running_point": {
-                    "name": "トラック（周回走路）",
-                    "terms": "ランニングトラック, ランニング用周回走路"
-                },
                 "leisure/water_park": {
                     "name": "ウォーターパーク",
                     "terms": "テーマパーク, 遊園地, プール, ウォーターパーク, 娯楽"
@@ -7787,10 +7762,6 @@
                     "name": "ガスタンク",
                     "terms": "ガスタンク"
                 },
-                "man_made/groyne": {
-                    "name": "水制",
-                    "terms": "水制, ケレップ水制, 防波堤, 突堤"
-                },
                 "man_made/lighthouse": {
                     "name": "灯台",
                     "terms": "灯台, ライトハウス"
@@ -8803,10 +8774,6 @@
                     "name": "休止線路",
                     "terms": "休止線路, 廃線"
                 },
-                "railway/funicular": {
-                    "name": "ケーブルカー",
-                    "terms": "ケーブルカー"
-                },
                 "railway/halt": {
                     "name": "鉄道駅（停留場）"
                 },
@@ -8814,37 +8781,13 @@
                     "name": "踏切 (車道)",
                     "terms": "踏切 (車道), 踏切"
                 },
-                "railway/light_rail": {
-                    "name": "ライトレール",
-                    "terms": "ライトレール, 軽便鉄道"
-                },
                 "railway/milestone": {
                     "name": "距離標(鉄道)",
                     "terms": "距離標, 距離, キロポスト, マイルストーン, 距離標識, 鉄道"
                 },
-                "railway/miniature": {
-                    "name": "ミニチュア鉄道",
-                    "terms": "ミニチュア鉄道"
-                },
-                "railway/monorail": {
-                    "name": "モノレール",
-                    "terms": "モノレール"
-                },
-                "railway/narrow_gauge": {
-                    "name": "ナローゲージ",
-                    "terms": "軽便鉄道, ナローゲージ, 線路, 特殊狭軌, 狭軌"
-                },
                 "railway/platform": {
                     "name": "鉄道プラットホーム"
                 },
-                "railway/rail": {
-                    "name": "線路",
-                    "terms": "線路"
-                },
-                "railway/rail/highspeed": {
-                    "name": "高速鉄道",
-                    "terms": "高速鉄道, 鉄道"
-                },
                 "railway/signal": {
                     "name": "鉄道信号機",
                     "terms": "鉄道信号機, 信号機, 信号"
@@ -8852,10 +8795,6 @@
                 "railway/station": {
                     "name": "鉄道駅"
                 },
-                "railway/subway": {
-                    "name": "地下鉄",
-                    "terms": "地下鉄, 線路"
-                },
                 "railway/subway_entrance": {
                     "name": "出入口（地下鉄）",
                     "terms": "地下鉄の出入口, 出入り口, 出入口, 地下鉄, 出口, 入口"
@@ -8868,10 +8807,6 @@
                     "name": "洗車機（鉄道用）",
                     "terms": "洗車機, 洗車"
                 },
-                "railway/tram": {
-                    "name": "路面電車",
-                    "terms": "路面電車, トラム, LRT"
-                },
                 "railway/tram_stop": {
                     "name": "トラム停車位置"
                 },
@@ -9180,9 +9115,6 @@
                     "name": "釣具店",
                     "terms": "釣具店, 釣り, 魚釣り, フィッシング, 釣り道具, スポーツ, ホビー"
                 },
-                "shop/fishmonger": {
-                    "name": "魚屋（非推奨）"
-                },
                 "shop/flooring": {
                     "name": "床用品店",
                     "terms": "床用品店, フロア, フローリング"
@@ -9207,9 +9139,6 @@
                     "name": "葬儀社",
                     "terms": "葬儀屋, 葬儀業"
                 },
-                "shop/furnace": {
-                    "name": "釜戸屋"
-                },
                 "shop/furniture": {
                     "name": "家具店",
                     "terms": "家具店, インテリア用品店"
@@ -10289,6 +10218,13 @@
                 "description": "The city map is an overview map that describes Gothenburg. It contains general information about land, communications, hydrography, buildings, address numbers and street names, administrative division and other orientation text.",
                 "name": "Gothenburg City map"
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© Gothenburg municipality, CC0"
+                },
+                "description": "Orthophoto for Gothenburg municipality",
+                "name": "Gothenburg Orthophoto"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "国土地理院 簡易空中写真"
@@ -10456,6 +10392,12 @@
                 },
                 "name": "Thunderforest Landscape"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"
+                },
+                "name": "Thunderforest アウトドア"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -10497,6 +10439,12 @@
                 },
                 "description": "Swedish NVDB road network with several options for map layers",
                 "name": "Trafikverket Road Network options"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Urząd Miasta Wrocław"
+                },
+                "name": "Wrocław: Orthophotomap 2018 (aerial image)"
             }
         },
         "community": {
@@ -10536,6 +10484,10 @@
                 "name": "OpenStreetMap Galicia Twitter",
                 "description": "Follow us on Twitter at {url}"
             },
+            "Galicia-Xeoinquedos-Twitter": {
+                "name": "Geoinquetos on Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
             "GeoPhilly": {
                 "name": "GeoPhilly",
                 "description": "Meetup for map enthusiasts in the Philadelphia area",
@@ -11011,6 +10963,10 @@
                 "name": "OpenStreetMap 日本メーリングリスト",
                 "description": "Talk-ja は日本コミュニティ向けの公式メーリングリストです"
             },
+            "OSM-japan-slack": {
+                "name": "OpenStreetMap日本のSlack",
+                "description": "OSM日本コミュニティ向けのSlack ワークスペース {signupUrl}"
+            },
             "OSM-japan-twitter": {
                 "name": "OpenStreetMap 日本のTwitter",
                 "description": "Twitterでのハッシュタグ: {url}"
@@ -11223,6 +11179,14 @@
                 "name": "OpenStreetMap Germany Matrix",
                 "description": "Join #osm-de:matrix.org at https://riot.im/app/#/room/%23osm-de:matrix.org"
             },
+            "de-mv-mailinglist": {
+                "name": "Mecklenburg-Vorpommern Mailing List",
+                "description": "This is the mailing list for the OSM community of Mecklenburg-Vorpommern"
+            },
+            "de-mv-twitter": {
+                "name": "OpenStreetMap Mecklenburg-Vorpommern Twitter",
+                "description": "Follow us on Twitter: {url}"
+            },
             "de-ostwestfalen-lippe-mailinglist": {
                 "name": "OWL Mailing List",
                 "description": "This is the mailing list for the Ostwestfalen-Lippe OSM community"
@@ -11328,6 +11292,18 @@
                 "name": "GeoGeeks Perth Meetup",
                 "description": "Perth-based meetup group for people interested in mapping, geospatial data, and open source. We'll be working on anything that involves a sense of place."
             },
+            "gr-forum": {
+                "name": "OpenStreetMap GR forum",
+                "description": "OpenStreetMap Greece web forum"
+            },
+            "gr-mailinglist": {
+                "name": "Talk-gr Mailing List",
+                "description": "Talk-gr is the official mailing list for the Greek OSM community"
+            },
+            "gr-matrix": {
+                "name": "OpenStreetMap Greece Matrix",
+                "description": "Join #osm-gr:matrix.org at https://riot.im/app/#/room/%23osm-gr:matrix.org"
+            },
             "guatemala-telegram": {
                 "name": "OSM Guatemala on Telegram",
                 "description": "OpenStreetMap Guatemala Telegram chat"
@@ -11336,6 +11312,10 @@
                 "name": "OpenStreetMap Croatia Facebook group",
                 "description": "OpenStreetMap Croatia Facebook group"
             },
+            "hr-forum": {
+                "name": "OSM Croaria Forum",
+                "description": "OpenStreetMap Croatia Forum"
+            },
             "hr-irc": {
                 "name": "OpenStreetMap Croatia on IRC",
                 "description": "Join #osm-hr on irc.freenode.org (port 6667)"
@@ -11344,6 +11324,10 @@
                 "name": "Talk-hr Mailing List",
                 "description": "Talk-hr mailing list"
             },
+            "hr-wiki": {
+                "name": "OpenStreetMap Wikiproject Croatia",
+                "description": "Wikiproject page for Croatia"
+            },
             "hu-facebook": {
                 "name": "OpenStreetMap HU on Facebook",
                 "description": "Mappers and OpenStreetMap Facebook in Hungary"
@@ -11574,6 +11558,10 @@
                 "name": "OpenStreetMap Ghana on Twitter",
                 "description": "Follow us on Twitter: {url}"
             },
+            "osm-hr": {
+                "name": "OpenStreetMap Croatia",
+                "description": "The platform for information on OpenStreetMap in Croatia"
+            },
             "osm-india-forum": {
                 "name": "OpenStreetMap India forum",
                 "description": "OpenStreetMap India web forum"
@@ -11737,6 +11725,10 @@
                 "name": "OpenStreetMap Freemap Slovensko on Twitter",
                 "description": "OpenStreetMap Freemap Slovensko on Twitter: {url}"
             },
+            "talk-africa": {
+                "name": "Talk-africa Mailing List",
+                "description": "Talk-africa is the official mailing list for the African OSM community."
+            },
             "talk-au": {
                 "name": "Talk-au Mailing List",
                 "description": "Place for Aussie mappers to chat"
@@ -11767,6 +11759,10 @@
                 "name": "Talk-nz Mailing List",
                 "description": "New Zealand's OSM community talk"
             },
+            "talk-tz": {
+                "name": "Talk-tz Mailing List",
+                "description": "Talk-tz is the official mailing list for the Tanzanian OSM community."
+            },
             "talk-za": {
                 "name": "Talk-za Mailing List",
                 "description": "Talk-za is the official mailing list for South African OSM community."

vendor/assets/iD/iD/locales/kn.json

@@ -284,7 +284,6 @@
             "request_review": "ಬೇರೆ ಯಾರಾದರೂ ನನ್ನ ಪರಿಷ್ಕರಣೆಯನ್ನು ಪುನರವಲೋಕಿಸಲು ಇಚ್ಛಿಸುತ್ತೇನೆ",
             "save": "ಅಂತರಜಾಲಕ್ಕೆ ರವಾನೆ ಮಾಡು ",
             "cancel": "ರದ್ದು ಮಾಡು",
-            "changes": "{count} ಬದಲಾವಣೆಗಳು",
             "download_changes": "osmChange ಅನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿರಿ",
             "warnings": "ಎಚ್ಚರಿಕೆಗಳು",
             "modified": "ಮಾರ್ಪಡಿಸು",
@@ -885,9 +884,6 @@
                     },
                     "placeholder": "ಸಂಪರ್ಕ ರೇಖೆ, ವಿದ್ಯುದೀಕರಿಸಿದ ರೈಲು "
                 },
-                "elevation": {
-                    "label": "ಎತ್ತರ"
-                },
                 "email": {
                     "label": "ಮಿಂಚಂಚೆ",
                     "placeholder": "example@example.com"
@@ -974,7 +970,6 @@
                     "label": "ವಿಧ"
                 },
                 "internet_access": {
-                    "label": "ಅಂತರ್ಜಾಲ ಸಂಪರ್ಕ",
                     "options": {
                         "no": "ಇಲ್ಲ",
                         "terminal": "‍ನಿಲ್ದಾಣ",
@@ -983,9 +978,6 @@
                         "yes": "ಹೌದು"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "‍‍ಅಂತರ್ಜಾಲ‍ ಬಳಕೆ ಶುಲ್ಕ‍"
-                },
                 "lamp_type": {
                     "label": "ವಿಧ"
                 },
@@ -1372,9 +1364,6 @@
                 "amenity/shelter": {
                     "name": "ಅಡೆ"
                 },
-                "amenity/swimming_pool": {
-                    "name": "ಈಜುಕೊಳ"
-                },
                 "amenity/taxi": {
                     "name": "‍ಕಾರು ನಿಲ್ಡಾಣ "
                 },

vendor/assets/iD/iD/locales/ko.json

@@ -473,7 +473,6 @@
             "request_review": "누군가가 제 수정을 리뷰하길 원합니다.",
             "save": "올리기",
             "cancel": "취소",
-            "changes": "{count}번 바뀜",
             "download_changes": "osmChange 파일 다운로드",
             "errors": "오류",
             "warnings": "경고",
@@ -566,8 +565,7 @@
         },
         "inspector": {
             "zoom_to": {
-                "key": "Z",
-                "title": "확대해서 보기"
+                "key": "Z"
             },
             "show_more": "더 보기",
             "view_on_osm": "openstreetmap.org에서 보기",
@@ -762,7 +760,6 @@
             "custom_background": {
                 "tooltip": "사용자 지정 배경 편집",
                 "header": "사용자 지정 배경 설정",
-                "instructions": "타일 URL 템플릿을 입력하세요. 올바른 토큰은 다음과 같습니다:\n Z/X/Y 타일 체계에 대해 {zoom} 또는 {z}, {x}, {y}\n 뒤집힌 TMS 스타일의 Y좌표용으로 {-y} 또는 {ty}\n 쿼드 타일 방식으로 {u}\n 다중 DNS 서버용으로 {switch:a,b,c}\n\n예시는 다음과 같습니다:\n{example}",
                 "template": {
                     "placeholder": "타일 URL 템플릿 입력"
                 }
@@ -864,10 +861,6 @@
             "on_wiki": "wiki.osm.org에 있는 {tag}",
             "used_with": "{type}로 사용됨"
         },
-        "zoom": {
-            "in": "확대",
-            "out": "축소"
-        },
         "cannot_zoom": "현재 모드에서 더 축소할 수 없습니다.",
         "full_screen": "전체 화면 전환",
         "QA": {
@@ -1173,8 +1166,7 @@
                 "before_start_h": "시작하기 전에",
                 "before_start": "편집을 시작하기 전에 OpenStreetMap과 이 편집기에 익숙해야 합니다. iD에는 OpenStreetMap 편집의 기본 사항을 알려주는 연습이 있습니다. 튜토리얼을 보려면 이 화면에서 \"연습 시작하기\"를 클릭하세요 - 약 15 분이 소요됩니다.",
                 "open_source_h": "오픈소스",
-                "open_source": "iD 편집기는 공동 작업 방식의 오픈 소스 프로젝트이며, 버전 {version}을 사용 중입니다. 소스 코드는 [GitHub에서](https://github.com/openstreetmap/iD) 이용할 수 있습니다.",
-                "open_source_help": "iD에 [번역](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) 또는 [버그 신고](https://github.com/openstreetmap/iD/issues)를 통해 도움을 줄 수 있습니다."
+                "open_source": "iD 편집기는 공동 작업 방식의 오픈 소스 프로젝트이며, 버전 {version}을 사용 중입니다. 소스 코드는 [GitHub에서](https://github.com/openstreetmap/iD) 이용할 수 있습니다."
             },
             "overview": {
                 "title": "개요",
@@ -2127,6 +2119,14 @@
                 "bin": {
                     "label": "쓰레기통"
                 },
+                "blind": {
+                    "label": "시각 장애인 접근",
+                    "options": {
+                        "limited": "제한적",
+                        "no": "불가능",
+                        "yes": "가능"
+                    }
+                },
                 "blood_components": {
                     "label": "혈액 성분",
                     "options": {
@@ -2218,7 +2218,12 @@
                     "label": "금액"
                 },
                 "check_date": {
-                    "label": "마지막으로 확인한 날짜"
+                    "label": "마지막으로 확인한 날짜",
+                    "placeholder": "YYYY-MM-DD"
+                },
+                "circumference": {
+                    "label": "둘레",
+                    "placeholder": "1 m, 20 cm, 30 in…"
                 },
                 "clothes": {
                     "label": "옷"
@@ -2344,7 +2349,8 @@
                     "label": "배달"
                 },
                 "denomination": {
-                    "label": "교단"
+                    "label": "교파",
+                    "terms": "종파"
                 },
                 "denotation": {
                     "label": "명시"
@@ -2358,6 +2364,9 @@
                         "yes": "있음"
                     }
                 },
+                "depth": {
+                    "label": "깊이(미터)"
+                },
                 "description": {
                     "label": "설명"
                 },
@@ -2445,6 +2454,9 @@
                         "yes": "허용됨"
                     }
                 },
+                "door_type": {
+                    "label": "유형"
+                },
                 "drive_through": {
                     "label": "드라이브스루"
                 },
@@ -2462,12 +2474,10 @@
                     },
                     "placeholder": "가공 전차선, 제3/제4궤조..."
                 },
-                "elevation": {
-                    "label": "고도"
-                },
                 "email": {
                     "label": "이메일",
-                    "placeholder": "example@example.com"
+                    "placeholder": "example@example.com",
+                    "terms": "전자 우편"
                 },
                 "embankment": {
                     "label": "유형",
@@ -2580,6 +2590,9 @@
                 "grape_variety": {
                     "label": "포도 품종"
                 },
+                "group_only": {
+                    "label": "단체 전용"
+                },
                 "guest_house": {
                     "label": "유형"
                 },
@@ -2676,6 +2689,9 @@
                 "indoor": {
                     "label": "실내"
                 },
+                "indoor_type": {
+                    "label": "유형"
+                },
                 "industrial": {
                     "label": "유형"
                 },
@@ -2692,7 +2708,6 @@
                     "label": "간헐적"
                 },
                 "internet_access": {
-                    "label": "인터넷 접속",
                     "options": {
                         "no": "아니오",
                         "terminal": "단말기",
@@ -2702,7 +2717,15 @@
                     }
                 },
                 "internet_access/fee": {
-                    "label": "인터넷 접속 요금"
+                    "options": {
+                        "customers": "고객 전용",
+                        "no": "무료",
+                        "yes": "유료"
+                    }
+                },
+                "internet_access/ssid": {
+                    "label": "Wi-Fi 네트워크 이름",
+                    "terms": "SSID"
                 },
                 "interval": {
                     "label": "배차 간격"
@@ -2801,6 +2824,9 @@
                 "manhole": {
                     "label": "유형"
                 },
+                "manufacturer": {
+                    "label": "제조사"
+                },
                 "map_size": {
                     "label": "적용범위"
                 },
@@ -2813,6 +2839,9 @@
                 "material": {
                     "label": "소재"
                 },
+                "max_age": {
+                    "label": "최대 연령"
+                },
                 "maxheight": {
                     "label": "최대 높이",
                     "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
@@ -2837,6 +2866,9 @@
                 "memorial": {
                     "label": "유형"
                 },
+                "min_age": {
+                    "label": "최소 연령"
+                },
                 "minspeed": {
                     "label": "최저 제한 속도",
                     "placeholder": "20, 30, 40..."
@@ -2880,6 +2912,9 @@
                     },
                     "placeholder": "0, 1, 2, 3..."
                 },
+                "museum": {
+                    "label": "유형"
+                },
                 "name": {
                     "label": "이름",
                     "placeholder": "일반 이름(있는 경우)"
@@ -2953,7 +2988,8 @@
                     }
                 },
                 "opening_date": {
-                    "label": "예상개업일"
+                    "label": "예상개업일",
+                    "placeholder": "YYYY-MM-DD"
                 },
                 "opening_hours": {
                     "label": "영업시간"
@@ -3122,6 +3158,9 @@
                 "ref_road_number": {
                     "label": "노선번호"
                 },
+                "ref_room_number": {
+                    "label": "방 번호"
+                },
                 "ref_route": {
                     "label": "노선번호"
                 },
@@ -3282,6 +3321,9 @@
                     },
                     "placeholder": "예, 아니오, 전용"
                 },
+                "segregated": {
+                    "label": "자전거-보행자 분리"
+                },
                 "self_service": {
                     "label": "셀프서비스"
                 },
@@ -3383,7 +3425,8 @@
                     "label": "스타"
                 },
                 "start_date": {
-                    "label": "시작 날짜"
+                    "label": "시작 날짜",
+                    "placeholder": "YYYY-MM-DD"
                 },
                 "step_count": {
                     "label": "계단 수"
@@ -3398,6 +3441,14 @@
                 "street_cabinet": {
                     "label": "유형"
                 },
+                "stroller": {
+                    "label": "유모차 접근",
+                    "options": {
+                        "limited": "제한적",
+                        "no": "불가능",
+                        "yes": "가능"
+                    }
+                },
                 "structure": {
                     "label": "구조물",
                     "options": {
@@ -3657,7 +3708,12 @@
                     "label": "유형"
                 },
                 "wheelchair": {
-                    "label": "휠체어 접근여부"
+                    "label": "휠체어 접근",
+                    "options": {
+                        "limited": "제한적",
+                        "no": "불가능",
+                        "yes": "가능"
+                    }
                 },
                 "wholesale": {
                     "label": "도매"
@@ -3668,6 +3724,9 @@
                 "wikidata": {
                     "label": "위키데이터"
                 },
+                "wikimedia_commons": {
+                    "label": "위키미디어 공용 페이지"
+                },
                 "wikipedia": {
                     "label": "위키백과"
                 },
@@ -3717,10 +3776,6 @@
                     "name": "드래그 리프트",
                     "terms": "드래그 리프트"
                 },
-                "aerialway/gondola": {
-                    "name": "곤돌라",
-                    "terms": "곤돌라"
-                },
                 "aerialway/goods": {
                     "name": "화물 항공로",
                     "terms": "화물 항공 운송"
@@ -3839,7 +3894,7 @@
                     "terms": "자전거 주차"
                 },
                 "amenity/bicycle_rental": {
-                    "name": "자전거 대여",
+                    "name": "자전거 대여소",
                     "terms": "자전거 대여소,자전거 렌탈"
                 },
                 "amenity/bicycle_repair_station": {
@@ -3866,8 +3921,8 @@
                     "terms": "비스트로,커피,차"
                 },
                 "amenity/car_rental": {
-                    "name": "자동차 대여",
-                    "terms": "자동차 대여소,자동차 렌탈"
+                    "name": "자동차 대여점",
+                    "terms": "렌터카"
                 },
                 "amenity/car_wash": {
                     "name": "세차장",
@@ -4139,6 +4194,9 @@
                 "amenity/place_of_worship/christian/jehovahs_witness": {
                     "name": "여호와의 증인 왕국회관"
                 },
+                "amenity/place_of_worship/christian/quaker": {
+                    "name": "퀘이커 친우회 모임 집"
+                },
                 "amenity/place_of_worship/hindu": {
                     "name": "힌두교 사원",
                     "terms": "만디르"
@@ -4220,9 +4278,6 @@
                 "amenity/recycling_container": {
                     "name": "재활용 용기"
                 },
-                "amenity/register_office": {
-                    "name": "등기소"
-                },
                 "amenity/research_institute": {
                     "name": "연구 기관 부지"
                 },
@@ -4231,60 +4286,76 @@
                     "terms": "레스토랑,식당"
                 },
                 "amenity/restaurant/american": {
-                    "name": "미국 음식점"
+                    "name": "미국 음식점",
+                    "terms": "미국 식당"
                 },
                 "amenity/restaurant/asian": {
-                    "name": "아시아 음식점"
+                    "name": "아시아 음식점",
+                    "terms": "아시아 식당"
                 },
                 "amenity/restaurant/chinese": {
                     "name": "중국 음식점",
-                    "terms": "중국집"
+                    "terms": "중국집,중식당"
                 },
                 "amenity/restaurant/french": {
-                    "name": "프랑스 음식점"
+                    "name": "프랑스 음식점",
+                    "terms": "프랑스 식당"
                 },
                 "amenity/restaurant/german": {
-                    "name": "독일 음식점"
+                    "name": "독일 음식점",
+                    "terms": "독일 식당"
                 },
                 "amenity/restaurant/greek": {
-                    "name": "그리스 음식점"
+                    "name": "그리스 음식점",
+                    "terms": "그리스 식당"
                 },
                 "amenity/restaurant/indian": {
-                    "name": "인도 음식점"
+                    "name": "인도 음식점",
+                    "terms": "인도 식당"
                 },
                 "amenity/restaurant/italian": {
-                    "name": "이탈리아 음식점"
+                    "name": "이탈리아 음식점",
+                    "terms": "이탈리아 식당"
                 },
                 "amenity/restaurant/japanese": {
-                    "name": "일본 음식점"
+                    "name": "일본 음식점",
+                    "terms": "일식당"
                 },
                 "amenity/restaurant/mexican": {
-                    "name": "멕시코 음식점"
+                    "name": "멕시코 음식점",
+                    "terms": "멕시코 식당"
                 },
                 "amenity/restaurant/noodle": {
                     "name": "국숫집",
-                    "terms": "면옥"
+                    "terms": "면옥,음식점,식당"
                 },
                 "amenity/restaurant/pizza": {
-                    "name": "피자 음식점"
+                    "name": "피자 음식점",
+                    "terms": "피자 식당"
                 },
                 "amenity/restaurant/seafood": {
-                    "name": "해산물 음식점"
+                    "name": "해산물 음식점",
+                    "terms": "해산물 식당"
                 },
                 "amenity/restaurant/steakhouse": {
-                    "name": "스테이크하우스"
+                    "name": "스테이크하우스",
+                    "terms": "음식점,식당"
                 },
                 "amenity/restaurant/sushi": {
-                    "name": "초밥 음식점"
+                    "name": "초밥 음식점",
+                    "terms": "초밥 식당"
                 },
                 "amenity/restaurant/thai": {
-                    "name": "태국 음식점"
+                    "name": "태국 음식점",
+                    "terms": "태국 식당"
                 },
                 "amenity/restaurant/turkish": {
-                    "name": "터키 음식점"
+                    "name": "터키 음식점",
+                    "terms": "터키 식당"
                 },
                 "amenity/restaurant/vietnamese": {
-                    "name": "베트남 음식점"
+                    "name": "베트남 음식점",
+                    "terms": "베트남 식당"
                 },
                 "amenity/sanitary_dump_station": {
                     "name": "RV 화장실 처리장",
@@ -4294,9 +4365,6 @@
                     "name": "학교 부지",
                     "terms": "학교 부지"
                 },
-                "amenity/scrapyard": {
-                    "name": "폐차장"
-                },
                 "amenity/shelter": {
                     "name": "대피소",
                     "terms": "대피소, 피난소"
@@ -4349,9 +4417,6 @@
                 "amenity/studio/video": {
                     "name": "영화 촬영실"
                 },
-                "amenity/swimming_pool": {
-                    "name": "수영장"
-                },
                 "amenity/taxi": {
                     "name": "택시 승차장",
                     "terms": "택시 정류장,택시 타는 곳"
@@ -4551,9 +4616,12 @@
                     "terms": "블럭"
                 },
                 "barrier/bollard": {
-                    "name": "보호 기둥",
+                    "name": "볼라드",
                     "terms": "보호 기둥"
                 },
+                "barrier/bollard_line": {
+                    "name": "볼라드 열"
+                },
                 "barrier/border_control": {
                     "name": "국경 통계",
                     "terms": "출입국 관리"
@@ -4598,6 +4666,9 @@
                     "name": "산 울타리",
                     "terms": "산울타리"
                 },
+                "barrier/height_restrictor": {
+                    "name": "높이 제한기"
+                },
                 "barrier/kerb": {
                     "name": "연석"
                 },
@@ -4885,6 +4956,9 @@
                 "craft/chimney_sweeper": {
                     "name": "굴뚝 청소부"
                 },
+                "craft/cleaning": {
+                    "name": "청소부"
+                },
                 "craft/clockmaker": {
                     "name": "시계공",
                     "terms": "시계 제작자"
@@ -4929,6 +5003,9 @@
                     "name": "절연체",
                     "terms": "절연체"
                 },
+                "craft/joiner": {
+                    "name": "소목장이"
+                },
                 "craft/key_cutter": {
                     "name": "열쇠 따는 사람",
                     "terms": "키 커터"
@@ -5032,6 +5109,9 @@
                 "demolished/building": {
                     "name": "최근 철거된 건물"
                 },
+                "disused/railway": {
+                    "name": "폐선된 철도 지물"
+                },
                 "embankment": {
                     "name": "둑"
                 },
@@ -5068,6 +5148,9 @@
                 "emergency/first_aid_kit": {
                     "name": "구급상자"
                 },
+                "emergency/landing_site": {
+                    "name": "비상 착륙 장소"
+                },
                 "emergency/life_ring": {
                     "name": "구명부환",
                     "terms": "구명부표"
@@ -5385,7 +5468,7 @@
                     "terms": "진입로"
                 },
                 "highway/service/emergency_access": {
-                    "name": "비상시 접근",
+                    "name": "비상 접근로",
                     "terms": "비상 액세스"
                 },
                 "highway/service/parking_aisle": {
@@ -5487,11 +5570,14 @@
                     "name": "영주 저택"
                 },
                 "historic/memorial": {
-                    "name": "기념관",
+                    "name": "기념물",
                     "terms": "기념관"
                 },
+                "historic/memorial/plaque": {
+                    "name": "기념 명판"
+                },
                 "historic/monument": {
-                    "name": "기념물",
+                    "name": "기념관",
                     "terms": "기념물"
                 },
                 "historic/ruins": {
@@ -5547,10 +5633,6 @@
                     "name": "교차로",
                     "terms": "삼거리,사거리,오거리"
                 },
-                "landuse/allotments": {
-                    "name": "텃밭",
-                    "terms": "텃밭"
-                },
                 "landuse/aquaculture": {
                     "name": "양식장",
                     "terms": "양어장,갑각류,조류,새우,굴"
@@ -5651,18 +5733,10 @@
                     "name": "해군 기지",
                     "terms": "해군 기지"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "장애물 코스",
-                    "terms": "장애물 코스"
-                },
                 "landuse/military/range": {
                     "name": "군사 범위",
                     "terms": "군사 지역"
                 },
-                "landuse/military/training_area": {
-                    "name": "훈련 구역",
-                    "terms": "훈련 지역"
-                },
                 "landuse/orchard": {
                     "name": "과수원",
                     "terms": "과일"
@@ -5708,6 +5782,9 @@
                     "name": "포도밭",
                     "terms": "포도원,포도주,와인"
                 },
+                "landuse/winter_sports": {
+                    "name": "동계 스포츠 지역"
+                },
                 "leisure/adult_gaming_centre": {
                     "name": "성인용 게임방",
                     "terms": "도박,노름,슬롯머신"
@@ -5750,6 +5827,9 @@
                 "leisure/escape_game": {
                     "name": "방탈출"
                 },
+                "leisure/firepit": {
+                    "name": "불구덩이"
+                },
                 "leisure/fishing": {
                     "name": "낚시터"
                 },
@@ -5926,6 +6006,10 @@
                     "name": "스포츠 센터 / 단지",
                     "terms": "스포츠 센터/복합 시설"
                 },
+                "leisure/sports_centre/climbing": {
+                    "name": "인공 암벽장",
+                    "terms": "클라이밍"
+                },
                 "leisure/sports_centre/swimming": {
                     "name": "수영장 시설",
                     "terms": "수영장 시설"
@@ -5945,22 +6029,13 @@
                 "leisure/track/cycling": {
                     "name": "자전거 경주로"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "자전거 경주로"
-                },
                 "leisure/track/horse_racing": {
                     "name": "경마 경주로"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "경마 경주로"
-                },
                 "leisure/track/running": {
                     "name": "육상 트랙",
                     "terms": "달리기,경주로"
                 },
-                "leisure/track/running_point": {
-                    "name": "육상 트랙"
-                },
                 "leisure/water_park": {
                     "name": "워터파크",
                     "terms": "물놀이장"
@@ -6025,10 +6100,6 @@
                     "name": "가스 계량기",
                     "terms": "가스 계량기"
                 },
-                "man_made/groyne": {
-                    "name": "작은 제방",
-                    "terms": "작은 제방"
-                },
                 "man_made/lighthouse": {
                     "name": "등대",
                     "terms": "등대"
@@ -6119,6 +6190,9 @@
                     "name": "조사/관측 지점",
                     "terms": "조사/관측 지점"
                 },
+                "man_made/torii": {
+                    "name": "도리이"
+                },
                 "man_made/tower": {
                     "name": "탑",
                     "terms": "타워"
@@ -6169,9 +6243,15 @@
                 "military/bunker": {
                     "name": "군용 벙커"
                 },
+                "military/checkpoint": {
+                    "name": "군사 검문소"
+                },
                 "military/nuclear_explosion_site": {
                     "name": "핵폭발 지역"
                 },
+                "military/office": {
+                    "name": "군사 사무소"
+                },
                 "military/trench": {
                     "name": "군용 참호"
                 },
@@ -6239,6 +6319,9 @@
                     "name": "산등성이",
                     "terms": "산등성이"
                 },
+                "natural/rock": {
+                    "name": "부착된 돌/바위"
+                },
                 "natural/saddle": {
                     "name": "안부",
                     "terms": "콜,고개,재,영"
@@ -6252,13 +6335,20 @@
                     "terms": "급사면"
                 },
                 "natural/scrub": {
-                    "name": "우거진 숲",
-                    "terms": "우거진 숲"
+                    "name": "관목림",
+                    "terms": "덤불"
+                },
+                "natural/shingle": {
+                    "name": "자갈밭",
+                    "terms": "조약돌"
                 },
                 "natural/spring": {
                     "name": "샘",
                     "terms": "샘"
                 },
+                "natural/stone": {
+                    "name": "부착되지 않은 돌/바위"
+                },
                 "natural/tree": {
                     "name": "나무",
                     "terms": "나무"
@@ -6585,11 +6675,16 @@
                 "power/generator/method/photovoltaic": {
                     "name": "태양 전지판"
                 },
+                "power/generator/source/hydro": {
+                    "name": "수력 발전기",
+                    "terms": "수력 터빈"
+                },
                 "power/generator/source/nuclear": {
                     "name": "원자로"
                 },
                 "power/generator/source/wind": {
-                    "name": "풍력 발전기"
+                    "name": "풍력 발전기",
+                    "terms": "풍력 터빈"
                 },
                 "power/line": {
                     "name": "송전선",
@@ -6615,6 +6710,9 @@
                 "power/plant/source/nuclear": {
                     "name": "원자력 발전소"
                 },
+                "power/plant/source/solar": {
+                    "name": "태양 발전소"
+                },
                 "power/plant/source/wind": {
                     "name": "풍력 발전소"
                 },
@@ -6809,10 +6907,6 @@
                     "name": "폐선된 철도",
                     "terms": "폐선된 철도"
                 },
-                "railway/funicular": {
-                    "name": "강삭 철도",
-                    "terms": "강삭 철도"
-                },
                 "railway/halt": {
                     "name": "기차역 (간이역)"
                 },
@@ -6820,45 +6914,18 @@
                     "name": "철도 건널목 (도로)",
                     "terms": "철도 건널목 (도로)"
                 },
-                "railway/light_rail": {
-                    "name": "경전철",
-                    "terms": "경전철,라이트 레일,트롤리"
-                },
                 "railway/milestone": {
                     "name": "철도 거리표"
                 },
-                "railway/miniature": {
-                    "name": "미니어처 철도",
-                    "terms": "장난감 철도,장난감 철로,미니어처 철로,장난감 기찻길"
-                },
-                "railway/monorail": {
-                    "name": "모노레일",
-                    "terms": "모노레일"
-                },
-                "railway/narrow_gauge": {
-                    "name": "협궤 철로",
-                    "terms": "협궤 철로"
-                },
                 "railway/platform": {
                     "name": "기차 승강장"
                 },
-                "railway/rail": {
-                    "name": "철로",
-                    "terms": "철도"
-                },
-                "railway/rail/highspeed": {
-                    "name": "고속 철도"
-                },
                 "railway/signal": {
                     "name": "철도신호"
                 },
                 "railway/station": {
                     "name": "기차역"
                 },
-                "railway/subway": {
-                    "name": "지하철",
-                    "terms": "지하철"
-                },
                 "railway/subway_entrance": {
                     "name": "지하철 입구",
                     "terms": "지하철역 입구"
@@ -6869,10 +6936,6 @@
                 "railway/train_wash": {
                     "name": "기차 차량 세척"
                 },
-                "railway/tram": {
-                    "name": "노면전차",
-                    "terms": "트램"
-                },
                 "railway/tram_stop": {
                     "name": "전차 정차 위치"
                 },
@@ -7058,6 +7121,10 @@
                     "name": "속옷 가게",
                     "terms": "속옷 상점"
                 },
+                "shop/clothes/wedding": {
+                    "name": "혼례복 가게",
+                    "terms": "웨딩드레스"
+                },
                 "shop/coffee": {
                     "name": "커피 가게",
                     "terms": "커피 전문점"
@@ -7082,6 +7149,9 @@
                     "name": "화장품 가게",
                     "terms": "화장품 상점"
                 },
+                "shop/craft": {
+                    "name": "미술 & 공예 가게"
+                },
                 "shop/curtain": {
                     "name": "커튼 가게",
                     "terms": "커튼 상점"
@@ -7114,6 +7184,9 @@
                     "name": "전자 담배 가게",
                     "terms": "전자 담배 상점"
                 },
+                "shop/electrical": {
+                    "name": "전기 기구 가게"
+                },
                 "shop/electronics": {
                     "name": "전자 제품 가게",
                     "terms": "기기,오디오,블루레이,카메라,사진기,컴퓨터,DVD,라디오,스피커,TV,텔레비전,비디오"
@@ -7149,8 +7222,8 @@
                     "name": "낚시 가게",
                     "terms": "낚시 상점"
                 },
-                "shop/fishmonger": {
-                    "name": "생선 가게"
+                "shop/flooring": {
+                    "name": "바닥재 가게"
                 },
                 "shop/florist": {
                     "name": "꽃 가게",
@@ -7160,10 +7233,6 @@
                     "name": "액자 가게",
                     "terms": "액자 상점"
                 },
-                "shop/frozen_food": {
-                    "name": "냉동식품 가게",
-                    "terms": "냉동식품 상점"
-                },
                 "shop/fuel": {
                     "name": "연료 가게",
                     "terms": "연료 상점"
@@ -7172,9 +7241,6 @@
                     "name": "장례식장",
                     "terms": "장의사"
                 },
-                "shop/furnace": {
-                    "name": "벽난로 가게"
-                },
                 "shop/furniture": {
                     "name": "가구점",
                     "terms": "의자,소파,식탁,탁자,책상"
@@ -7367,6 +7433,9 @@
                     "name": "프린터 잉크 가게",
                     "terms": "프린터 잉크 상점"
                 },
+                "shop/psychic": {
+                    "name": "초능력자"
+                },
                 "shop/pyrotechnics": {
                     "name": "불꽃놀이 가게",
                     "terms": "불꽃놀이 상점"
@@ -7449,6 +7518,9 @@
                     "name": "담배 가게",
                     "terms": "담배 판매업소"
                 },
+                "shop/tool_hire": {
+                    "name": "도구 대여점"
+                },
                 "shop/toys": {
                     "name": "완구점",
                     "terms": "장난감"
@@ -7550,12 +7622,15 @@
                     "name": "관광 명소"
                 },
                 "tourism/camp_pitch": {
-                    "name": "캠핑장"
+                    "name": "캠핑장 구역"
                 },
                 "tourism/camp_site": {
                     "name": "캠핑장",
                     "terms": "텐트,천막,RV"
                 },
+                "tourism/camp_site/group_only": {
+                    "name": "단체 캠핑장"
+                },
                 "tourism/caravan_site": {
                     "name": "RV 공원"
                 },
@@ -7778,6 +7853,9 @@
                     "name": "노면전차 노선",
                     "terms": "트램 노선"
                 },
+                "type/route/trolleybus": {
+                    "name": "트롤리버스 노선"
+                },
                 "type/route_master": {
                     "name": "노선 마스터",
                     "terms": "노선 마스터"

vendor/assets/iD/iD/locales/ku.json

@@ -99,10 +99,6 @@
         "save": {
             "title": "Qeyd bike"
         },
-        "zoom": {
-            "in": "Nêzîk bike",
-            "out": "Dûr bike"
-        },
         "help": {
             "title": "Alîkarî",
             "help": {

vendor/assets/iD/iD/locales/lt.json

@@ -393,7 +393,6 @@
             "request_review": "Aš norėčiau, kad kažkas patikrintų mano keitimus.",
             "save": "Įkelti",
             "cancel": "Atšaukti",
-            "changes": "{count} Pakeitimai",
             "download_changes": "Atsiųsti osmChange rinkmeną",
             "errors": "Klaidos",
             "warnings": "Įspėjimai",
@@ -480,8 +479,7 @@
         },
         "inspector": {
             "zoom_to": {
-                "key": "Z",
-                "title": "Priartinti prie šito"
+                "key": "Z"
             },
             "show_more": "Rodyti daugiau",
             "view_on_osm": "Žiūrėti svetainėje openstreetmap.org",
@@ -752,10 +750,6 @@
             "on_wiki": "{tag} svetainėje wiki.osm.org",
             "used_with": "naudojama su {type}"
         },
-        "zoom": {
-            "in": "Priartinti",
-            "out": "Atitolinti"
-        },
         "cannot_zoom": "Negalima atitolinti šiame režime.",
         "full_screen": "Perjungti pilną ekraną",
         "QA": {
@@ -1002,7 +996,8 @@
             },
             "outdated_tags": {
                 "title": "Nebegaliojančios Žymės",
-                "message": "{feature} turi nebegaliojančių žymių",
+                "message": "iD programuotojų, bet ne OpenStreetMap nuomone, {feature} turi nebegaliojančių žymių. Nieko nekeiskite!",
+                "reference": "iD programuotojai daro savo sprendimus dėl žymų nesitardami su OpenStreetMap bendruomene.",
                 "incomplete": {
                     "message": "{feature} turi neužbaigtų žymių"
                 }
@@ -1034,7 +1029,7 @@
                     "title": "Tęsti piešimą nuo pabaigos"
                 },
                 "ignore_issue": {
-                    "title": "Ignoruoti šią problemą"
+                    "title": "Viskas gerai su šiomis žymomis"
                 },
                 "merge_points": {
                     "title": "Sujungti šiuos taškus"
@@ -1050,6 +1045,9 @@
                 },
                 "tag_as_disconnected": {
                     "title": "Žymėti kaip atjungtą"
+                },
+                "upgrade_tags": {
+                    "title": "iD blogai veikia, NESPAUSKITE"
                 }
             }
         },
@@ -1823,9 +1821,6 @@
                     },
                     "placeholder": "Kontaktinė linija, elektrifikuoti bėgiai..."
                 },
-                "elevation": {
-                    "label": "Aukštis"
-                },
                 "email": {
                     "label": "El. paštas",
                     "placeholder": "pavyzdys@pavyzdys.lt"
@@ -2019,7 +2014,6 @@
                     "label": "Nepastovus"
                 },
                 "internet_access": {
-                    "label": "Interneto prieiga",
                     "options": {
                         "no": "Ne",
                         "terminal": "Terminalas",
@@ -2028,9 +2022,6 @@
                         "yes": "Taip"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Nemokama interneto prieiga"
-                },
                 "interval": {
                     "label": "Intervalas"
                 },
@@ -2925,10 +2916,6 @@
                     "name": "Funikulierius",
                     "terms": "funikulierius,keltuvas"
                 },
-                "aerialway/gondola": {
-                    "name": "Gondola",
-                    "terms": "Gondola"
-                },
                 "aeroway/aerodrome": {
                     "name": "Oro uostas",
                     "terms": "Oro uostas"
@@ -3164,9 +3151,6 @@
                 "amenity/recycling_centre": {
                     "name": "Rūšiavimo centras"
                 },
-                "amenity/register_office": {
-                    "name": "Registravimo biūras"
-                },
                 "amenity/restaurant": {
                     "name": "Restoranas",
                     "terms": "rastoranas"
@@ -3174,9 +3158,6 @@
                 "amenity/school": {
                     "name": "Mokyklos kiemas"
                 },
-                "amenity/scrapyard": {
-                    "name": "Metalo laužas"
-                },
                 "amenity/shelter": {
                     "name": "Pastogė",
                     "terms": "pastogė"
@@ -3199,9 +3180,6 @@
                     "name": "Studija",
                     "terms": "studija"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Baseinas"
-                },
                 "amenity/taxi": {
                     "name": "Taksi stendas",
                     "terms": "taksi aikštelė"
@@ -3803,9 +3781,6 @@
                     "name": "Jungtis",
                     "terms": "jungtis,sankryža"
                 },
-                "landuse/allotments": {
-                    "name": "Bendruomenės sodas"
-                },
                 "landuse/aquaculture": {
                     "name": "Akvakultūra"
                 },
@@ -4263,31 +4238,12 @@
                     "name": "Nebenaudojamas geležinkelis",
                     "terms": "nenaudojamas geležinkelis,nenaudojami bėgiai"
                 },
-                "railway/funicular": {
-                    "name": "Keltuvas",
-                    "terms": "Funikulierius"
-                },
                 "railway/level_crossing": {
                     "name": "Geležinkelio Pervaža (Kelias)"
                 },
-                "railway/monorail": {
-                    "name": "Vienbėgis geležinkelis"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Siaurukas",
-                    "terms": "siaurukas"
-                },
-                "railway/rail": {
-                    "name": "Gelžkelis",
-                    "terms": "geležinkelis,gelžkelis"
-                },
                 "railway/station": {
                     "name": "Traukinių stotis"
                 },
-                "railway/subway": {
-                    "name": "Metro",
-                    "terms": "metro"
-                },
                 "railway/subway_entrance": {
                     "name": "Metro įėjimas",
                     "terms": "įėjimas į metro"
@@ -4295,10 +4251,6 @@
                 "railway/train_wash": {
                     "name": "Traukinių plovykla"
                 },
-                "railway/tram": {
-                    "name": "Tramvajus",
-                    "terms": "tramvajus"
-                },
                 "relation": {
                     "name": "Ryšys",
                     "terms": "ryšys"
@@ -4445,9 +4397,6 @@
                 "shop/fashion": {
                     "name": "Mados parduotuvė"
                 },
-                "shop/fishmonger": {
-                    "name": "Žuvų pardavėjas"
-                },
                 "shop/florist": {
                     "name": "Gėlės"
                 },
@@ -4457,9 +4406,6 @@
                 "shop/funeral_directors": {
                     "name": "Laidojimo namai"
                 },
-                "shop/furnace": {
-                    "name": "Krosnių parduotuvė"
-                },
                 "shop/furniture": {
                     "name": "Baldų parduotuvė"
                 },

vendor/assets/iD/iD/locales/lv.json

@@ -297,7 +297,6 @@
             "request_review": "Es vēlos lai kāds pārbauda manus labojumus.",
             "save": "Augšupielādēt",
             "cancel": "Atcelt",
-            "changes": "{count} Izmaiņas",
             "download_changes": "Lejupielādēt osmChange failu",
             "warnings": "Brīdinājumi",
             "modified": "Mainīts",
@@ -578,10 +577,6 @@
             "on_wiki": "{tag} wiki.osm.org",
             "used_with": "izmantots kopā ar {type}"
         },
-        "zoom": {
-            "in": "Pietuvināt",
-            "out": "Attālināt"
-        },
         "streetside": {
             "tooltip": "Ielas līmeņa attēli no Microsoft",
             "view_on_bing": "Skatīt Bing kartēs",
@@ -635,8 +630,7 @@
                 "open_data_h": "Atvērti dati",
                 "before_start_h": "Pirms tu sāc",
                 "open_source_h": "Atvērta Pirmkoda",
-                "open_source": "iD redaktors ir kopienas atvērta koda projekts, un tu pašlaik izmanto versiju {version}. Pirmkods ir pieejams [GitHubā](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Tu vari palīdzēt iD [tulkojot](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) vai [ziņojot par kļūdām](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "iD redaktors ir kopienas atvērta koda projekts, un tu pašlaik izmanto versiju {version}. Pirmkods ir pieejams [GitHubā](https://github.com/openstreetmap/iD)."
             },
             "overview": {
                 "title": "Pārskats",
@@ -1222,9 +1216,6 @@
                     },
                     "placeholder": "Saskarsmē ar līniju, Elektrizēta Sliede..."
                 },
-                "elevation": {
-                    "label": "Augstums"
-                },
                 "email": {
                     "label": "E-Pasts",
                     "placeholder": "example@example.com"
@@ -1401,7 +1392,6 @@
                     "label": "Tips"
                 },
                 "internet_access": {
-                    "label": "Interneta piekļuve",
                     "options": {
                         "no": "Nē",
                         "terminal": "Termināls",
@@ -1410,9 +1400,6 @@
                         "yes": "Jā"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Interneta Piekļuves Maksa"
-                },
                 "kerb": {
                     "label": "Apmale"
                 },
@@ -2288,9 +2275,6 @@
                 "amenity/studio": {
                     "name": "Studija"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Peldbaseins"
-                },
                 "amenity/telephone": {
                     "name": "Telefons"
                 },
@@ -3170,24 +3154,9 @@
                 "railway/disused": {
                     "name": "Nelietots dzelzceļš"
                 },
-                "railway/miniature": {
-                    "name": "Miniātura dzelzceļš"
-                },
-                "railway/monorail": {
-                    "name": "Viensliežu vilciens"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Šaursliežu dzelzceļš"
-                },
-                "railway/rail": {
-                    "name": "Sliedes"
-                },
                 "railway/station": {
                     "name": "Vilcienu Stacija"
                 },
-                "railway/subway": {
-                    "name": "Metro"
-                },
                 "railway/subway_entrance": {
                     "name": "Metro ieeja"
                 },
@@ -3198,9 +3167,6 @@
                 "railway/train_wash": {
                     "name": "Vilcienu mazgātuve"
                 },
-                "railway/tram": {
-                    "name": "Tramvajs"
-                },
                 "relation": {
                     "name": "Relācija"
                 },

vendor/assets/iD/iD/locales/mg.json

@@ -321,7 +321,6 @@
             "request_review": "Tiako hisy hanamarina ny fanovana nataoko.",
             "save": "Handefa",
             "cancel": "Hanafoana",
-            "changes": "Fanovana {count}",
             "download_changes": "Haka ny rakitra osmChange",
             "warnings": "Fampitandremana",
             "modified": "Voaova",
@@ -579,10 +578,6 @@
             "on_wiki": "{tag} ao amin'ny wiki.osm.org",
             "used_with": "ampiasaina miaraka amin'ny {type}"
         },
-        "zoom": {
-            "in": "Hanakaiky",
-            "out": "Hanalavitra"
-        },
         "cannot_zoom": "Tsy afaka manalavitra noho izao intsony amin'ity maody ity.",
         "full_screen": "Hameno ny Efijery",
         "note": {
@@ -623,8 +618,7 @@
                 "before_start_h": "Alohan'ny hanombohanao",
                 "before_start": "Tokony ho efa mifankazatra ny OpenStreetMap sy ity éditeur ity ianao mialohan'ny hanaovanao fanovana. Misy fanoroana atolotr'i iD hampianarana anao ny fototra amin'ny fanovana an'i OpenStreetMap. Tsindrio eo amin'ny \"Hanomboka ny Fanoroana\" eto amin'ity efijery ity raha hanomboka hianatra - 15 minitra eo ho eo fotsiny ny halavan'ilay izy.",
                 "open_source_h": "Hanokatra Loharano",
-                "open_source": "Ny éditeur iD dia tetikasa ifarimbonana manana kaody misokatra, ary ny fivoahana faha-{version} ity ampiasainao ity. Ny loharanon'ny kaody dia azo alaina [ao amin'ny GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Afaka manampy ny iD ianao amin'ny alalan'ny [fandikàna](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) na [fitaterana tsy fetezana](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "Ny éditeur iD dia tetikasa ifarimbonana manana kaody misokatra, ary ny fivoahana faha-{version} ity ampiasainao ity. Ny loharanon'ny kaody dia azo alaina [ao amin'ny GitHub](https://github.com/openstreetmap/iD)."
             },
             "overview": {
                 "title": "Jery Ankapobeny",

vendor/assets/iD/iD/locales/mk.json

@@ -20,6 +20,14 @@
             "favorites": "Омилено",
             "add_feature": "Додај елемент"
         },
+        "title": {
+            "format": {
+                "context": "{base} — {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} — {context}"
+            },
+            "labeled_and_more": "{labeled} и уште {count}"
+        },
         "modes": {
             "add_feature": {
                 "title": "Додај елемент",
@@ -590,7 +598,7 @@
             "request_review": "Би сакал некој ди ми ги прегледа уредувањата.",
             "save": "Подигни",
             "cancel": "Откажи",
-            "changes": "{count} промени",
+            "changes": "Промени ({count})",
             "download_changes": "Преземи osmChange-податотека",
             "errors": "Грешки",
             "warnings": "Предупредувања",
@@ -678,20 +686,19 @@
             "no_results_worldwide": "Не најдов ништо"
         },
         "geolocate": {
+            "key": "L",
             "title": "Моја местоположба",
-            "locating": "Ве пронаоѓам. Почекајте..."
+            "locating": "Ве пронаоѓам. Почекајте...",
+            "location_unavailable": ".Вашата местоположба е недостапна."
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "Приближи го ова",
-                "tooltip_feature": "Сосредоточи и приближи го овој елемент.",
-                "tooltip_note": "Сосредоточи и приближи ја оваа белешка.",
-                "tooltip_data": "Сосредоточи и приближи го овој податок.",
-                "tooltip_issue": "Сосредоточи и приближи го овој проблем."
+                "title": "Приближи го избраното"
             },
             "show_more": "Повеќе",
             "view_on_osm": "Погл. на openstreetmap.org",
+            "view_on_osmose": "Погл. на osmose.openstreetmap.fr",
             "view_on_keepRight": "Погл. на keepright.at",
             "fields": "Полиња",
             "tags_count": "Ознаки ({count})",
@@ -1047,14 +1054,19 @@
         },
         "cannot_zoom": "Не можам повеќе да оддалечувам во тековниот режим.",
         "full_screen": "Дај/тргни полн екран",
+        "self_intersection": {
+            "error": {
+                "lines": "Линиите не може да се сечат сами со себе.",
+                "areas": "Подрачјата не може да се сечат сами со себе."
+            }
+        },
         "QA": {
             "osmose": {
                 "title": "Проблем на Osmose",
                 "detail_title": "Подробно",
                 "elems_title": "Елементи",
                 "fix_title": "Напатствија за поправање",
-                "trap_title": "Чести грешки",
-                "translation": "Преводи од Osmose"
+                "trap_title": "Чести грешки"
             },
             "improveOSM": {
                 "title": "Пронаоѓање со ImproveOSM",
@@ -1482,7 +1494,8 @@
                 "open_data_h": "Отворени податоци",
                 "before_start_h": "Пред да почнете",
                 "open_source_h": "Отворен код",
-                "open_source": "Уредникот iD е отворен соработен проект, а вие сега ја користите верзијата {version}. Изворниот код ќе го најдете на [on GitHub](https://github.com/openstreetmap/iD)."
+                "open_source": "Уредникот iD е отворен соработен проект, а вие сега ја користите верзијата {version}. Изворниот код ќе го најдете на [on GitHub](https://github.com/openstreetmap/iD).",
+                "open_source_help": "Можете да му помогнете на iD [преведувајќи](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) или [пријавувајќи грешки](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
                 "title": "Преглед",
@@ -1990,7 +2003,8 @@
                     "pan": "Поместете ја кратата",
                     "pan_more": "Поместете ја картата за еден екран",
                     "zoom": "Приближи / Оддалечи",
-                    "zoom_more": "Приближи / Оддалечи многу"
+                    "zoom_more": "Приближи / Оддалечи многу",
+                    "geolocate": "Приближи на мојата местоположба"
                 },
                 "help": {
                     "title": "Помош",
@@ -2449,6 +2463,9 @@
                 "bridge/support": {
                     "label": "Вид"
                 },
+                "bridge_combo": {
+                    "label": "Вид"
+                },
                 "building": {
                     "label": "Градба",
                     "terms": "[преведете со истозначници и сродни поими на „Градба“, одделени со запирки]"
@@ -2503,6 +2520,14 @@
                     "placeholder": "50, 100, 200...",
                     "terms": "[преведете со истозначници и сродни поими на „Приемност“, одделени со запирки]"
                 },
+                "capacity/disabled_parking": {
+                    "label": "Инвалидски места",
+                    "placeholder": "1, 2, 3..."
+                },
+                "capacity_parking": {
+                    "label": "Вкупно места",
+                    "placeholder": "10, 20, 30..."
+                },
                 "cash_in": {
                     "label": "Готовинска размена"
                 },
@@ -2523,7 +2548,13 @@
                     "terms": "[преведете со истозначници и сродни поими на „Вкупен износ“, одделени со запирки]"
                 },
                 "check_date": {
-                    "label": "Датум на последна проверка"
+                    "label": "Датум на последна проверка",
+                    "placeholder": "ГГГГ-ММ-ДД"
+                },
+                "circumference": {
+                    "label": "Обиколка",
+                    "placeholder": "1 м, 20 см, 30 ин…",
+                    "terms": "<преведете со истозначници или сродни поими на „Обиколка“, одделени со запирки>"
                 },
                 "clothes": {
                     "label": "Облека"
@@ -2690,6 +2721,9 @@
                         "yes": "Да"
                     }
                 },
+                "depth": {
+                    "label": "Длабочина (метри)"
+                },
                 "description": {
                     "label": "Опис",
                     "terms": "[преведете со истозначници и сродни поими на „Опис“, одделени со запирки]"
@@ -2773,11 +2807,15 @@
                     "label": "Приказ"
                 },
                 "distance": {
-                    "label": "Растојание"
+                    "label": "Растојание",
+                    "terms": "<преведете со истозначници или сродни поими на „Оддалеченост“, одделени со запирки>"
                 },
                 "disused/railway": {
                     "label": "Вид"
                 },
+                "disused/shop": {
+                    "label": "Вид"
+                },
                 "dock": {
                     "label": "Вид"
                 },
@@ -2812,6 +2850,14 @@
                     "placeholder": "00:00",
                     "terms": "[преведете со истозначници и сродни поими на „Времетраење“, одделени со запирки]"
                 },
+                "ele": {
+                    "label": "Надм. висина",
+                    "terms": "[преведете со истозначници и сродни поими на „Надм. висина“, одделени со запирки]"
+                },
+                "ele_node": {
+                    "label": "Надм. висина",
+                    "terms": "[преведете со истозначници и сродни поими на „Надм. висина“, одделени со запирки]"
+                },
                 "electrified": {
                     "label": "Електрификација",
                     "options": {
@@ -2823,10 +2869,6 @@
                     "placeholder": "Контактна шина, електрифицирана пруга...",
                     "terms": "<преведете со истозначници или сродни поими на „Електрификација“, одделени со запирки>"
                 },
-                "elevation": {
-                    "label": "Надм. висина",
-                    "terms": "[преведете со истозначници и сродни поими на „Надм. висина“, одделени со запирки]"
-                },
                 "email": {
                     "label": "Е-пошта",
                     "placeholder": "example@example.com",
@@ -2943,6 +2985,9 @@
                 "gambling": {
                     "label": "Игри"
                 },
+                "garden/type": {
+                    "label": "Вид градина"
+                },
                 "gauge": {
                     "label": "Колосек"
                 },
@@ -3124,7 +3169,7 @@
                     "label": "Нередовно"
                 },
                 "internet_access": {
-                    "label": "Семрежен пристап",
+                    "label": "Семрежна врска",
                     "options": {
                         "no": "Нема",
                         "terminal": "Јазол",
@@ -3132,11 +3177,16 @@
                         "wlan": "Безжичен",
                         "yes": "Да"
                     },
-                    "terms": "[преведете со истозначници и сродни поими на „Семрежен пристап“, одделени со запирки]"
+                    "terms": "[преведете со истозначници и сродни поими на „Семрежна врска“, одделени со запирки]"
                 },
                 "internet_access/fee": {
-                    "label": "Наплата за семрежјето",
-                    "terms": "[преведете со истозначници и сродни поими на „Наплата за семрежјето“, одделени со запирки]"
+                    "label": "Семрежен пристап",
+                    "options": {
+                        "customers": "Само за муштерии",
+                        "no": "Бесплатен",
+                        "yes": "Наплатен"
+                    },
+                    "terms": "[преведете со истозначници и сродни поими на „Семрежен пристап“, одделени со запирки]"
                 },
                 "internet_access/ssid": {
                     "label": "Назив на WiFi-мрежата",
@@ -3334,6 +3384,10 @@
                     "label": "Микропиварница",
                     "terms": "[преведете со истозначници и сродни поими на „Микропиварница“, одделени со запирки]"
                 },
+                "mimics": {
+                    "label": "Изигрува",
+                    "terms": "<преведете со истозначници или сродни поими на „Изигрува“, одделени со запирки>"
+                },
                 "min_age": {
                     "label": "Најмала возраст",
                     "terms": "<преведете со истозначници или сродни поими на „Најмала возраст“, одделени со запирки>"
@@ -3401,8 +3455,7 @@
                     "terms": "[преведете со истозначници и сродни поими на „Мрежа“, одделени со запирки]"
                 },
                 "network/type": {
-                    "label": "Вид мрежа",
-                    "terms": "[преведете со истозначници и сродни поими на „Вид мрежа“, одделени со запирки]"
+                    "label": "Вид мрежа"
                 },
                 "network_bicycle": {
                     "label": "Класа на мрежата",
@@ -3477,7 +3530,8 @@
                     "terms": "[преведете со истозначници или сродни поими на „Дозволени отворени огништа“, одделени со запирки]"
                 },
                 "opening_date": {
-                    "label": "Очекувано пуштање"
+                    "label": "Очекувано пуштање",
+                    "placeholder": "ГГГГ-ММ-ДД"
                 },
                 "opening_hours": {
                     "label": "Часови",
@@ -3515,6 +3569,9 @@
                         "underground": "Подземно"
                     }
                 },
+                "parking_space": {
+                    "label": "Вид"
+                },
                 "payment_multi": {
                     "label": "Видови плаќање",
                     "terms": "[преведете со истозначници и сродни поими на „Видови плаќање“, одделени со запирки]"
@@ -3655,6 +3712,10 @@
                 "playground/theme": {
                     "label": "Тема"
                 },
+                "plots": {
+                    "label": "Парцели",
+                    "placeholder": "10, 20, 30..."
+                },
                 "polling_station": {
                     "label": "Гласачко место",
                     "terms": "[преведете со истозначници и сродни поими на „Гласачко место“, одделени со запирки]"
@@ -4074,6 +4135,7 @@
                 },
                 "start_date": {
                     "label": "Почетен датум",
+                    "placeholder": "ГГГГ-ММ-ДД",
                     "terms": "[преведете со истозначници и сродни поими на „Почетен датум“, одделени со запирки]"
                 },
                 "step_count": {
@@ -4188,6 +4250,9 @@
                 "target": {
                     "label": "Цел"
                 },
+                "telecom/medium": {
+                    "label": "Медиум"
+                },
                 "tidal": {
                     "label": "Приливен",
                     "terms": "[преведете со истозначници и сродни поими на „Приливен“, одделени со запирки]"
@@ -4315,6 +4380,9 @@
                     "label": "Вид",
                     "placeholder": "По основно"
                 },
+                "tunnel_combo": {
+                    "label": "Вид"
+                },
                 "usage_rail": {
                     "label": "Вид употреба",
                     "options": {
@@ -4499,7 +4567,7 @@
                     "name": "Влечница"
                 },
                 "aerialway/gondola": {
-                    "name": "Гондола"
+                    "name": "Гондолна жичница"
                 },
                 "aerialway/goods": {
                     "name": "Товарна жичница"
@@ -4870,6 +4938,9 @@
                 "amenity/parking_space": {
                     "name": "Паркинг-место"
                 },
+                "amenity/parking_space/disabled": {
+                    "name": "Инвалидско паркинг-место"
+                },
                 "amenity/payment_centre": {
                     "name": "Платежно место"
                 },
@@ -4975,9 +5046,6 @@
                 "amenity/recycling_container": {
                     "name": "Рециклажен контејнер"
                 },
-                "amenity/register_office": {
-                    "name": "Матична служба"
-                },
                 "amenity/research_institute": {
                     "name": "Истражувачки институт"
                 },
@@ -5044,9 +5112,6 @@
                 "amenity/school": {
                     "name": "Училиштен двор"
                 },
-                "amenity/scrapyard": {
-                    "name": "Двор за отпад"
-                },
                 "amenity/shelter": {
                     "name": "Засолниште"
                 },
@@ -5104,9 +5169,6 @@
                 "amenity/studio/video": {
                     "name": "Филмско студио"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Базен"
-                },
                 "amenity/taxi": {
                     "name": "Такси-постојка"
                 },
@@ -5377,6 +5439,9 @@
                 "barrier/sally_port": {
                     "name": "Испадна порта"
                 },
+                "barrier/spikes": {
+                    "name": "бодликава пречка"
+                },
                 "barrier/stile": {
                     "name": "Оградни скалила"
                 },
@@ -5743,6 +5808,9 @@
                 "disused/railway": {
                     "name": "Неупотребуван железнички елемент"
                 },
+                "disused/shop": {
+                    "name": "Напуштена продавница"
+                },
                 "embankment": {
                     "name": "Кеј"
                 },
@@ -6234,7 +6302,7 @@
                     "name": "Елемент  за вид земјиште"
                 },
                 "landuse/allotments": {
-                    "name": "Заедничка градина"
+                    "name": "Бавчи"
                 },
                 "landuse/aquaculture": {
                     "name": "Рибник"
@@ -6318,13 +6386,13 @@
                     "name": "Поморска база"
                 },
                 "landuse/military/obstacle_course": {
-                    "name": "Вежбалиште со препреки"
+                    "name": "Воено вежбалиште со препреки"
                 },
                 "landuse/military/range": {
                     "name": "Воено стрелиште"
                 },
                 "landuse/military/training_area": {
-                    "name": "Воен полигон"
+                    "name": "Воено вежбалиште"
                 },
                 "landuse/orchard": {
                     "name": "Овоштарник"
@@ -6458,6 +6526,12 @@
                 "leisure/garden": {
                     "name": "Градина"
                 },
+                "leisure/garden/botanical": {
+                    "name": "Ботаничка градина"
+                },
+                "leisure/garden/community": {
+                    "name": "Заедничка градина"
+                },
                 "leisure/golf_course": {
                     "name": "Терен за голф"
                 },
@@ -6602,21 +6676,12 @@
                 "leisure/track/cycling": {
                     "name": "Велосипедска лента"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Велосипедска патека"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Коњотркачка лента"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Хиподромска патека"
-                },
                 "leisure/track/running": {
                     "name": "Патека за трчање"
                 },
-                "leisure/track/running_point": {
-                    "name": "Трчачка патека"
-                },
                 "leisure/water_park": {
                     "name": "Воден парк"
                 },
@@ -6678,7 +6743,7 @@
                     "name": "Гасомер"
                 },
                 "man_made/groyne": {
-                    "name": "Брежна препрека"
+                    "name": "Брегова препрека"
                 },
                 "man_made/lighthouse": {
                     "name": "Светилник"
@@ -6837,7 +6902,7 @@
                     "name": "Воен бункер"
                 },
                 "military/checkpoint": {
-                    "name": "Контролна точка"
+                    "name": "Воена контролна точка"
                 },
                 "military/nuclear_explosion_site": {
                     "name": "Место на атомска експлозија"
@@ -6917,6 +6982,9 @@
                 "natural/shingle": {
                     "name": "Чакал"
                 },
+                "natural/shrub": {
+                    "name": "Грмушки"
+                },
                 "natural/spring": {
                     "name": "Извор"
                 },
@@ -7253,6 +7321,9 @@
                 "power": {
                     "name": "Електродистрибутивен елемент"
                 },
+                "power/cable": {
+                    "name": "Струјоводен кабел"
+                },
                 "power/cable/underground": {
                     "name": "Подземен струјовод"
                 },
@@ -7461,7 +7532,7 @@
                     "name": "Неупотребувана пруга"
                 },
                 "railway/funicular": {
-                    "name": "Искачница"
+                    "name": "Искачничка пруга"
                 },
                 "railway/halt": {
                     "name": "Железничка станица (постојка / по барање)"
@@ -7470,28 +7541,34 @@
                     "name": "Премин преку пруга (пат)"
                 },
                 "railway/light_rail": {
-                    "name": "Лесна железница"
+                    "name": "Лесножелезничка пруга"
                 },
                 "railway/milestone": {
                     "name": "Железнички километражник"
                 },
                 "railway/miniature": {
-                    "name": "Минијатурна железница"
+                    "name": "Минијатурножелезничка пруга"
                 },
                 "railway/monorail": {
                     "name": "Едношинска пруга"
                 },
+                "railway/monorail/hanging": {
+                    "name": "Висечка едношина"
+                },
                 "railway/narrow_gauge": {
-                    "name": "Теснолинејка"
+                    "name": "Теснолиниска пруга"
                 },
                 "railway/platform": {
                     "name": "Железнички перон"
                 },
+                "railway/preserved": {
+                    "name": "Историска пруга"
+                },
                 "railway/rail": {
-                    "name": "Шини"
+                    "name": "Железничка пруга"
                 },
                 "railway/rail/highspeed": {
-                    "name": "Големобрзинска железница"
+                    "name": "Големобрзинска пруга"
                 },
                 "railway/signal": {
                     "name": "Железнички сигнал"
@@ -7500,7 +7577,7 @@
                     "name": "Железничка саница"
                 },
                 "railway/subway": {
-                    "name": "Подземна железница"
+                    "name": "Подземножелезничка пруга"
                 },
                 "railway/subway_entrance": {
                     "name": "Влез во подземна железница"
@@ -7512,7 +7589,7 @@
                     "name": "Железничка перална"
                 },
                 "railway/tram": {
-                    "name": "Трамвај"
+                    "name": "Трамвајска пруга"
                 },
                 "railway/tram_stop": {
                     "name": "Сопирна положба на трамвајот"
@@ -7748,9 +7825,6 @@
                 "shop/fishing": {
                     "name": "Риболовна продавница"
                 },
-                "shop/fishmonger": {
-                    "name": "Рибарница"
-                },
                 "shop/flooring": {
                     "name": "Продавница за подови"
                 },
@@ -7761,7 +7835,7 @@
                     "name": "Врамувачница"
                 },
                 "shop/frozen_food": {
-                    "name": "Замрзната храна"
+                    "name": "Продавница за замрзната храна"
                 },
                 "shop/fuel": {
                     "name": "Продавница за гориво"
@@ -7769,9 +7843,6 @@
                 "shop/funeral_directors": {
                     "name": "Погребално друштво"
                 },
-                "shop/furnace": {
-                    "name": "Продавница за печки"
-                },
                 "shop/furniture": {
                     "name": "Салон за мебел"
                 },
@@ -8055,6 +8126,9 @@
                 "telecom/data_center": {
                     "name": "Центар за податоци"
                 },
+                "telecom/exchange": {
+                    "name": "Телекомска централа"
+                },
                 "tourism": {
                     "name": "Туристички елемент"
                 },
@@ -8325,6 +8399,9 @@
                 "type/route/tram": {
                     "name": "Трамвајски патен правец"
                 },
+                "type/route/trolleybus": {
+                    "name": "Тролејбуски патен правец"
+                },
                 "type/route_master": {
                     "name": "Двокатен автобус"
                 },
@@ -8649,6 +8726,13 @@
                 "description": "Градската карта дава описен преглед на Гетеборг. Содржи општи информации а земјиштето, врските, хидрографијата, градбите, адресните броеви и имињата на улиците, управната поделба и друг текст за насочување.",
                 "name": "Градска карта на Гетеборг"
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© Општина Гетеборг, CC0"
+                },
+                "description": "Ортоснимки за Општина Гетеборг",
+                "name": "Гетеборшки ортоснимки"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI Јапонија"
@@ -8816,6 +8900,12 @@
                 },
                 "name": "Thunderforest Пределна"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Карти © Thunderforest, Податоци © учесници на OpenStreetMap"
+                },
+                "name": "Thunderforest Активности во природа"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Сообраќајна управа на Шведска, CC0"
@@ -8857,6 +8947,12 @@
                 },
                 "description": "Шведска железничка мрежа на NVDB со неколку можности за слоеви",
                 "name": "Можности за патната мрежа на Сообраќајната управа на Шведска"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Управа на Град Вроцлав"
+                },
+                "name": "Вроцлав: Ортофотокарта 2018 (воздушна снимка)"
             }
         },
         "community": {

vendor/assets/iD/iD/locales/ms.json

@@ -302,7 +302,6 @@
             "request_review": "Saya mahukan seseorang yang boleh memeriksa suntingan saya.",
             "save": "Muat naik",
             "cancel": "Batal",
-            "changes": "{count} Perubahan",
             "download_changes": "Muat turun fail osmChange",
             "errors": "Ralat-ralat",
             "warnings": "Amaran",
@@ -555,10 +554,6 @@
             "on_wiki": "{tag} pada wiki.osm.org",
             "used_with": "digunakan dengan {type}"
         },
-        "zoom": {
-            "in": "Zum dekat",
-            "out": "Zum jauh"
-        },
         "cannot_zoom": "Had zum jauh telah dicapai dalam mod yang sedang dipakai.",
         "full_screen": "Togol Skrin Penuh",
         "mapillary_images": {
@@ -1145,9 +1140,6 @@
                         "yes": "Ya (tidak ditentukan)"
                     }
                 },
-                "elevation": {
-                    "label": "Ketinggian"
-                },
                 "email": {
                     "label": "Emel",
                     "placeholder": "contoh@contoh.com"
@@ -1258,7 +1250,6 @@
                     "label": "Berjeda"
                 },
                 "internet_access": {
-                    "label": "Akses Internet",
                     "options": {
                         "no": "Tidak",
                         "terminal": "Terminal",
@@ -1267,9 +1258,6 @@
                         "yes": "Ya"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Bayaran Akses Internet"
-                },
                 "kerb": {
                     "label": "Sekatan"
                 },
@@ -1916,9 +1904,6 @@
                 "aerialway/cable_car": {
                     "name": "Kereta Kabel"
                 },
-                "aerialway/gondola": {
-                    "name": "Gondola"
-                },
                 "amenity/cafe": {
                     "name": "Kafe"
                 },
@@ -2001,9 +1986,6 @@
                 "amenity/recycling_centre": {
                     "name": "Pusat Kitar Semula"
                 },
-                "amenity/register_office": {
-                    "name": "Pejabat Pendaftar"
-                },
                 "amenity/restaurant": {
                     "name": "Restoran"
                 },
@@ -2013,9 +1995,6 @@
                 "amenity/studio": {
                     "name": "Studio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Kolam Renang"
-                },
                 "amenity/taxi": {
                     "name": "Tempat Menunggu Teksi"
                 },
@@ -2351,36 +2330,15 @@
                 "railway/disused": {
                     "name": "Jalan Kereta Api yang Tidak Diguna"
                 },
-                "railway/funicular": {
-                    "name": "Funikulus"
-                },
                 "railway/level_crossing": {
                     "name": "Lintasan Kereta Api (Jalan)"
                 },
-                "railway/light_rail": {
-                    "name": "Rel Ringan"
-                },
-                "railway/monorail": {
-                    "name": "Monorel"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Rel Landasan Sempit"
-                },
-                "railway/rail": {
-                    "name": "Kereta Api"
-                },
                 "railway/signal": {
                     "name": "Isyarat Kereta Api"
                 },
                 "railway/station": {
                     "name": "Stesen Kereta Api"
                 },
-                "railway/subway": {
-                    "name": "Kereta Api Bawah Tanah"
-                },
-                "railway/tram": {
-                    "name": "Tram"
-                },
                 "shop": {
                     "name": "Kedai"
                 },

vendor/assets/iD/iD/locales/my.json

@@ -1,7 +1,7 @@
 {
     "my": {
         "icons": {
-            "download": "ဒေါင်းလုဒ်လုပ်ရန်\n",
+            "download": "ဒေါင်းလုဒ်လုပ်ရန်",
             "information": "ပြန်ကြားမှုများ",
             "remove": "ဖျက်ရန်",
             "undo": "နောက်ပြန်ဆုတ်ရန်",

vendor/assets/iD/iD/locales/nn.json

@@ -75,7 +75,6 @@
         "commit": {
             "save": "Last opp",
             "cancel": "Avbryt",
-            "changes": "{count} endringar",
             "errors": "Feil",
             "warnings": "Åtvaringar",
             "modified": "Modifisert",
@@ -587,7 +586,6 @@
                     "label": "Innskrift"
                 },
                 "internet_access": {
-                    "label": "Internett-tilgang",
                     "options": {
                         "no": "Nei",
                         "terminal": "Terminal",
@@ -855,9 +853,6 @@
                 "attraction/carousel": {
                     "name": "Karusell"
                 },
-                "railway/tram": {
-                    "name": "Trikk"
-                },
                 "waterway/river": {
                     "name": "Elv"
                 }

vendor/assets/iD/iD/locales/pt-BR.json

@@ -20,6 +20,14 @@
             "favorites": "Favoritos",
             "add_feature": "Adicionar elemento"
         },
+        "title": {
+            "format": {
+                "context": "{base} – {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} – {context}"
+            },
+            "labeled_and_more": "{labeled} e {count} mais "
+        },
         "modes": {
             "add_feature": {
                 "title": "Adicionar um elemento",
@@ -590,7 +598,7 @@
             "request_review": "Eu gostaria que alguém revisasse minhas edições.",
             "save": "Enviar",
             "cancel": "Cancelar",
-            "changes": "{count} mudanças",
+            "changes": "Mudanças ({count})",
             "download_changes": "Dowload do arquivo osmChange",
             "errors": "Erros",
             "warnings": "Alertas",
@@ -678,20 +686,19 @@
             "no_results_worldwide": "Nenhum resultado encontrado"
         },
         "geolocate": {
+            "key": "L",
             "title": "Mostrar Minha Localização",
-            "locating": "Localizando, por favor, espere..."
+            "locating": "Localizando, por favor, espere...",
+            "location_unavailable": "Sua localização não está disponível."
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "Aproximar para",
-                "tooltip_feature": "Centralize e amplie o mapa para focar neste elemento.",
-                "tooltip_note": "Centralize e amplie o mapa para focar nesta nota.",
-                "tooltip_data": "Centralize e amplie o mapa para focar nestes dados.",
-                "tooltip_issue": "Centralize e amplie o mapa para focar este problema."
+                "title": "Zoom para seleção"
             },
             "show_more": "Mostrar Mais",
             "view_on_osm": "Ver no openstreetmap.org",
+            "view_on_osmose": "Ver no osmose.openstreetmap.fr",
             "view_on_keepRight": "Ver no keepright.at",
             "feature_type": "Tipo de recurso",
             "fields": "Campos",
@@ -925,7 +932,7 @@
             "custom_background": {
                 "tooltip": "Editar fundo de tela personalizado",
                 "header": "Configurações de fundo personalizadas",
-                "instructions": "Insira um modelo de URL de quadros. Tokens válidos são:\n   {zoom} ou {z}, {x}, {y} para o esquema Z/X/Y dos quadros\n   {-y} ou {ty} para coordenadas invertidas, estilo TMS\n   {u} para esquema quadtile\n   {switch:a,b,c} para multiplexação de servidor DNS\n\nExemplo:\n{example}",
+                "instructions": "Insira um modelo de URL de quadros. Tokens válidos são: {zoom} ou {z}, {x}, {y} para o esquema Z/X/Y dos quadros {-y} ou {ty} para coordenadas invertidas, estilo TMS {u} para esquema quadtile {switch:a,b,c} para multiplexação de servidor DNSExemplo:{example}",
                 "template": {
                     "placeholder": "Insira um modelo de URL"
                 }
@@ -1043,19 +1050,24 @@
             "used_with": "usado com {type}"
         },
         "zoom": {
-            "in": "Aproximar o zoom",
-            "out": "Afastar o zoom"
+            "in": "Aumentar o zoom",
+            "out": "Reduzir o zoom"
         },
         "cannot_zoom": "Não é possível afastar mais no modo atual.",
         "full_screen": "Alterar para Tela Cheia",
+        "self_intersection": {
+            "error": {
+                "lines": "As linhas não podem se cruzar.",
+                "areas": "Áreas não podem se cruzar."
+            }
+        },
         "QA": {
             "osmose": {
                 "title": "Problema Osmose ",
                 "detail_title": "Detalhes",
                 "elems_title": "Recursos",
                 "fix_title": "Diretrizes para correção",
-                "trap_title": "Erros comuns",
-                "translation": "Traduções fornecidas por Osmose"
+                "trap_title": "Erros comuns"
             },
             "improveOSM": {
                 "title": "Detecção do ImproveOSM",
@@ -1515,7 +1527,7 @@
                 "before_start": "Esteja familiarizado com o OpenStreetMap e este editor antes de começar a editar. O iD contém um tutorial para ensinar a você o básico da edição no OpenStreetMap. Clique em \"Comece o tutorial\" nesta tela para aprender - só leva cerca de 15 minutos.",
                 "open_source_h": "Código aberto",
                 "open_source": "O editor iD é um projeto colaborativo com código aberto, e você está usando a versão {version} . O código fonte está disponível [no GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Você pode ajudar [traduzindo](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) o ID ou [reportando erros](https://github.com/openstreetmap/iD/issues)."
+                "open_source_help": "Você pode ajudar [traduzindo](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) ou [reportando erros](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
                 "title": "Visão Geral",
@@ -2434,7 +2446,8 @@
                     "pan": "Mapa panôramico",
                     "pan_more": "Mover mapa por uma tela",
                     "zoom": "Aumentar/Diminuir ",
-                    "zoom_more": "Aumentar/Diminuir Bastante"
+                    "zoom_more": "Aumentar/Diminuir Bastante",
+                    "geolocate": "Zoom para a minha localização"
                 },
                 "help": {
                     "title": "Ajuda",
@@ -2891,6 +2904,9 @@
                 "bridge/support": {
                     "label": "Tipo"
                 },
+                "bridge_combo": {
+                    "label": "Tipo"
+                },
                 "building": {
                     "label": "Edifício",
                     "terms": "[traduzir com sinônimos ou termos relacionados para 'Construção', separados por vírgulas]"
@@ -2944,6 +2960,14 @@
                     "placeholder": "50, 100, 200...",
                     "terms": "[traduzir com sinônimos ou termos relacionados para 'Capacidade', separados por vírgulas]"
                 },
+                "capacity/disabled_parking": {
+                    "label": "Espaços acessíveis",
+                    "placeholder": "1, 2, 3..."
+                },
+                "capacity_parking": {
+                    "label": "Espaços totais",
+                    "placeholder": "10, 20, 30..."
+                },
                 "cash_in": {
                     "label": "Depósito"
                 },
@@ -2964,7 +2988,12 @@
                     "terms": "[traduzir com sinônimos ou termos relacionados para 'Valor do pedágio', separados por vírgulas]"
                 },
                 "check_date": {
-                    "label": "Última data de verificação"
+                    "label": "Última data de verificação",
+                    "placeholder": "AAAA-MM-DD"
+                },
+                "circumference": {
+                    "label": "Circunferência",
+                    "placeholder": "1 m, 20 cm, 30 na…"
                 },
                 "clothes": {
                     "label": "Roupas"
@@ -3130,6 +3159,9 @@
                         "yes": "SIm"
                     }
                 },
+                "depth": {
+                    "label": "Profundidade (metros)"
+                },
                 "description": {
                     "label": "Descrição",
                     "terms": "[traduza com sinônimos ou termos relacionados para 'Descrição', separados por vírgulas]"
@@ -3217,6 +3249,9 @@
                 "disused/railway": {
                     "label": "Tipo"
                 },
+                "disused/shop": {
+                    "label": "Tipo"
+                },
                 "dock": {
                     "label": "Tipo"
                 },
@@ -3250,6 +3285,12 @@
                     "placeholder": "00:00",
                     "terms": "[traduza com sinônimos ou termos relacionados para 'Duração', separados por vírgulas]"
                 },
+                "ele": {
+                    "label": "Elevação"
+                },
+                "ele_node": {
+                    "label": "Elevação"
+                },
                 "electrified": {
                     "label": "Eletrificação",
                     "options": {
@@ -3260,10 +3301,6 @@
                     },
                     "placeholder": "Linha de contato, trilho eletrificado..."
                 },
-                "elevation": {
-                    "label": "Altitude",
-                    "terms": "[traduza com sinônimos ou termos relacionados para 'Elevação', separados por vírgulas]"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "example@example.com",
@@ -3291,6 +3328,12 @@
                 "except": {
                     "label": "Exceções"
                 },
+                "expected_rcn_route_relations": {
+                    "label": "Nós de ciclismo adjacentes"
+                },
+                "expected_rwn_route_relations": {
+                    "label": "Nós de pedestres adjacentes"
+                },
                 "faces": {
                     "label": "Faces"
                 },
@@ -3374,6 +3417,9 @@
                 "gambling": {
                     "label": "Jogos"
                 },
+                "garden/type": {
+                    "label": "Tipo de jardim"
+                },
                 "gauge": {
                     "label": "Bitola"
                 },
@@ -3551,7 +3597,7 @@
                     "label": "Intermitente"
                 },
                 "internet_access": {
-                    "label": "Acesso à Internet",
+                    "label": "Conexão de internet",
                     "options": {
                         "no": "Não",
                         "terminal": "Terminal de Acesso",
@@ -3561,7 +3607,12 @@
                     }
                 },
                 "internet_access/fee": {
-                    "label": "Taxa para acesso à Internet"
+                    "label": "Acesso à internet",
+                    "options": {
+                        "customers": "Somente clientes",
+                        "no": "Grátis",
+                        "yes": "Pago"
+                    }
                 },
                 "internet_access/ssid": {
                     "label": "Nome da rede Wi-Fi"
@@ -3743,6 +3794,9 @@
                 "microbrewery": {
                     "label": "Microcervejaria"
                 },
+                "mimics": {
+                    "label": "Imita"
+                },
                 "min_age": {
                     "label": "Idade Mínima"
                 },
@@ -3803,8 +3857,7 @@
                     "label": "Rede"
                 },
                 "network/type": {
-                    "label": "Tipo de rede",
-                    "terms": "[traduza com sinônimos ou termos relacionados para 'Tipo de rede', separados por vírgulas]"
+                    "label": "Tipo de rede"
                 },
                 "network_bicycle": {
                     "label": "Classe de rede",
@@ -3876,7 +3929,8 @@
                     "label": "Lareiras Permitidas"
                 },
                 "opening_date": {
-                    "label": "Data de abertura esperada"
+                    "label": "Data de abertura esperada",
+                    "placeholder": "AAAA-MM-DD"
                 },
                 "opening_hours": {
                     "label": "Horário de funcionamento",
@@ -3910,6 +3964,9 @@
                         "underground": "Subterrâneo"
                     }
                 },
+                "parking_space": {
+                    "label": "Tipo"
+                },
                 "payment_multi": {
                     "label": "Tipos de Pagamento"
                 },
@@ -4047,6 +4104,10 @@
                 "playground/theme": {
                     "label": "Tema"
                 },
+                "plots": {
+                    "label": "Parcelas",
+                    "placeholder": "10, 20, 30..."
+                },
                 "polling_station": {
                     "label": "Local de votação"
                 },
@@ -4444,7 +4505,8 @@
                     "label": "Estrelas"
                 },
                 "start_date": {
-                    "label": "Data de Início"
+                    "label": "Data de Início",
+                    "placeholder": "AAAA-MM-DD"
                 },
                 "step_count": {
                     "label": "Número de Degraus"
@@ -4550,6 +4612,9 @@
                 "target": {
                     "label": "Alvo"
                 },
+                "telecom/medium": {
+                    "label": "Médio"
+                },
                 "tidal": {
                     "label": "Maré"
                 },
@@ -4670,6 +4735,9 @@
                     "label": "Tipo",
                     "placeholder": "Padrão"
                 },
+                "tunnel_combo": {
+                    "label": "Tipo"
+                },
                 "usage_rail": {
                     "label": "Tipo de Utilização",
                     "options": {
@@ -4859,8 +4927,8 @@
                     "terms": "T-bar, elevador de arrasto, teleféricos de superfície, J-bar"
                 },
                 "aerialway/gondola": {
-                    "name": "Gôndola",
-                    "terms": "Gôndola, Bondinho"
+                    "name": "Telecabine",
+                    "terms": "Telecabine"
                 },
                 "aerialway/goods": {
                     "name": "Teleférico de transporte de mercadorias",
@@ -5262,6 +5330,10 @@
                     "name": "Educação infantil",
                     "terms": "Educação infantil"
                 },
+                "amenity/kneipp_water_cure": {
+                    "name": "Cura da água do Kneipp ",
+                    "terms": "Cura da água do Kneipp"
+                },
                 "amenity/language_school": {
                     "name": "Escola de idiomas",
                     "terms": "Escola de idiomas"
@@ -5340,6 +5412,10 @@
                     "name": "Vaga de Estacionamento",
                     "terms": "Estacionamento, Vaga, Carro, espaço de estacionamento"
                 },
+                "amenity/parking_space/disabled": {
+                    "name": "Estacionamento acessível",
+                    "terms": "Estacionamento acessível"
+                },
                 "amenity/payment_centre": {
                     "name": "Centro de pagamento",
                     "terms": "Centro de pagamento"
@@ -5479,9 +5555,6 @@
                     "name": "Container para Reciclagem",
                     "terms": "reciclagem, lixo, lixeira, lata de reciclagem, lata de lixo, dejetos, resíduos, material reciclável"
                 },
-                "amenity/register_office": {
-                    "name": "Cartório"
-                },
                 "amenity/research_institute": {
                     "name": "Área do Instituto de Pesquisa",
                     "terms": "Área do Instituto de Pesquisa"
@@ -5570,9 +5643,6 @@
                     "name": "Escola",
                     "terms": "área escolar, terreno escolar, pátio escolar, colégio, ensino fundamental, ensino médio, educação, instituição de ensino"
                 },
-                "amenity/scrapyard": {
-                    "name": "Ferro Velho"
-                },
                 "amenity/shelter": {
                     "name": "Abrigo contra Intempéries",
                     "terms": "abrigo contra intempéries, abrigo, proteção da chuva"
@@ -5648,9 +5718,6 @@
                     "name": "Estúdio de filmagem",
                     "terms": "Estúdio de filmagem"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Piscina"
-                },
                 "amenity/taxi": {
                     "name": "Ponto de Táxi",
                     "terms": "táxi, cooperativa"
@@ -5861,6 +5928,13 @@
                     "name": "Trem Fantasma",
                     "terms": "brinquedo, parque de diversões, terror, medo"
                 },
+                "attraction/drop_tower": {
+                    "name": "Torre de Queda Livre",
+                    "terms": "1"
+                },
+                "attraction/kiddie_ride": {
+                    "name": "Kiddie Ride"
+                },
                 "attraction/log_flume": {
                     "name": "Troco flutuante",
                     "terms": "Troco flutuante"
@@ -5873,6 +5947,10 @@
                     "name": "Passeio de navio pirata",
                     "terms": "Passeio de navio pirata"
                 },
+                "attraction/river_rafting": {
+                    "name": "Passeio pelas corredeiras do rio",
+                    "terms": "Passeio pelas corredeiras do rio"
+                },
                 "attraction/roller_coaster": {
                     "name": "Montanha Russa",
                     "terms": "brinquedo, trem, trilhos, parque de diversão, parque de diversões, parque temático, aventura"
@@ -5996,10 +6074,18 @@
                     "name": "Portão de fortaleza",
                     "terms": "sally port, portão de fortaleza, porta de fortaleza, porta falsa, portão de castelo, porta de castelo,portão do castelo, porta do castelo, entrada do castelo"
                 },
+                "barrier/spikes": {
+                    "name": "Faixa de espigão",
+                    "terms": "Faixa de espigão, Espigões de trânsito, Picador de pneus,Ferrões, Ferrão, Dispositivo de esvaziamento de pneus"
+                },
                 "barrier/stile": {
                     "name": "Travessia em Cerca/Muro",
                     "terms": "Passagem Fixa por Barreira"
                 },
+                "barrier/swing_gate": {
+                    "name": "Balanço de portão",
+                    "terms": "Balanço de portão"
+                },
                 "barrier/toll_booth": {
                     "name": "Cabine de Pedágio",
                     "terms": "Pedágio"
@@ -6469,6 +6555,9 @@
                 "disused/railway": {
                     "name": "Recurso ferroviário em desuso"
                 },
+                "disused/shop": {
+                    "name": "Loja em desuso"
+                },
                 "embankment": {
                     "name": "Aterro Elevado"
                 },
@@ -6734,6 +6823,10 @@
                 "highway/cycleway/crossing": {
                     "name": "Cruzamento de Ciclo"
                 },
+                "highway/cycleway/crossing/bicycle_foot": {
+                    "name": "Ciclovia e Cruzamento do pedestres",
+                    "terms": "Ciclovia e Cruzamento do pedestres"
+                },
                 "highway/cycleway/crossing/marked": {
                     "name": "Travessia de ciclo marcado",
                     "terms": "Travessia de ciclo marcado"
@@ -6827,6 +6920,10 @@
                     "name": "Caminho Informal",
                     "terms": "trilha, caminho, caminhada"
                 },
+                "highway/path/boardwalk": {
+                    "name": "Calçadão",
+                    "terms": "Calçadão"
+                },
                 "highway/path/informal": {
                     "name": "Caminho Informal",
                     "terms": "Caminho Informal"
@@ -7096,8 +7193,8 @@
                     "name": "Recurso de uso da terra"
                 },
                 "landuse/allotments": {
-                    "name": "Horta Urbana",
-                    "terms": "Horta comunitária, jardim comunitário, pomar comunitário"
+                    "name": "Loteamentos de jardim",
+                    "terms": "Loteamentos de jardim"
                 },
                 "landuse/aquaculture": {
                     "name": "Aquicultura",
@@ -7205,15 +7302,15 @@
                     "terms": "Base Naval, Base da Marinha"
                 },
                 "landuse/military/obstacle_course": {
-                    "name": "Percurso de Obstáculos",
-                    "terms": "Pista de Obstáculos"
+                    "name": "Curso de obstáculo militar",
+                    "terms": "Curso de obstáculo militar"
                 },
                 "landuse/military/range": {
                     "name": "Estande de Tiro Militar",
                     "terms": "Tiro Militar, Estande Militar"
                 },
                 "landuse/military/training_area": {
-                    "name": "Área de Treinamento",
+                    "name": "Área de treinamento militar",
                     "terms": "área de treino, CT, campo de treinamento, treinamento militar, armas, tiro, guerra, aeronáutica, força aérea, exército, marinha"
                 },
                 "landuse/orchard": {
@@ -7389,6 +7486,14 @@
                     "name": "Jardim / Horta",
                     "terms": "Jardim, plantas, horta, vegetais, flores"
                 },
+                "leisure/garden/botanical": {
+                    "name": "Jardim Botânico",
+                    "terms": "Jardim botânico"
+                },
+                "leisure/garden/community": {
+                    "name": "Jardim Comunitário",
+                    "terms": "Horta comunitária"
+                },
                 "leisure/golf_course": {
                     "name": "Campo de Golfe",
                     "terms": "Campo de Golfe, golfe"
@@ -7581,26 +7686,14 @@
                     "name": "Trilha de ciclismo",
                     "terms": "Trilha de ciclismo"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Pista de Ciclismo",
-                    "terms": "Trilha de ciclismo"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Corrida de Cavalos",
                     "terms": "Corrida de Cavalos"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Pista de Corrida de Cavalos",
-                    "terms": "Corrida de Cavalos"
-                },
                 "leisure/track/running": {
                     "name": "Pista de Atletismo",
                     "terms": "Pista de Corrida"
                 },
-                "leisure/track/running_point": {
-                    "name": "Pista de Corrida",
-                    "terms": "Pista de Corrida"
-                },
                 "leisure/water_park": {
                     "name": "Parque Aquático",
                     "terms": "Parque de Diversões, Piscina, Centro Aquático"
@@ -7681,7 +7774,7 @@
                     "terms": "Reservatório de Gás, Gás, Combustível"
                 },
                 "man_made/groyne": {
-                    "name": "Barreira de Sedimentos",
+                    "name": "Estacada",
                     "terms": "Estacada, Barreira contra deslizamentos, Relevo"
                 },
                 "man_made/lighthouse": {
@@ -7893,8 +7986,8 @@
                     "terms": "Bunker Militar"
                 },
                 "military/checkpoint": {
-                    "name": "Ponto de verificação",
-                    "terms": "Ponto de verificação"
+                    "name": "Posto de controle militar",
+                    "terms": "Posto de controle militar"
                 },
                 "military/nuclear_explosion_site": {
                     "name": "Local de explosão nuclear",
@@ -7999,6 +8092,10 @@
                     "name": "Telha",
                     "terms": "Telha"
                 },
+                "natural/shrub": {
+                    "name": "Arbusto",
+                    "terms": "Arbusto"
+                },
                 "natural/spring": {
                     "name": "Nascente",
                     "terms": "Rio, Riacho, água"
@@ -8271,6 +8368,14 @@
                     "name": "Escritório de Companhia de Água",
                     "terms": "águas e esgoto"
                 },
+                "piste/downhill": {
+                    "name": "Pista de esqui alpino",
+                    "terms": "Pista de esqui alpino"
+                },
+                "piste/downhill/halfpipe": {
+                    "name": "Meia-tubulação para esportes de neve",
+                    "terms": "Meia-tubulação para esportes de neve"
+                },
                 "piste/hike": {
                     "name": "Trilhas para raquetes de neve / inverno",
                     "terms": "Trilhas para raquetes de neve / inverno"
@@ -8291,6 +8396,10 @@
                     "name": "Trilha de turismo de esqui",
                     "terms": "Trilhas de inverno"
                 },
+                "piste/sled": {
+                    "name": "Caminho de trenó",
+                    "terms": "Caminho de trenó"
+                },
                 "piste/sleigh": {
                     "name": "Trilha do trenó",
                     "terms": "Trilha do trenó"
@@ -8427,6 +8536,9 @@
                 "power": {
                     "name": "Recurso de eletricidade"
                 },
+                "power/cable": {
+                    "name": "Cabo de energia"
+                },
                 "power/cable/underground": {
                     "name": "Cabo de energia subterrâneo",
                     "terms": "Cabo de energia subterrâneo"
@@ -8697,8 +8809,8 @@
                     "terms": "Ferrovia em Desuso"
                 },
                 "railway/funicular": {
-                    "name": "Funicular",
-                    "terms": "Funicular, Plano Inclinado"
+                    "name": "Via funicular",
+                    "terms": "Via funicular"
                 },
                 "railway/halt": {
                     "name": "Estação de trem (parada / pedido)"
@@ -8709,7 +8821,7 @@
                 },
                 "railway/light_rail": {
                     "name": "Veículo Leve sobre Trilhos (VLT)",
-                    "terms": "VLT, trem ligeiro, comboio ligeiro, metrô de superfície, trem, tram,"
+                    "terms": "Veículo Leve sobre Trilhos (VLT)"
                 },
                 "railway/milestone": {
                     "name": "Marco de Ferrovia",
@@ -8717,12 +8829,16 @@
                 },
                 "railway/miniature": {
                     "name": "Ferrovia em Miniatura",
-                    "terms": "miniferrovia, mini-ferrovia, mini ferrovia, miniatura, brinquedo, tremzinho"
+                    "terms": "Ferrovia em Miniatura"
                 },
                 "railway/monorail": {
                     "name": "Monotrilho",
                     "terms": "Monotrilho"
                 },
+                "railway/monorail/hanging": {
+                    "name": "Trilho de suspensão do monotrilho",
+                    "terms": "Trilho de suspensão do monotrilho"
+                },
                 "railway/narrow_gauge": {
                     "name": "Ferrovia de Bitola Estreita",
                     "terms": "Ferrovia de Bitola Estreita"
@@ -8732,7 +8848,7 @@
                 },
                 "railway/rail": {
                     "name": "Trilho de trem",
-                    "terms": "Trilho"
+                    "terms": "Trilho de trem"
                 },
                 "railway/rail/highspeed": {
                     "name": "Trilho de alta velocidade",
@@ -8747,7 +8863,7 @@
                 },
                 "railway/subway": {
                     "name": "Trilho de metrô",
-                    "terms": "Metrô, Metropolitano"
+                    "terms": "Trilho de metrô"
                 },
                 "railway/subway_entrance": {
                     "name": "Entrada de Metrô",
@@ -8763,7 +8879,7 @@
                 },
                 "railway/tram": {
                     "name": "Trilho de bonde",
-                    "terms": "Bonde, VLT, Veículo leve sobre trilhos"
+                    "terms": "Trilho de bonde"
                 },
                 "railway/tram_stop": {
                     "name": "Posição de parada do bonde"
@@ -9072,9 +9188,6 @@
                     "name": "Loja de pesca",
                     "terms": "Loja de pesca"
                 },
-                "shop/fishmonger": {
-                    "name": "Peixaria"
-                },
                 "shop/flooring": {
                     "name": "Loja de materiais para pisos",
                     "terms": "Loja de materiais para pisos"
@@ -9088,8 +9201,8 @@
                     "terms": "loja de molduras"
                 },
                 "shop/frozen_food": {
-                    "name": "Alimento congelado",
-                    "terms": "Alimento congelado"
+                    "name": "Loja de alimentos congelados",
+                    "terms": "Loja de alimentos congelados"
                 },
                 "shop/fuel": {
                     "name": "Loja de Combustível",
@@ -9099,9 +9212,6 @@
                     "name": "Funerária",
                     "terms": "Funerária"
                 },
-                "shop/furnace": {
-                    "name": "Loja de Fornos"
-                },
                 "shop/furniture": {
                     "name": "Loja de Móveis",
                     "terms": "Loja de Móveis, Decoração"
@@ -9477,6 +9587,10 @@
                     "name": "Centro de dados",
                     "terms": "Centro de dados"
                 },
+                "telecom/exchange": {
+                    "name": "Câmbio de telecomunicações",
+                    "terms": "Câmbio de telecomunicações"
+                },
                 "tourism": {
                     "name": "Recurso de turismo"
                 },
@@ -9832,6 +9946,10 @@
                     "name": "Rota de Bonde",
                     "terms": "Rota de Bonde, Rota de VLT, Veículo leve sobre trilho"
                 },
+                "type/route/trolleybus": {
+                    "name": "Rota de trólebus",
+                    "terms": "Rota de trólebus"
+                },
                 "type/route_master": {
                     "name": "Rota Mestre",
                     "terms": "Rota Mestre"
@@ -10178,6 +10296,13 @@
                 "description": "O mapa da cidade é um mapa geral que descreve Gotemburgo. Ele contém informações gerais sobre terrenos, comunicações, hidrografia, edifícios, números de endereços e nomes de ruas, divisão administrativa e outro texto de orientação.",
                 "name": "Mapa da cidade de Gotemburgo "
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© Município de Gotemburgo, CC0"
+                },
+                "description": "Ortofoto para o município de Gotemburgo",
+                "name": "Orthophoto de Gotemburgo"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI Japão"
@@ -10345,6 +10470,12 @@
                 },
                 "name": "Panorama Thunderforest"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Mapas © Thunderforest, Dados © Colaboradores do OpenStreetMap"
+                },
+                "name": "Thunderforest ao ar livre"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -10386,6 +10517,12 @@
                 },
                 "description": "Rede rodoviária sueca NVDB com várias opções para camadas de mapa",
                 "name": "Opções da Rede Rodoviária Trafikverket"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Prefeitura de Wroclaw"
+                },
+                "name": "Wrocław: Orthophotomap 2018 (imagem aérea)"
             }
         },
         "community": {
@@ -10425,6 +10562,10 @@
                 "name": "Twitter OpenStreetMap Galícia",
                 "description": "Siga-nos no Twitter em {url}"
             },
+            "Galicia-Xeoinquedos-Twitter": {
+                "name": "Geoinquetos no Twitter",
+                "description": "Siga-nos no Twitter em {url}"
+            },
             "GeoPhilly": {
                 "name": "GeoPhilly",
                 "description": "Encontro para entusiastas do mapa na área de Filadélfia",
@@ -10443,6 +10584,7 @@
                 "description": "Mapeamento Colaborativo / Conta no Twitter Geoinquietos Saragoça"
             },
             "MapMinnesota": {
+                "name": "MapMinnesota",
                 "description": "Mapeadores e entusiastas do OpenStreetMap na Região Metropolitana de Minneapolis",
                 "extendedDescription": "Conectando entusiastas em Minnesota e Região Metropolitana de Minneapolis!"
             },
@@ -10452,6 +10594,7 @@
                 "extendedDescription": "Somos um grupo de mapeadores voluntários que visam melhorar o OpenStreetMap na área de DC. Também pretendemos ensinar aos outros sobre o ecossistema OSM, análise de dados, cartografia e GIS. Nós nos reunimos a cada dois meses nos encontros para nos concentrar em uma área da nossa cidade."
             },
             "MappingWR": {
+                "name": "MappingWR",
                 "description": "Fazendo rotas de menos emissões de carbono em torno de Waterloo. Região fácil de encontrar."
             },
             "Maptime-Bogota": {
@@ -10460,13 +10603,16 @@
                 "extendedDescription": "Aprender a coletar dados em campo e digitalizar para o OpenStreetMap. Não é necessário ter conhecimento local!  Você apenas precisa de desejo para participar, aprender e se divertir."
             },
             "Maptime-ME-meetup": {
+                "name": "MaptimeME",
                 "description": "Mapeadores e usuários do OpenStreetMap, em torno de Portland, ME",
                 "extendedDescription": "Tempo de mapeamento é, literalmente, tempo para criação de mapas. Nossa missão é abrir as portas de possibilidades cartográficas para qualquer um interessado por criar tempo e espaço para o aprendizado colaborativo, exploração e criação de mapas usando ferramentas de mapeamento e tecnologias."
             },
             "Maptime-Oceania-Slack": {
+                "name": "Slack Maptime Oceania",
                 "description": "Cadastre-se em {signupUrl}"
             },
             "MaptimeHRVA-twitter": {
+                "name": "Twitter MaptimeHRVA",
                 "description": "Siga-nos no Twitter em {url}"
             },
             "Nottingham-OSM-pub-meetup": {
@@ -10481,7 +10627,8 @@
             },
             "OSM-AR-forum": {
                 "name": "Web forum do OpenStreetMap Argentina",
-                "description": "Junte-se ao web forum OpenStreetMap Argentina"
+                "description": "Junte-se ao web forum OpenStreetMap Argentina",
+                "extendedDescription": "Ideal para discussões longas ou importantes. Tempo de resposta lento."
             },
             "OSM-AR-irc": {
                 "name": "IRC OpenStreetMap Argentina",
@@ -10494,11 +10641,13 @@
             },
             "OSM-AR-telegram": {
                 "name": "Telegram OpenStreetMap Argentina",
-                "description": "Junte-se à comunidade OpenStreetMap Argentina no Telegram"
+                "description": "Junte-se à comunidade OpenStreetMap Argentina no Telegram",
+                "extendedDescription": "O canal mais ativo na comunidade, ideal para bate-papo e receber respostas às suas perguntas instantaneamente. Todos são bem-vindos!"
             },
             "OSM-AR-twitter": {
                 "name": "Twitter OpenStreetMap",
-                "description": "Siga-nos no Twitter em {url}"
+                "description": "Siga-nos no Twitter em {url}",
+                "extendedDescription": "Notícias da comunidade local e do OpenStreetMap em geral."
             },
             "OSM-Asia-mailinglist": {
                 "name": "Lista de discussão do OpenStreetMap na Ásia",
@@ -10507,13 +10656,24 @@
             "OSM-BGD-facebook": {
                 "name": "OpenStreetMap Bangladesh",
                 "description": "Melhore o OpenStreetMap em Bangladesh",
-                "extendedDescription": "Mapeando em Bangladesh? Tem dúvidas, quer conectar-se com a comunidade aqui?  Junte-se a nós em {url}.  Todos são bem-vindos!"
+                "extendedDescription": "Mapeando em Bangladesh? Tem dúvidas, quer conectar-se com a comunidade aqui?  Junte-se a nós em {url}.  Todos são bem-vindos!",
+                "events": {
+                    "sotmasia2019": {
+                        "name": "State of the Map Ásia 2019",
+                        "description": "Junte-se ao evento regional do Estado do Mapa do OpenStreetMap 2019 em Daca",
+                        "where": "Krishibid Institution Bangladesh (KIB), Daca, Bangladesh"
+                    }
+                }
             },
             "OSM-BO-mailinglist": {
                 "name": "Lista de Discussão Talk-bo",
                 "description": "Lista de discussão oficial da comunidade OpenStreetMap Boliviana",
                 "extendedDescription": "Mapeando na Bolívia? Tem dúvidas, quer conectar-se com a comunidade aqui?  Junte-se a nós em {url}.  Todos são bem-vindos!"
             },
+            "OSM-BiH-telegram": {
+                "name": "Telegram OpenStreetMap BiH",
+                "description": "Um grupo do Telegram para a comunidade OSM da Bósnia e Herzegovina"
+            },
             "OSM-Boston": {
                 "name": "OpenStreetMap Boston",
                 "description": "Mapeadores e usuários do OpenStreetMap na área de Boston",
@@ -10523,6 +10683,14 @@
                 "name": "Slack do OSM-CA",
                 "description": "Todos são bem-vindos! Inscreva-se em {signupUrl}"
             },
+            "OSM-CA-mailinglist": {
+                "name": "Lista de Discussão OSM-CA",
+                "description": "Uma lista de discussão para falar sobre o OpenStreetMap no Canadá."
+            },
+            "OSM-CA-telegram": {
+                "name": "@osmca no Telegram",
+                "description": "Bate-papo do OpenStreetMap Canadá no Telegram"
+            },
             "OSM-CL-facebook": {
                 "name": "Facebook OpenStreetMap Chile ",
                 "description": "Junte-se à comunidade OpenStreetMap Chile no Facebook",
@@ -10541,6 +10709,9 @@
                 "name": "Twitter OpenStreetMap Chile",
                 "description": "Siga-nos no Twitter em {url}"
             },
+            "OSM-CN-telegram": {
+                "name": "Telegram OpenStreetMap China"
+            },
             "OSM-CO": {
                 "name": "OpenStreetMap Colômbia"
             },
@@ -10717,7 +10888,8 @@
                 "description": "Mapeadores e usuários do OpenStreetMap na área de Seattle"
             },
             "OSM-SoCal": {
-                "name": "OpenStreetMap Califórnia Meridional"
+                "name": "OpenStreetMap Califórnia Meridional",
+                "description": "Vamos nos divertir, contribuir com algo para Los Angeles e aprender sobre mapeamento!"
             },
             "OSM-South-Bay": {
                 "name": "OSM South Bay",
@@ -10738,6 +10910,7 @@
                 "name": "Lista de Discussão Taiwan"
             },
             "OSM-Tampa-Bay": {
+                "name": "OpenStreetMap Tampa Bay",
                 "description": "Mapeadores e usuários do OpenStreetMap em Tampa Bay"
             },
             "OSM-Telegram": {
@@ -10760,7 +10933,8 @@
                 "name": "OpenStreetMap Utah"
             },
             "OSM-Wyoming": {
-                "name": "OpenStreetMap Wyoming"
+                "name": "OpenStreetMap Wyoming",
+                "description": "Mappers e usuários do OpenStreetMap no Estado de Wyoming"
             },
             "OSM-br-discord": {
                 "name": "Discord do OpenStreetMap Brasil",
@@ -10811,11 +10985,20 @@
             "OSMF": {
                 "name": "Fundação OpenStreetMap",
                 "description": "OSMF é uma fundação sem fins lucrativos baseada no Reino Unido que suporta o projeto OpenStreetMap",
-                "extendedDescription": "OSMF suporta o OpenStreetMap levantando fundos, mantendo os servidores onde reside o OSM, organizando a conferência anual State of the Map, e coordenando os voluntários que mantém o OSM no ar.  Você pode mostrar seu suporte e ter uma voz na direção do OpenStreetMap associando-se como um membro aqui: {signupUrl}"
+                "extendedDescription": "OSMF suporta o OpenStreetMap levantando fundos, mantendo os servidores onde reside o OSM, organizando a conferência anual State of the Map, e coordenando os voluntários que mantém o OSM no ar.  Você pode mostrar seu suporte e ter uma voz na direção do OpenStreetMap associando-se como um membro aqui: {signupUrl}",
+                "events": {
+                    "sotm2020": {
+                        "description": "Junte-se a nós por 3 dias na Cidade do Cabo, na África do Sul, para a conferência anual mundial do OpenStreetMap, reunindo todos na comunidade para socializar, compartilhar e aprender.",
+                        "where": "Cidade do Cabo, África do Sul"
+                    }
+                }
             },
             "OpenCleveland-meetup": {
                 "description": "Melhore o OpenStreetMap na área de Cleveland"
             },
+            "PHXGeo-meetup": {
+                "extendedDescription": "Este é um grupo de encontro para aqueles que são da área de Phoenix e gostam de mapas, GIS, OpenStreetMap, cartografia e qualquer outro meio relacionado."
+            },
             "PHXGeo-twitter": {
                 "description": "Siga-nos no Twitter em {url}"
             },
@@ -11025,6 +11208,27 @@
                 "name": "OpenStreetMap Kosovo no Telegram",
                 "description": "Grupo público semi-oficial do Telegram de Kosovo. Saudamos com todos os mapeadores de qualquer lugar e em qualquer idioma."
             },
+            "latam-facebook": {
+                "description": "Mapeadores e OpenStreetMap no Facebook na América Latina"
+            },
+            "latam-irc": {
+                "description": "Junte-se a #osm-latam em irc.oftc.net (porta 6667)"
+            },
+            "latam-mailinglist": {
+                "description": "Talk-latam é a lista de discussão oficial da comunidade OpenStreetMap da América Latina"
+            },
+            "latam-matrix": {
+                "description": "Converse com outros membros da comunidade latino-americana de OSM. Ele é ponte com o bate-papo do Telegram."
+            },
+            "latam-telegram": {
+                "description": "Converse com outros membros da comunidade latino-americana de OSM, e faça uma ponte com o bate-papo Matrix"
+            },
+            "latam-twitter": {
+                "description": "OpenStreetMap América Latina no Twitter:"
+            },
+            "latam-wiki": {
+                "description": "Tudo o que você precisa saber sobre mapeamento na América Latina"
+            },
             "no-forum": {
                 "name": "Web Forum do OpenStreetMap Noruega",
                 "description": "Web forum do OpenStreetMap Noruega"

vendor/assets/iD/iD/locales/pt.json

@@ -20,6 +20,14 @@
             "favorites": "Favoritos",
             "add_feature": "Adicionar Elemento"
         },
+        "title": {
+            "format": {
+                "context": "{base} – {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} – {context}"
+            },
+            "labeled_and_more": "{labeled} e mais {count}"
+        },
         "modes": {
             "add_feature": {
                 "title": "Adicionar um elemento",
@@ -159,8 +167,8 @@
                         "multiple": "Cantos esquadrados."
                     },
                     "feature": {
-                        "single": "Os cantos de um elemento foram esquadrados.",
-                        "multiple": "Os cantos de vários elementos foram esquadrados."
+                        "single": "Os cantos do elemento foram esquadrados.",
+                        "multiple": "Os cantos dos elementos foram esquadrados."
                     }
                 },
                 "multiple_blockers": {
@@ -590,7 +598,7 @@
             "request_review": "Gostaria que alguém revisse as minhas edições.",
             "save": "Enviar",
             "cancel": "Cancelar",
-            "changes": "{count} alterações",
+            "changes": "Alterações ({count})",
             "download_changes": "Transferir ficheiro osmChange",
             "errors": "Erros",
             "warnings": "Avisos",
@@ -678,20 +686,19 @@
             "no_results_worldwide": "Nenhum resultado encontrado"
         },
         "geolocate": {
+            "key": "L",
             "title": "Mostrar a minha localização",
-            "locating": "A localizar. Por favor, aguarda..."
+            "locating": "A localizar. Por favor, aguarda...",
+            "location_unavailable": "A tua localização não se encontra disponível."
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "Focar",
-                "tooltip_feature": "Centrar e aproximar o mapa neste elemento.",
-                "tooltip_note": "Centrar e aproximar o mapa nesta nota.",
-                "tooltip_data": "Centrar e aproximar o mapa nestes dados.",
-                "tooltip_issue": "Centrar e aproximar o mapa neste problema."
+                "title": "Focar"
             },
             "show_more": "Mostrar Mais",
             "view_on_osm": "Ver em openstreetmap.org",
+            "view_on_osmose": "Ver em osmose.openstreetmap.fr",
             "view_on_keepRight": "Ver em keepright.at",
             "feature_type": "Tipo de elemento",
             "fields": "Campos",
@@ -825,7 +832,7 @@
             }
         },
         "photo_overlays": {
-            "title": "Sobreposições de Fotos",
+            "title": "Camadas de Fotos",
             "traffic_signs": {
                 "title": "Sinais de Trânsito"
             },
@@ -925,7 +932,7 @@
             "custom_background": {
                 "tooltip": "Editar fundo personalizado",
                 "header": "Definições do Fundo Personalizado",
-                "instructions": "Introduz um modelo de URL de mosaicos. Os sinais válidos são:\n   {zoom} ou {z}, {x}, {y} para o esquema de mosaicos Z/X/Y\n   {-y} ou {ty} para coordenadas Y invertidas no estilo TMS\n   {u} para esquemas quadriculares\n   {switch:a,b,c} para o multiplexing de servidor DNS\n\nExemplo:\n{example}",
+                "instructions": "Introduz um modelo de URL de mosaicos. Os sinais válidos são:\n{zoom} ou {z}, {x}, {y} para o esquema de mosaicos Z/X/Y\n{-y} ou {ty} para coordenadas Y invertidas no estilo TMS\n{u} para esquemas quadriculares\n{switch:a,b,c} para o multiplexing de servidor DNS\n\nExemplo:\n{example}",
                 "template": {
                     "placeholder": "Introduzir o endereço url do modelo"
                 }
@@ -1007,7 +1014,7 @@
             "help_html": "As alterações que fizeste deverão aparecer no OpenStreetMap dentro de poucos minutos. Poderá demorar mais tempo se for um mapa OSM introduzido noutras plataformas.",
             "help_link_text": "Detalhes",
             "help_link_url": "https://wiki.openstreetmap.org/wiki/Pt:Perguntas_frequentes#Eu_acabei_de_alterar_o_mapa._Como_eu_fa.C3.A7o_para_visualizar_minhas_altera.C3.A7.C3.B5es.3F",
-            "view_on_osm": "Ver Alterações no OSM",
+            "view_on_osm": "Ver alterações no OSM",
             "changeset_id": "O teu conjunto de alterações #: {changeset_id}",
             "like_osm": "Gostas do OpenStreetMap? Liga-te a outros:",
             "more": "Mais",
@@ -1048,13 +1055,18 @@
         },
         "cannot_zoom": "Não é possível afastar mais no modo atual.",
         "full_screen": "Ativar Ecrã Inteiro.",
+        "self_intersection": {
+            "error": {
+                "lines": "As linhas não podem cruzar sobre si próprias.",
+                "areas": "As áreas não podem cruzar sobre si próprias."
+            }
+        },
         "QA": {
             "osmose": {
                 "title": "Problema do Osmose",
                 "detail_title": "Detalhes",
                 "elems_title": "Elementos",
-                "trap_title": "Erros comuns",
-                "translation": "Traduções fornecidas por Osmose"
+                "trap_title": "Erros comuns"
             },
             "improveOSM": {
                 "title": "Deteção ImproveOSM",
@@ -1487,17 +1499,17 @@
                 "commented": "comentada {when}",
                 "closed": "encerrada {when}"
             },
-            "newComment": "Novo Comentário",
+            "newComment": "Novo comentário",
             "inputPlaceholder": "Deixa um comentário para partilhar com outros utilizadores.",
-            "close": "Encerrar Nota",
-            "open": "Reabrir Nota",
-            "comment": "Comentário",
-            "close_comment": "Encerrar e Comentar",
-            "open_comment": "Reabrir e Comentar",
+            "close": "Encerrar nota",
+            "open": "Reabrir nota",
+            "comment": "Comentar",
+            "close_comment": "Encerrar e comentar",
+            "open_comment": "Reabrir e comentar",
             "report": "Comunicar",
-            "new": "Nova Nota",
+            "new": "Nova nota",
             "newDescription": "Descreve o problema.",
-            "save": "Guardar Nota",
+            "save": "Guardar nota",
             "login": "Tens de iniciar sessão para alterar ou comentar esta nota.",
             "upload_explanation": "Os teus comentários ficarão visíveis publicamente para todos os utilizadores do OpenStreetMap.",
             "upload_explanation_with_user": "Os teus comentários enquanto {user} ficarão visíveis publicamente para todos os utilizadores do OpenStreetMap."
@@ -1513,8 +1525,8 @@
                 "before_start_h": "Antes de começares",
                 "before_start": "Deverás estar familiarizado com o OpenStreetMap e com este editor antes de começares a editar. O iD tem um guia inicial que te ensina o básico da edição no OpenStreetMap. Clica em \"Iniciar o tutorial\" - dura apenas 15 minutos.",
                 "open_source_h": "Código aberto",
-                "open_source": "O editor ID é um projeto colaborativo em código aberto e estás agora a utilizar a versão {version}. O código fonte está disponível no [GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Podes ajudar o iD [traduzindo](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) ou [comunicando erros](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "O editor iD é um projeto colaborativo em código aberto e estás agora a utilizar a versão {version}. O código fonte está disponível no [GitHub](https://github.com/openstreetmap/iD).",
+                "open_source_help": "Podes ajudar o iD [traduzindo](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) ou [comunicando erros](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
                 "title": "Ideia Geral",
@@ -1564,7 +1576,7 @@
                 "title": "Pontos",
                 "intro": "Os *pontos* podem ser utilizados para representar elementos como lojas, restaurantes e monumentos. Marcam uma localização específica e descrevem o que nela existe.",
                 "add_point_h": "Adicionar pontos",
-                "add_point": "Para adicionar um ponto, clica no botão {point} **Ponto** na barra de ferramentas acima do mapa ou utiliza a tecla de atalho `1`. Isto alterará o cursor do rato para um símbolo com uma cruz.",
+                "add_point": "Para adicionar um ponto, clica no botão {point} **Ponto** na barra de ferramentas, acima do mapa, ou utiliza a tecla de atalho `1`. Isto alterará o cursor do rato para um símbolo com uma cruz.",
                 "add_point_finish": "Para criar um novo ponto no mapa, posiciona o cursor do rato no local onde queres colocar o ponto, clica com o botão esquerdo do rato {leftclick} ou utiliza a tecla de `Espaço`.",
                 "move_point_h": "Mover pontos",
                 "move_point": "Para mover um ponto, coloca o cursor do rato sobre um ponto, clica e mantém o botão esquerdo do rato {leftclick} premido e arrasta o ponto para a nova localização.",
@@ -1602,11 +1614,11 @@
                 "point_or_area_h": "Pontos ou áreas?",
                 "point_or_area": "Muitos elementos podem ser representados por pontos ou áreas. Deves mapear edifícios e limites de propriedade como áreas, sempre que possível. Coloca pontos dentro de uma área de edifício para representar empresas, serviços e outros elementos que estejam localizados dentro do edifício. ",
                 "add_area_h": "Adicionar áreas",
-                "add_area_command": "Para adicionares uma área, clica no botão de {area} **Área** na barra de ferramentas acima do mapa ou usa a tecla de atalho `3`. Isto irá alterar o cursor do rato para um símbolo com uma cruz.",
+                "add_area_command": "Para adicionares uma área, clica no botão de {area} **Área** na barra de ferramentas, acima do mapa, ou usa a tecla de atalho `3`. Isto irá alterar o cursor do rato para um símbolo com uma cruz.",
                 "add_area_draw": "De seguida, posiciona o cursor do rato num dos cantos do elemento e clica com o botão esquerdo do rato {leftclick} ou pressiona a tecla `Espaço` para iniciar a colocação dos nós ao longo do limite exterior da área. Continua a adicionar nós, clicando ou pressionando a tecla `Espaço`. Enquanto desenhas, podes aproximar ou arrastar o mapa para obter mais detalhes. ",
                 "add_area_finish": "Para concluir uma área, pressiona `{return}` ou clica novamente no primeiro ou no último nó da área.",
                 "square_area_h": "Esquadrar cantos",
-                "square_area_command": "Muitos elementos de área, como os edifícios, têm cantos esquadrados. Para esquadrar os cantos de uma área, clica com o botão direito do rato {rightclick} no limite da área e seleciona o comando {orthogonalize} **Esquadrar** no menu de edição. ",
+                "square_area_command": "Muitos elementos de área, como os edifícios, têm cantos esquadrados. Para esquadrar os cantos de uma área, clica com o botão direito do rato {rightclick} no limite da área e seleciona o comando {orthogonalize} **Esquadrar** no menu de edição. Em alternativa, também podes pressionar a tecla `Q`.",
                 "modify_area_h": "Modificar áreas",
                 "modify_area_dragnode": "Muitas vezes, irás ver áreas que não têm a forma correta, como por exemplo, um edifício que não está alinhado com a imagem de fundo. Para ajustar a forma da área, primeiro seleciona-a clicando com o botão esquerdo do rato {leftclick}. Todos os nós da área serão representados por pequenos círculos. A seguir, podes arrastar os nós para melhorar a sua localização.",
                 "modify_area_addnode": "Também podes criar novos nós ao longo da área, clicando duas vezes {leftclick}**x2** num dos limites da área ou arrastando os pequenos triângulos nos pontos intermédios entre os nós.",
@@ -1669,12 +1681,12 @@
                 "viewer": "Quando clicares numa das localizações da foto, surgirá uma janela com a foto no canto inferior do mapa. A janela contém controlos para avançar ou retroceder na sequência de imagens e também mostra o nome de utilizador da pessoa que captou a imagem, a data de captura e a ligação onde poderás ver a imagem no website original."
             },
             "gps": {
-                "title": "Trilhos GPS",
-                "intro": "Os trilhos GPS são uma fonte da dados importante para o OpenStreetMap. Este editor suporta ficheiros *.gpx*, *.geojson* e *.kml* que estejam no teu computador. Podes criar trilhos GPS utilizando o teu telemóvel, relógios desportivos ou outros aparelhos de GPS.",
+                "title": "Rotas GPS",
+                "intro": "As rotas GPS são uma fonte da dados importante para o OpenStreetMap. Este editor suporta ficheiros *.gpx*, *.geojson* e *.kml* que estejam no teu computador. Podes criar rotas GPS utilizando o teu telemóvel, relógios desportivos ou outros aparelhos de GPS.",
                 "survey": "Para mais informações de como deves efetuar um levantamento no terreno com GPS, lê [Como mapear com um telemóvel, GPS ou papel](http://learnosm.org/en/mobile-mapping/).",
-                "using_h": "Utilizar trilhos GPS",
-                "using": "Para utilizares um trilho GPS para mapear, arrasta-o e larga-o no editor do mapa. Se for reconhecido, será desenhado no mapa como uma linha em roxo claro. Clica em {data} **Dados do mapa** no painel lateral para ativar, desativar ou aproximar os teus dados de GPS.",
-                "tracing": "O trilho GPS não é enviado para o OpenStreetMap - a melhor maneira de o usares é desenhando-o no mapa, para que sirva de guia aos novos elementos que fores adicionar.",
+                "using_h": "Utilizar rotas GPS",
+                "using": "Para utilizares uma rota GPS para mapear, arrasta-a e larga-a no editor do mapa. Se for reconhecida, será desenhada no mapa como uma linha em roxo claro. Clica em {data} **Dados do mapa** no painel lateral para ativar, desativar ou aproximar os teus dados de GPS.",
+                "tracing": "A rota GPS não é enviada para o OpenStreetMap - a melhor maneira de a usares é desenhando-a no mapa, para que sirva de guia aos novos elementos que fores adicionar.",
                 "upload": "Também podes [enviar os teus dados GPS para o OpenStreetMap](https://www.openstreetmap.org/trace/create) de modo a que outros possam utilizá-los para mapear."
             },
             "qa": {
@@ -1726,7 +1738,7 @@
         },
         "issues": {
             "title": "Problemas",
-            "key": "P",
+            "key": "I",
             "list_title": "Problemas ({count})",
             "errors": {
                 "list_title": "Erros ({count})"
@@ -2433,7 +2445,8 @@
                     "pan": "Arrastar mapa",
                     "pan_more": "Arrastar mapa por um ecrã",
                     "zoom": "Aproximar / Afastar",
-                    "zoom_more": "Aproximar / Afastar bastante"
+                    "zoom_more": "Aproximar / Afastar bastante",
+                    "geolocate": "Aproximar na minha localização"
                 },
                 "help": {
                     "title": "Ajuda",
@@ -2889,6 +2902,9 @@
                 "bridge/support": {
                     "label": "Tipo"
                 },
+                "bridge_combo": {
+                    "label": "Tipo"
+                },
                 "building": {
                     "label": "Edifício",
                     "terms": "estrutura,casa,prédio,moradia,residência,habitação,edificação,edificado,arranha-céus,arranha céus"
@@ -2943,6 +2959,14 @@
                     "placeholder": "50, 100, 200...",
                     "terms": "capacidade, lotação, número máximo, total de capacidade, total de pessoas, número de pessoas,"
                 },
+                "capacity/disabled_parking": {
+                    "label": "Espaços para deficientes",
+                    "placeholder": "1, 2, 3..."
+                },
+                "capacity_parking": {
+                    "label": "Capacidade total",
+                    "placeholder": "10, 20, 30..."
+                },
                 "cash_in": {
                     "label": "Depósito"
                 },
@@ -2963,7 +2987,13 @@
                     "terms": "pedágio,portagem,tarifa,taxa,custo,valor,montante"
                 },
                 "check_date": {
-                    "label": "Última data de verificação"
+                    "label": "Última data de verificação",
+                    "placeholder": "AAAA-MM-DD"
+                },
+                "circumference": {
+                    "label": "Circunferência",
+                    "placeholder": " 1 m, 20 cm, 30 in...",
+                    "terms": "círculo,circunferências"
                 },
                 "clothes": {
                     "label": "Roupas"
@@ -3130,6 +3160,9 @@
                         "yes": "Sim"
                     }
                 },
+                "depth": {
+                    "label": "Profundidade (metros)"
+                },
                 "description": {
                     "label": "Descrição",
                     "terms": "resumo,descrições,sumário"
@@ -3213,11 +3246,15 @@
                     "label": "Mostrador"
                 },
                 "distance": {
-                    "label": "Distância"
+                    "label": "Distância",
+                    "terms": "distância,intervalo,distanciamento,afastamento"
                 },
                 "disused/railway": {
                     "label": "Tipo"
                 },
+                "disused/shop": {
+                    "label": "Tipo"
+                },
                 "dock": {
                     "label": "Tipo"
                 },
@@ -3252,6 +3289,14 @@
                     "placeholder": "00:00",
                     "terms": "duração,prazo,período de tempo"
                 },
+                "ele": {
+                    "label": "Altitude",
+                    "terms": "altura,elevação"
+                },
+                "ele_node": {
+                    "label": "Altitude",
+                    "terms": "altura,elevação"
+                },
                 "electrified": {
                     "label": "Eletrificação",
                     "options": {
@@ -3263,10 +3308,6 @@
                     "placeholder": "Catenária, carril eletrificado...",
                     "terms": "electrificação,eletrificação,cabo"
                 },
-                "elevation": {
-                    "label": "Altitude (metros)",
-                    "terms": "elevação,altura"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "exemplo@exemplo.com",
@@ -3383,6 +3424,9 @@
                 "gambling": {
                     "label": "Jogos"
                 },
+                "garden/type": {
+                    "label": "Tipo de jardim"
+                },
                 "gauge": {
                     "label": "Bitola"
                 },
@@ -3572,11 +3616,16 @@
                         "wlan": "Sem fios (Wi-Fi)",
                         "yes": "Sim"
                     },
-                    "terms": "wifi,wi-fi,wlan,acesso à rede"
+                    "terms": "wifi,wi-fi,wlan,acesso à rede,web,ligação"
                 },
                 "internet_access/fee": {
                     "label": "Taxa de acesso à Internet",
-                    "terms": "taxa,custo,preço,valor,montante,quantia,wifi,wi-fi"
+                    "options": {
+                        "customers": "Clientes",
+                        "no": "Gratuito",
+                        "yes": "Pago"
+                    },
+                    "terms": "taxa,custo,preço,valor,montante,quantia,wifi,wi-fi,acesso,internet,rede"
                 },
                 "internet_access/ssid": {
                     "label": "Nome da rede Wi-Fi",
@@ -3635,7 +3684,7 @@
                     "options": {
                         "deciduous": "Caduca",
                         "evergreen": "Persistente",
-                        "mixed": "Misto",
+                        "mixed": "Mista",
                         "semi_deciduous": "Semicaduca",
                         "semi_evergreen": "Semipersistente"
                     }
@@ -3774,6 +3823,10 @@
                     "label": "Microcervejaria",
                     "terms": "cerveja artesanal,cervejaria,cerveja,bar"
                 },
+                "mimics": {
+                    "label": "Torre de telecomunicações camuflada",
+                    "terms": "camuflada,camuflagem,disfarçada,disfarce,telecomunicação,comunicações,telefónica,telefones,torre,mastro"
+                },
                 "min_age": {
                     "label": "Idade mínima",
                     "terms": "limite inferior de idade"
@@ -3841,8 +3894,7 @@
                     "terms": "rede"
                 },
                 "network/type": {
-                    "label": "Tipo de rede",
-                    "terms": "tipo de rede"
+                    "label": "Tipo de rede"
                 },
                 "network_bicycle": {
                     "label": "Rede",
@@ -3917,7 +3969,8 @@
                     "terms": "fogo,fogueira,labaredas,churrasco,brasas,chamas,fósforos,acendalhas"
                 },
                 "opening_date": {
-                    "label": "Data de abertura esperada"
+                    "label": "Data de abertura esperada",
+                    "placeholder": "AAAA-MM-DD"
                 },
                 "opening_hours": {
                     "label": "Horário de funcionamento",
@@ -3955,6 +4008,9 @@
                         "underground": "Subterrâneo"
                     }
                 },
+                "parking_space": {
+                    "label": "Tipo"
+                },
                 "payment_multi": {
                     "label": "Tipos de pagamento",
                     "terms": "cobrança"
@@ -4095,6 +4151,10 @@
                 "playground/theme": {
                     "label": "Tema"
                 },
+                "plots": {
+                    "label": "Lotes",
+                    "placeholder": "10, 20, 30..."
+                },
                 "polling_station": {
                     "label": "Mesa de voto",
                     "terms": "votos,votação,plebiscito,urna,votar,plebiscitar"
@@ -4514,6 +4574,7 @@
                 },
                 "start_date": {
                     "label": "Criado/a em",
+                    "placeholder": "AAAA-MM-DD",
                     "terms": "Criação,fundado,fundada,Construída,Construído,lançado,lançada,"
                 },
                 "step_count": {
@@ -4628,6 +4689,9 @@
                 "target": {
                     "label": "Alvo"
                 },
+                "telecom/medium": {
+                    "label": "Condutor"
+                },
                 "tidal": {
                     "label": "Maré",
                     "terms": "maré"
@@ -4755,6 +4819,9 @@
                     "label": "Tipo",
                     "placeholder": "Padrão"
                 },
+                "tunnel_combo": {
+                    "label": "Tipo"
+                },
                 "usage_rail": {
                     "label": "Tipo de utilização",
                     "options": {
@@ -4949,7 +5016,7 @@
                 },
                 "aerialway/gondola": {
                     "name": "Gôndola",
-                    "terms": "Gondola"
+                    "terms": "esqui,ski,snowboarding,teleférico,cabina,cabine,telecabine,telecabina,elevador"
                 },
                 "aerialway/goods": {
                     "name": "Teleférico de mercadorias",
@@ -5435,6 +5502,10 @@
                     "name": "Lugar de estacionamento",
                     "terms": "Estacionamento, Estacionar,área de estacionamento,parquear"
                 },
+                "amenity/parking_space/disabled": {
+                    "name": "Portadores de necessidades especiais",
+                    "terms": "portador de deficiência,cadeira-de-rodas,cadeira de rodas,cadeirante,deficientes,necessidades especiais,lugar reservado,idosos,grávidas"
+                },
                 "amenity/payment_centre": {
                     "name": "Balcão de pagamento",
                     "terms": "pagamento,pagar,pagamentos,impostos,contas"
@@ -5574,9 +5645,6 @@
                     "name": "Contentor de reciclagem",
                     "terms": "Ecoponto, ilhas ecológicas, contentor, reciclar, reciclagem, papelão, pilhão, oleão, vidrão, embalão,papel,vidro,roupa,plástico,latas,garrafas"
                 },
-                "amenity/register_office": {
-                    "name": "Conservatória do registo civil"
-                },
                 "amenity/research_institute": {
                     "name": "Instituto de pesquisa",
                     "terms": "Instituição,investigação,desenvolvimento,pesquisar"
@@ -5665,9 +5733,6 @@
                     "name": "Escola",
                     "terms": "Academia, Colégio, Departamento, Externato, Liceu, Seminário,secundária,primária,ensino,educação,aluno,aluna,alunos"
                 },
-                "amenity/scrapyard": {
-                    "name": "Sucata"
-                },
                 "amenity/shelter": {
                     "name": "Abrigo",
                     "terms": "Shelter,gazebo,telheiro,alpendre"
@@ -5744,9 +5809,6 @@
                     "name": "Estúdio de cinema",
                     "terms": "estúdios,cinema,sétima arte,filme,filmes"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Piscina"
-                },
                 "amenity/taxi": {
                     "name": "Praça de táxis",
                     "terms": "Paragem de Táxis, Táxi, Taxi"
@@ -6012,11 +6074,11 @@
                 },
                 "barrier/bollard": {
                     "name": "Pilarete",
-                    "terms": "Bolardo, Poste de Amarração, pilar"
+                    "terms": "bolardo,pilar,balizador,poste rodoviário"
                 },
                 "barrier/bollard_line": {
                     "name": "Linha de pilaretes",
-                    "terms": "Bolardos, Postes de Amarração, pilares"
+                    "terms": "bolardos,pilares,balizador,balizadores,postes rodoviários"
                 },
                 "barrier/border_control": {
                     "name": "Posto fronteiriço",
@@ -6105,6 +6167,10 @@
                     "name": "Porta de fortificação",
                     "terms": "sally port, portão de fortaleza, porta de fortaleza, porta falsa, portão de castelo, porta de castelo,portão do castelo, porta do castelo, entrada do castelo"
                 },
+                "barrier/spikes": {
+                    "name": "Linha de espigões",
+                    "terms": "Espigão,espinhos,agulhas,barreira"
+                },
                 "barrier/stile": {
                     "name": "Passagem antigado",
                     "terms": "cancela fixa,passagem,cerca"
@@ -6184,7 +6250,7 @@
                     "terms": "chapel, capelinha, ermida,edifício"
                 },
                 "building/church": {
-                    "name": "Igreja",
+                    "name": "Edifício de igreja",
                     "terms": "church,templo,cristão,edifício"
                 },
                 "building/civic": {
@@ -6580,6 +6646,9 @@
                 "disused/railway": {
                     "name": "Ferrovia abandonada"
                 },
+                "disused/shop": {
+                    "name": "Loja desativada"
+                },
                 "embankment": {
                     "name": "Elevação no terreno"
                 },
@@ -6942,6 +7011,10 @@
                     "name": "Trilho",
                     "terms": "trilha,caminho,vereda,carreiro,caminhar,hiking,hike,trail,caminhada,pequena rota,grande rota,pedestrianismo,homologado,percurso,PR,GR,BTT,horse,cavalos,hipismo,bicicleta,ciclismo,trail"
                 },
+                "highway/path/boardwalk": {
+                    "name": "Passadiço",
+                    "terms": "caminho de madeira,tábuas,trilho,pedonal,pedestre,passadisso"
+                },
                 "highway/path/informal": {
                     "name": "Trilho informal",
                     "terms": "trilha,caminho,vereda,carreiro,caminhar,hiking,hike,trail,caminhada,trilho de animais,cabras,javalis,cães,cavalos"
@@ -7298,7 +7371,7 @@
                 },
                 "landuse/meadow": {
                     "name": "Prado",
-                    "terms": "Meadow,campo,área,zona,pasto,erva,vegetação"
+                    "terms": "meadow,campo,área,zona,pasto,erva,vegetação,forragem,pastagem,feno,palha"
                 },
                 "landuse/military": {
                     "name": "Área militar",
@@ -7360,7 +7433,7 @@
                     "terms": "zona, espaço, religião, igreja, cristão, muçulmano, judeu, judaico, judaísmo, cristianismo, islão, oração, adoração, santuário, capela, mesquita, sinagoga"
                 },
                 "landuse/reservoir": {
-                    "name": "Reservatório de água"
+                    "name": "Água represada"
                 },
                 "landuse/residential": {
                     "name": "Área residencial",
@@ -7431,7 +7504,7 @@
                 },
                 "leisure/dog_park": {
                     "name": "Parque para cães",
-                    "terms": "Parque para Cães, Dog Park,canídeos,cachorros,cachorrinhos"
+                    "terms": "Dog Park,canídeos,cachorros,cachorrinhos,cachorródromo"
                 },
                 "leisure/escape_game": {
                     "name": "Sala de fuga",
@@ -7505,6 +7578,14 @@
                     "name": "Jardim",
                     "terms": "Jardins,flores,passeio,lazer,plantas"
                 },
+                "leisure/garden/botanical": {
+                    "name": "Jardim botânico",
+                    "terms": "botânico,plantas raras,botânica,exóticas,estudas,catos,cactos,espécies,tropicais,tropical"
+                },
+                "leisure/garden/community": {
+                    "name": "Jardim comunitário",
+                    "terms": "cooperação,cooperativo,comunal,coletivo,comunidade,espaço verde,flores,vegetais"
+                },
                 "leisure/golf_course": {
                     "name": "Campo de golfe",
                     "terms": "Campo de Golf, Golf, Golf Course,golfistas,fairway,green"
@@ -7682,8 +7763,8 @@
                     "terms": "Estádio, arena, campo de futebol, bancadas,desporto,edifício"
                 },
                 "leisure/swimming_area": {
-                    "name": "Zona de banhos natural",
-                    "terms": "natural swimming area, zona de banho, área de banho, área de natação, área para nadar, natação permitida, permitido nadar,rios,mar,lagoa,lago,lazer,"
+                    "name": "Área balnear natural",
+                    "terms": "natural swimming area, zona de banho, área de banho, área de natação, área para nadar, natação permitida, permitido nadar,rios,mar,lagoa,lago,lazer,fluvial,praia fluvial"
                 },
                 "leisure/swimming_pool": {
                     "name": "Piscina",
@@ -7697,26 +7778,14 @@
                     "name": "Pista de ciclismo",
                     "terms": "cycling track, pista de ciclismo, pista de bicicletas, pista de ciclistas, pista para ciclismo, pista para bicicletas, pista para ciclistas, velódromo, circuito bicicleta,desporto"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Pista de ciclismo",
-                    "terms": "cycling track, pista de ciclismo, pista de bicicletas, pista de ciclistas, pista para ciclismo, pista para bicicletas, pista para ciclistas, velódromo"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Pista de corridas de cavalos",
                     "terms": "pista de corridas de cavalos, apostas em cavalos, corrida de cavalos, corridas de cavalos, pista de cavalos, pista para cavalos, hipódromo"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Pista de corridas de cavalos",
-                    "terms": "pista de corridas de cavalos, apostas em cavalos, corrida de cavalos, corridas de cavalos, pista de cavalos, pista para cavalos, hipódromo"
-                },
                 "leisure/track/running": {
                     "name": "Pista de atletismo",
                     "terms": "pista de atletismo, pista de corridas, pista de correr, pista, correr, corridas, atletismo, decathlon, decatlo, maratona,desporto,atletas"
                 },
-                "leisure/track/running_point": {
-                    "name": "Pista de atletismo",
-                    "terms": "pista de atletismo, pista de corridas, pista de correr, pista, correr, corridas, atletismo, decathlon, decatlo, maratona,desporto"
-                },
                 "leisure/water_park": {
                     "name": "Parque aquático",
                     "terms": "Piscina, Parque de diversões, Lazer, Diversão,recreio,água,escorregas,mergulho,nadar,natação,verão"
@@ -8006,7 +8075,7 @@
                 },
                 "military/checkpoint": {
                     "name": "Posto de controlo militar",
-                    "terms": "checkpoint, ponto de controlo militar, posto de controlo, ponto de controlo, controlo militar"
+                    "terms": "checkpoint,posto de controlo,ponto de controlo,controlo militar"
                 },
                 "military/nuclear_explosion_site": {
                     "name": "Local de testes nucleares",
@@ -8069,7 +8138,7 @@
                 },
                 "natural/heath": {
                     "name": "Charneca",
-                    "terms": "Heath,vegetação,urze,torga,quiroga,queiró,magoriça,tojal,urzal,plantas,área,zona"
+                    "terms": "heath,vegetação,urze,torga,quiroga,queiró,magoriça,tojal,urzal,plantas,área,zona,gândara,esteva,giestas,tojo"
                 },
                 "natural/mud": {
                     "name": "Lama",
@@ -8111,6 +8180,10 @@
                     "name": "Seixal",
                     "terms": "shingle, encosta seixosa, encosta de seixos, seixos, margem de rio, praia de seixos, praia com seixos, praia, margem de rio,fragmentos,cascalho,pedritas,pedras"
                 },
+                "natural/shrub": {
+                    "name": "Arbusto",
+                    "terms": "mato,vegetação,planta lenhosa"
+                },
                 "natural/spring": {
                     "name": "Nascente de água",
                     "terms": "Nascente, Água, Nasce, Fonte,potável"
@@ -8160,8 +8233,8 @@
                     "terms": "Jardim de Água, Jardim d'Água, Lagoinha, Pateira"
                 },
                 "natural/water/reservoir": {
-                    "name": "Reservatório de água",
-                    "terms": "Reservatório, artificial,água,acumulação,depósito"
+                    "name": "Reservatório hidrográfico",
+                    "terms": "artificial,água,acumulação,depósito,lago artificial"
                 },
                 "natural/water/river": {
                     "name": "Área de rio",
@@ -8463,7 +8536,7 @@
                 },
                 "place/square": {
                     "name": "Praça ou largo",
-                    "terms": "Square, Praceta, Largo, Terreiro,praça pequena"
+                    "terms": "square, praceta,largo,terreiro,praça pequena"
                 },
                 "place/suburb": {
                     "name": "Subúrbio",
@@ -8547,6 +8620,9 @@
                 "power": {
                     "name": "Energia"
                 },
+                "power/cable": {
+                    "name": "Cabo de tensão subterrâneo"
+                },
                 "power/cable/underground": {
                     "name": "Cabo de eletricidade subterrâneo",
                     "terms": "elétrico,subterrâneo,eletricidade,tensão,voltagem,subsolo"
@@ -8843,6 +8919,10 @@
                     "name": "Monocarril",
                     "terms": "monorail, mono-carril,carris,transportes públicos,linha férrea,caminhos-de-ferro,caminho-de-ferro,caminhos de ferro"
                 },
+                "railway/monorail/hanging": {
+                    "name": "Monocarril suspenso",
+                    "terms": "ferrovia,caminho-de-ferro,caminho de ferro,linha férrea,suspensão,carril"
+                },
                 "railway/narrow_gauge": {
                     "name": "Ferrovia de bitola estreita",
                     "terms": "Narrow Gauge Rail,Bitola Estreita,Via Métrica,Bitola Métrica,carris,linha férrea,minas,caminhos-de-ferro,caminho-de-ferro,caminho de ferro"
@@ -8850,6 +8930,10 @@
                 "railway/platform": {
                     "name": "Plataforma ferroviária"
                 },
+                "railway/preserved": {
+                    "name": "Ferrovia preservada",
+                    "terms": "ferrovia,caminho-de-ferro,caminho de ferro,linha férrea,comboio histórico,comboio turísitico"
+                },
                 "railway/rail": {
                     "name": "Ferrovia",
                     "terms": "Rail, Linha Férrea, Caminho de ferro, Caminhos de ferro, Carril, Carris, via férrea, estrada-de-ferro, ferrovia, caminho-de-ferro,comboios"
@@ -8952,7 +9036,7 @@
                     "terms": "eletrodoméstico,electrodoméstico,frigorífico,máquinas,fogão,fogões,ar condicionado,aparelhos"
                 },
                 "shop/art": {
-                    "name": "Loja de objetos de arte",
+                    "name": "Loja de artigos de arte",
                     "terms": "artesanato,decoração,objetos artísticos,objetos decorativos,quadros,pintura,arte"
                 },
                 "shop/baby_goods": {
@@ -9193,9 +9277,6 @@
                     "name": "Loja de artigos de pesca",
                     "terms": "artigos de pesca, artigos para pescar, pesca, peixe, pescar, anzol, anzóis, ansol, ansóis, engodo, linha de pesca, sediela, cana, carreto"
                 },
-                "shop/fishmonger": {
-                    "name": "Peixaria"
-                },
                 "shop/flooring": {
                     "name": "Loja de material de pavimentação",
                     "terms": "revestimento,pavimento,ladrilho,soalho,piso,soalhar,madeira,ripas,verniz"
@@ -9210,7 +9291,7 @@
                 },
                 "shop/frozen_food": {
                     "name": "Loja de comida congelada",
-                    "terms": "comida congelada, congelado, congelados, congelada, comida, alimento"
+                    "terms": "comida congelada,congelados,congelada,comida,alimentos"
                 },
                 "shop/fuel": {
                     "name": "Loja de combustíveis",
@@ -9220,9 +9301,6 @@
                     "name": "Agência funerária",
                     "terms": "Funeral,casa funerária,agência mortuária, casa mortuária,cangalheiro"
                 },
-                "shop/furnace": {
-                    "name": "Loja de fornos"
-                },
                 "shop/furniture": {
                     "name": "Loja de mobiliário",
                     "terms": "Loja de Móveis, Mobiliário, Mobiliários, Mobílias, Mobília, Móvel, Móveis, Sofá, Cama"
@@ -9284,7 +9362,7 @@
                     "terms": "modelos,passatempo,hobby,aviões,carros,comboios,helicópteros"
                 },
                 "shop/houseware": {
-                    "name": "Loja de artigos para a casa",
+                    "name": "Loja de artigos para o lar",
                     "terms": "houseware,utensílios domésticos,artigos para o lar,artigos para casa,utensílios,cozinha,decoração"
                 },
                 "shop/hunting": {
@@ -9460,7 +9538,7 @@
                     "terms": "scuba,mergulho,desporto,desportivo,água,garrafa,pesca submarina"
                 },
                 "shop/seafood": {
-                    "name": "Peixaria",
+                    "name": "Loja de marisco",
                     "terms": "seafood,camarão,lagosta,caranguejo,ameijoas,mexilhões,peixes,polvo,lulas,peixe fresco,congelados"
                 },
                 "shop/second_hand": {
@@ -9598,6 +9676,10 @@
                     "name": "Centro de processamento de dados",
                     "terms": "data center,centro de dados,servidores,nuvem,telecomunicações,IT,TI,armazenamento de dados"
                 },
+                "telecom/exchange": {
+                    "name": "Concentrador telefónico",
+                    "terms": "telecomunicação,telecomunicações,telefone,rede telefónica"
+                },
                 "tourism": {
                     "name": "Turismo"
                 },
@@ -9956,6 +10038,10 @@
                     "name": "Rota de elétrico",
                     "terms": "tram,elétrico,Rota de Caminhos de Ferro,carris,linha férrea,caminhos-de-ferro,caminho-de-ferro,caminhos de ferro,eletricidade,eléctrico,bonde"
                 },
+                "type/route/trolleybus": {
+                    "name": "Rota de tróleibus",
+                    "terms": "trolleybus, tróleibus, trólebus, tróleicarro, trólei"
+                },
                 "type/route_master": {
                     "name": "Rede de rotas",
                     "terms": "route master, rota mestre, rede de rotas, redes, rotas, várias rotas, família de rotas, conjunto de rotas"
@@ -10302,6 +10388,13 @@
                 "description": "O mapa da cidade é um mapa síntese que descreve Gotemburgo. Contém informação geral sobre o solo, as comunicações, a hidrografia, os edifícios, os números de polícia e os nomes das ruas, a divisão administrativa e outros textos de orientação.",
                 "name": "Mapa da Cidade de Gotemburgo"
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© Município de Gotemburgo, CC0"
+                },
+                "description": "Ortofotos para o município de Gotemburgo",
+                "name": "Ortofotos de Gotemburgo"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI Japão"
@@ -10469,6 +10562,12 @@
                 },
                 "name": "Thunderforest Landscape"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Maps © Thunderforest, Data © contribuidores OpenStreetMap"
+                },
+                "name": "Thunderforest Outdoors"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -10510,6 +10609,12 @@
                 },
                 "description": "Rede rodoviária sueca NVDB com várias opções de camadas de mapa",
                 "name": "Opções da Rede Rodoviária Trafikverket"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Município de Breslávia"
+                },
+                "name": "Breslávia: Ortofotomapa 2018 (imagens aéreas)"
             }
         },
         "community": {
@@ -10549,6 +10654,10 @@
                 "name": "OpenStreetMap Galiza no Twitter",
                 "description": "Segue-nos no Twitter em {url}"
             },
+            "Galicia-Xeoinquedos-Twitter": {
+                "name": "Geoinquetos no Twitter",
+                "description": "Segue-nos no Twitter em {url}"
+            },
             "GeoPhilly": {
                 "name": "GeoPhilly",
                 "description": "Encontro para entusiastas do mapa na área de Filadélfia",
@@ -10583,7 +10692,7 @@
             },
             "MaptimeHRVA-twitter": {
                 "name": "MaptimeHRVA Twitter",
-                "description": "Siga-nos no Twitter em {url}"
+                "description": "Segue-nos no Twitter em {url}"
             },
             "Nottingham-OSM-pub-meetup": {
                 "name": "East Midlands (Nottingham) Encontro mensal num pubs",
@@ -10616,7 +10725,7 @@
             },
             "OSM-AR-twitter": {
                 "name": "OpenStreetMap Argentina Twitter",
-                "description": "Siga-nos no Twitter em {url}",
+                "description": "Segue-nos no Twitter em {url}",
                 "extendedDescription": "Notícias da comunidade local e OpenStreetMap em geral."
             },
             "OSM-Asia-mailinglist": {
@@ -10675,7 +10784,7 @@
             },
             "OSM-CL-twitter": {
                 "name": "Twitter OpenStreetMap Chile",
-                "description": "Siga-nos no Twitter em {url}"
+                "description": "Segue-nos no Twitter em {url}"
             },
             "OSM-CN-telegram": {
                 "name": "Grupo Telegram do OpenStreetMap China",
@@ -10700,7 +10809,7 @@
             },
             "OSM-CO-twitter": {
                 "name": "Twitter OpenStreetMap Colômbia ",
-                "description": "Siga-nos no Twitter em {url}"
+                "description": "Segue-nos no Twitter em {url}"
             },
             "OSM-CU-telegram": {
                 "name": "OSM Cuba no Telegram",
@@ -10726,7 +10835,7 @@
             },
             "OSM-Discord": {
                 "name": "OpenStreetMap Discord",
-                "description": "Entre em contacto com outros mapeadores via Discord"
+                "description": "Entra em contacto com outros mapeadores via Discord."
             },
             "OSM-EC-telegram": {
                 "name": "OSM Equador no Telegram",
@@ -10742,7 +10851,7 @@
             },
             "OSM-Facebook": {
                 "name": "OpenStreetMap no Facebook",
-                "description": "Faça Gosto no Facebook para novidades e actualizações do OpenStreetMap."
+                "description": "Visita-nos no Facebook para obteres novidades e actualizações sobre o OpenStreetMap."
             },
             "OSM-IDN-facebook": {
                 "name": "OpenStreetMap Indonésia",
@@ -10751,7 +10860,7 @@
             },
             "OSM-IRC": {
                 "name": "OpenStreetMap IRC",
-                "description": "Junte-se ao #osm em irc.oftc.net (porta 6667)"
+                "description": "Junta-te ao #osm em irc.oftc.net (porta 6667)"
             },
             "OSM-India-Puducherry-Facebook": {
                 "name": "Movimento de Hardware de Software Livre - Facebook",
@@ -10835,7 +10944,7 @@
             },
             "OSM-PE-twitter": {
                 "name": "OpenStreetMap Peru Twitter",
-                "description": "Siga-nos no Twitter em {url}"
+                "description": "Segue-nos no Twitter em {url}"
             },
             "OSM-PH-facebook": {
                 "name": "OpenStreetMap PH Facebook",
@@ -10890,7 +10999,7 @@
             },
             "OSM-Reddit": {
                 "name": "OpenStreetMap no Reddit",
-                "description": "/r/openstreetmap/ é um ótimo lugar para aprender mais sobre o OpenStreetMap. Pergunte-nos qualquer coisa!"
+                "description": "/r/openstreetmap/ é um ótimo lugar para aprender mais sobre o OpenStreetMap. Pergunta-nos qualquer coisa!"
             },
             "OSM-Rome-meetup": {
                 "name": "Encontro Mappatori Romani",
@@ -10943,11 +11052,11 @@
             },
             "OSM-Telegram": {
                 "name": "Telegram do OpenStreetMap",
-                "description": "Junte-se ao grupo de Telegram Global do OpenStreetMap em {url}"
+                "description": "Junta-te ao canal Telegram Global do OpenStreetMap em {url}"
             },
             "OSM-Twitter": {
                 "name": "OpenStreetMap Twitter",
-                "description": "Siga-nos no Twitter em {url}"
+                "description": "Segue-nos no Twitter em {url}"
             },
             "OSM-US": {
                 "name": "OpenStreetMap US",
@@ -10983,12 +11092,12 @@
             },
             "OSM-br-twitter": {
                 "name": "OpenStreetMap Brasil no Twitter",
-                "description": "Siga-nos no Twitter em {url}"
+                "description": "Segue-nos no Twitter em {url}"
             },
             "OSM-help": {
                 "name": "Ajuda OpenStreetMap",
-                "description": "Faça uma pergunta e obtenha respostas no site de perguntas e respostas conduzidas pela comunidade da OSM.",
-                "extendedDescription": "{url} é para todos aqueles que necessitam de ajuda com o OpenStreetMap. Se é um novato ou uma questão técnica, estamos aqui para ajudar!"
+                "description": "Deixa as tuas dúvidas no sítio de perguntas e respostas conduzidas pela comunidade OSM.",
+                "extendedDescription": "{url} é para todos aqueles que precisam de ajuda com o OpenStreetMap. Se és um novato ou tens uma questão técnica, estamos aqui para ajudar!"
             },
             "OSM-india-mailinglist": {
                 "name": "Lista de Discussão do OpenStreetMap na Índia",
@@ -11006,6 +11115,10 @@
                 "name": "Lista de Discussão do OpenStreetMap Japão",
                 "description": "Talk-ja é a lista de discussão oficial para a comunidade japonesa"
             },
+            "OSM-japan-slack": {
+                "name": "Slack do OpenStreetMap Japão",
+                "description": "Um espaço de trabalho Slack para a comunidade OSM do Japão {signupUrl}"
+            },
             "OSM-japan-twitter": {
                 "name": "OpenStreetMap Japão Twitter",
                 "description": "Hashtag no Twitter: {url}"
@@ -11022,7 +11135,7 @@
             "OSMF": {
                 "name": "Fundação OpenStreetMap",
                 "description": "OSMF é uma organização sem fins lucrativos sediada no Reino Unido que apoia o projeto OpenStreetMap",
-                "extendedDescription": "A OSMF suporta o OpenStreetMap na captação de recursos, mantendo os servidores do o OSM, organizando a conferência anual do State Of The Map e coordenando os voluntários que mantêm o OSM a funcionar. Pode mostrar o seu apoio e ter uma voz na direção do OpenStreetMap, tornando-se membro da OSMF aqui: {signupUrl}",
+                "extendedDescription": "A OSMF suporta o OpenStreetMap na captação de recursos, mantendo os servidores do o OSM, organizando a conferência anual do State Of The Map e coordenando os voluntários que mantêm o OSM a funcionar. Podes mostrar o teu apoio e ter uma voz na direção do OpenStreetMap, inscrevendo-te como membro da OSMF aqui: {signupUrl}",
                 "events": {
                     "sotm2020": {
                         "name": "State of the Map 2020",
@@ -11042,7 +11155,7 @@
             },
             "PHXGeo-twitter": {
                 "name": "PHXGeo Twitter",
-                "description": "Siga-nos no Twitter em {url}"
+                "description": "Segue-nos no Twitter em {url}"
             },
             "RS-telegram": {
                 "name": "Grupo Telegram OpenStreetMap Rio Grande do Sul",
@@ -11128,6 +11241,13 @@
                 "name": "Twitter OpenStreetMap Bélgica",
                 "description": "OSM Bélgica no Twitter: @osm_be"
             },
+            "bg-forum": {
+                "name": "Fórum do OpenStreetMap Bulgária",
+                "description": "Fórum da comunidade búlgara do OpenStreetMap"
+            },
+            "bi-vc-cvl_wiki": {
+                "extendedDescription": "Além dos encontros mensais, também temos um grupo WhatsApp."
+            },
             "bw-facebook": {
                 "name": "A mapear o Botsuana no Facebook",
                 "description": "Página do OpenStreetMap no Botsuana"
@@ -11145,7 +11265,15 @@
                 "description": "Segue-nos no Twitter: {url}",
                 "extendedDescription": "Esta é a descrição oficial do capítulo Youth Mappers da Universidade de Cape Coast, no Gana. adoramos mapas, os dados abertos e ajudar os mais vulneráveis."
             },
+            "ch-irc": {
+                "name": "IRC do OpenStreetMap Suíça",
+                "description": "Junta-te ao #osm-ch em irc.oftc.net (porta 6667)"
+            },
+            "ch-mailinglist": {
+                "description": "Mailing list para a Suíça"
+            },
             "ch-twitter": {
+                "name": "Twitter do OpenStreetMap Suíça",
                 "description": "Segue-nos no Twitter: {url}"
             },
             "czech-community": {
@@ -11183,6 +11311,14 @@
                 "name": "Lista de Discussão Talk-de",
                 "description": "Talk-de é a lista de discussão oficial para a comunidade alemã OSM"
             },
+            "de-mv-mailinglist": {
+                "name": "Mailing List de Mecklenburg-Vorpommern",
+                "description": "Esta é a mailing list da comunidade OSM de Mecklenburg-Vorpommern"
+            },
+            "de-mv-twitter": {
+                "name": "Twitter da comunidade OpenStreetMap de Mecklenburg-Vorpommern",
+                "description": "Segue-nos no Twitter:  {url}"
+            },
             "de-ostwestfalen-lippe-mailinglist": {
                 "name": "Lista de correspondência de OWL",
                 "description": "Esta é a lista de discussão para a comunidade OSM Ostwestfalen-Lippe"
@@ -11204,8 +11340,12 @@
                 "description": "Uma lista de discussão para discutir o OpenStreetMap na Dinamarca"
             },
             "es-twitter": {
+                "name": "Twitter do OpenStreetMap Espanha",
                 "description": "Segue-nos no Twitter em {url}"
             },
+            "et-telegram": {
+                "description": "Grupo Telegram do OpenStreetMap Etiópia"
+            },
             "fi-forum": {
                 "name": "Fórum OpenStreetMap FI",
                 "description": "Fórum da web do OpenStreetMap Finlândia"
@@ -11234,6 +11374,10 @@
                 "name": "Lista de Discussão Talk-fr",
                 "description": "Lista de Discussão Talk-fr"
             },
+            "fr-telegram": {
+                "name": "OpenStreetMap França no Telegram",
+                "description": "Um grupo Telegram para a comunidade francesa do OSM: {url}"
+            },
             "fr-twitter": {
                 "name": "OpenStreetMap França no Twitter",
                 "description": "OpenStreetMap França no Twitter: {url}"
@@ -11250,6 +11394,10 @@
                 "name": "Grupo do Facebook do OpenStreetMap Croácia",
                 "description": "Grupo do Facebook do OpenStreetMap Croácia"
             },
+            "hr-forum": {
+                "name": "Fórum OSM Croácia",
+                "description": "Fórum da Comunidade OSM da Croácia"
+            },
             "hr-irc": {
                 "name": "OpenStreetMap Croácia no IRC",
                 "description": "Junte-se ao # osm-hr em irc.freenode.org (porta 6667)"
@@ -11258,6 +11406,10 @@
                 "name": "Lista de discussão do Talk-hr",
                 "description": "Lista de discussão Talk-hr"
             },
+            "hr-wiki": {
+                "name": "Wikiproject do OpenStreetMap Croácia",
+                "description": "Página Wikiproject da Comunidade Croata"
+            },
             "hu-facebook": {
                 "name": "OpenStreetMap HU no Facebook",
                 "description": "Mapeadores e OpenStreetMap Facebook na Hungria"
@@ -11310,7 +11462,7 @@
             },
             "it-twitter": {
                 "name": "Twitter OpenStreetMap Itália",
-                "description": "Siga-nos no Twitter em {url}"
+                "description": "Segue-nos no Twitter em {url}"
             },
             "kazakhstan-telegram": {
                 "name": "OSM Cazaquistão no Telegram",
@@ -11362,6 +11514,10 @@
                 "name": "OpenStreetMap Gana no Twitter",
                 "description": "Segue-nos no Twitter: {url}"
             },
+            "osm-hr": {
+                "name": "OpenStreetMap Croácia",
+                "description": "A plataforma para informação sobre o OpenStreetMap na Croácia"
+            },
             "osm-india-forum": {
                 "name": "Fórum do OpenStreetMap na Índia",
                 "description": "Web fórum do OpenStreetMap Índia"
@@ -11425,11 +11581,11 @@
             },
             "pt-mailinglist": {
                 "name": "Mailing List Talk-pt",
-                "description": "Talk-pt faz parte da mailing list oficial para a comunidade portuguesa do OSM"
+                "description": "Talk-pt é a mailing list oficial para a comunidade portuguesa do OSM."
             },
             "pt-telegram": {
                 "name": "OpenStreetMap Portugal no Telegram",
-                "description": "Grupo do Telegram da comunidade Portuguesa do OpenStreetMap {url}"
+                "description": "Canal Telegram da comunidade portuguesa do OpenStreetMap {url}"
             },
             "se-facebook": {
                 "name": "OpenStreetMap Suécia no Facebook",
@@ -11449,7 +11605,7 @@
             },
             "se-twitter": {
                 "name": "OpenStreetMap Suécia no Twitter",
-                "description": "Siga-nos no Twitter: {url}"
+                "description": "Segue-nos no Twitter em {url}"
             },
             "si-forum": {
                 "name": "Fórum do OpenStreetMap Eslovénia",

vendor/assets/iD/iD/locales/ro.json

@@ -322,7 +322,6 @@
             "title": "Încarcă în OpenStreetMap",
             "save": "Încarcă",
             "cancel": "Renunță",
-            "changes": "{count} Modificări",
             "warnings": "Atenționări",
             "modified": "Modificat",
             "deleted": "Șters",
@@ -1098,9 +1097,6 @@
                         "yes": "Da (nespecificat)"
                     }
                 },
-                "elevation": {
-                    "label": "Elevație"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "example@example.com"
@@ -1218,7 +1214,6 @@
                     "label": "Inscripție"
                 },
                 "internet_access": {
-                    "label": "Acces internet",
                     "options": {
                         "no": "Nu",
                         "terminal": "Terminal",
@@ -1227,9 +1222,6 @@
                         "yes": "Da"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Acces Internet Gratuit"
-                },
                 "kerb": {
                     "label": "Curbură"
                 },
@@ -1636,9 +1628,6 @@
                 "advertising/billboard": {
                     "name": "Billboard"
                 },
-                "aerialway/gondola": {
-                    "name": "Gondolă"
-                },
                 "aerialway/mixed_lift": {
                     "name": "Lift Mixat"
                 },
@@ -1807,9 +1796,6 @@
                 "amenity/recycling_centre": {
                     "name": "Centru de Reciclare"
                 },
-                "amenity/register_office": {
-                    "name": "Oficiu de Registrare"
-                },
                 "amenity/restaurant": {
                     "name": "Restaurant"
                 },
@@ -1822,9 +1808,6 @@
                 "amenity/studio": {
                     "name": "Studio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Piscină"
-                },
                 "amenity/taxi": {
                     "name": "Stand de Taxi"
                 },
@@ -2149,9 +2132,6 @@
                 "junction": {
                     "name": "Juncție"
                 },
-                "landuse/allotments": {
-                    "name": "Grădină Comunitară"
-                },
                 "landuse/aquaculture": {
                     "name": "Acvacultură"
                 },
@@ -2203,15 +2183,9 @@
                 "landuse/military/naval_base": {
                     "name": "Bază Navală"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Curs cu Obstacole"
-                },
                 "landuse/military/range": {
                     "name": "Gamă Militară"
                 },
-                "landuse/military/training_area": {
-                    "name": "Zonă de Training"
-                },
                 "landuse/residential": {
                     "name": "Zonă Rezidențială"
                 },
@@ -2551,30 +2525,12 @@
                 "railway/disused": {
                     "name": "Cale Ferată Învechită"
                 },
-                "railway/funicular": {
-                    "name": "Frânghie"
-                },
                 "railway/level_crossing": {
                     "name": "Traversare de Cale Ferată (Stradă)"
                 },
-                "railway/monorail": {
-                    "name": "Monoșină"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Cale Ferată Îngustă"
-                },
-                "railway/rail": {
-                    "name": "Șină"
-                },
-                "railway/subway": {
-                    "name": "Metrou"
-                },
                 "railway/subway_entrance": {
                     "name": "Intrare Metrou"
                 },
-                "railway/tram": {
-                    "name": "Tranvai"
-                },
                 "relation": {
                     "name": "Relație"
                 },

vendor/assets/iD/iD/locales/ru.json

@@ -8,7 +8,10 @@
             "zoom_to": "Приблизить к",
             "copy": "Копировать",
             "view_on": "смотреть на {domain}",
-            "favorite": "избранное"
+            "favorite": "избранное",
+            "list": "список",
+            "text": "текст",
+            "deselect": "отменить выделение"
         },
         "toolbar": {
             "inspect": "Исследовать",
@@ -104,7 +107,15 @@
             },
             "circularize": {
                 "title": "Скруглить",
-                "key": "O"
+                "description": {
+                    "single": "Превратить объект в окружность.",
+                    "multiple": "Превратить объекты в окружности."
+                },
+                "key": "O",
+                "annotation": {
+                    "single": "Объект превращен в окружность.",
+                    "multiple": "Объекты превращены в окружности."
+                }
             },
             "orthogonalize": {
                 "title": "Выпрямить углы",
@@ -529,7 +540,7 @@
             "request_review": "Прошу кого-нибудь проверить мои изменения.",
             "save": "Сохранить",
             "cancel": "Отменить",
-            "changes": "Правок: {count}",
+            "changes": "Изменения ({count})",
             "download_changes": "Скачать osmChange файл",
             "errors": "Ошибки",
             "warnings": "Предупреждения",
@@ -622,16 +633,18 @@
         },
         "inspector": {
             "zoom_to": {
-                "key": "Z",
-                "title": "Приблизить объект",
-                "tooltip_feature": "Отцентрировать и приблизить карту, чтобы сфокусироваться на эту особенность.",
-                "tooltip_note": "Отцентрировать и приблизить карту, чтобы сфокусироваться на эту заметку.",
-                "tooltip_data": "Отцентрировать и приблизить карту, чтобы сфокусироваться на эти данные.",
-                "tooltip_issue": "Отцентрировать и приблизить карту, чтобы сфокусироваться на эту проблему."
+                "key": "Z"
             },
             "show_more": "Ещё",
             "view_on_osm": "Посмотреть на openstreetmap.org",
+            "view_on_osmose": "Посмотреть на osmose.openstreetmap.fr",
             "view_on_keepRight": "Посмотреть на keepright.at",
+            "feature_type": "Тип объекта",
+            "fields": "Поля",
+            "tags_count": "Теги ({count})",
+            "members_count": "Участники ({count})",
+            "relations_count": "Отношения ({count})",
+            "features_count": "Объекты ({count})",
             "add_to_relation": "Добавить к отношению",
             "new_relation": "Новое отношение…",
             "choose_relation": "Выберите родительское отношение",
@@ -642,16 +655,21 @@
             "edit_reference": "изменить/перевести",
             "wiki_reference": "Посмотреть документацию",
             "wiki_en_reference": "Посмотреть документацию на Английском",
+            "key_value": "ключ=значение",
+            "multiple_values": "Несколько значений",
+            "multiple_types": "Несколько типов",
             "hidden_preset": {
                 "manual": "{features} скрыто. Включите их на панели картографических данных.",
                 "zoom": "{features} скрыто. Приблизить для их отображения."
             },
+            "back_tooltip": "Изменить тип объекта",
             "remove": "Удалить",
             "search": "Поиск",
             "unknown": "Неизвестно",
             "incomplete": "<не скачано>",
             "feature_list": "Поиск объектов",
             "edit": "Редактировать объект",
+            "edit_features": "Редактировать объекты",
             "check": {
                 "yes": "Да",
                 "no": "Нет",
@@ -722,10 +740,16 @@
                     "zoom": "Приблизиться к данным"
                 }
             },
+            "style_options": "Настройки стиля",
             "map_features": "Объекты на карте",
             "autohidden": "Эти объекты были автоматически скрыты, чтобы не загромождать карту на экране. Чтобы их редактировать, приблизьте карту.",
             "osmhidden": "Эти объекты были автоматически скрыты, потому что слой OpenStreetMap сейчас скрыт."
         },
+        "visual_diff": {
+            "highlight_edits": {
+                "description": "Выделить изменения"
+            }
+        },
         "photo_overlays": {
             "title": "Наложение фотографий",
             "traffic_signs": {
@@ -827,7 +851,6 @@
             "custom_background": {
                 "tooltip": "Отредактировать пользовательское фоновое изображение",
                 "header": "Настройки пользовательского фонового изображения",
-                "instructions": "Введите шаблон URL с тайлами. Корректные токены:\n   {zoom} или {z}, {x}, {y} для схемы тайлов вида Z/X/Y\n   {-y} или {ty} для перевёрнутых Y координат в TMS стиле\n   {u} для quadtile схемы\n   {switch:a,b,c} для мультиплексирования DNS-сервера\n\nПример:\n{example}",
                 "template": {
                     "placeholder": "Введите URL шаблона"
                 }
@@ -846,6 +869,17 @@
                 }
             }
         },
+        "preferences": {
+            "title": "Настройки",
+            "description": "Настройки",
+            "privacy": {
+                "title": "Конфиденциальность",
+                "privacy_link": "Посмотреть политику конфиденциальности iD",
+                "third_party_icons": {
+                    "description": "Показать значки сторонних производителей"
+                }
+            }
+        },
         "restore": {
             "heading": "У вас есть несохранённые правки",
             "description": "Вы хотите восстановить несохранённые изменения с прошлого сеанса?",
@@ -912,6 +946,8 @@
         "splash": {
             "welcome": "Вас приветствует iD — редактор карт OpenStreetMap",
             "text": "Редактор iD — простой, но мощный инструмент для редактирования лучшей в мире бесплатной открытой карты. Версия программы: {version}. Дополнительную информацию смотрите на {website}, об ошибках сообщайте на {github}.",
+            "privacy_update": "Наша политика конфиденциальности была недавно обновлена.",
+            "privacy_policy": "Политика конфиденциальности iD",
             "walkthrough": "Начать обучение",
             "start": "Начать редактировать"
         },
@@ -928,13 +964,12 @@
             "on_wiki": "{tag} в wiki.osm.org",
             "used_with": "ставится на {type}"
         },
-        "zoom": {
-            "in": "Приблизить",
-            "out": "Отдалить"
-        },
         "cannot_zoom": "В текущем режиме дальнейшее отдаление невозможно.",
         "full_screen": "Во весь экран",
         "QA": {
+            "osmose": {
+                "elems_title": "Объекты"
+            },
             "improveOSM": {
                 "geometry_types": {
                     "path": "Пути",
@@ -968,8 +1003,11 @@
                 "detail_description": "Описание",
                 "comment": "Комментарий",
                 "comment_placeholder": "Введите комментарий для других пользователей",
+                "close": "Закрыть (проблема решена)",
+                "ignore": "Удалить (ложное срабатывание)",
                 "save_comment": "Сохранить комментарий",
                 "close_comment": "Закрыть с комментарием",
+                "ignore_comment": "Удалить и прокомментировать",
                 "error_parts": {
                     "this_node": "эту точку",
                     "this_way": "эту линию",
@@ -1161,6 +1199,9 @@
                     "298": {
                         "title": "Избыточное ограничение - односторонняя дорога"
                     },
+                    "300": {
+                        "title": "Пропущена максимальная скорость"
+                    },
                     "310": {
                         "title": "Проблема кольцевой развязки"
                     },
@@ -1207,6 +1248,26 @@
         "mapillary_images": {
             "tooltip": "Уличные фото и панорамы от Mapillary"
         },
+        "mapillary_map_features": {
+            "title": "Объекты на карте",
+            "tooltip": "Объекты на карте из Mapillary",
+            "request_data": "Запрос данных",
+            "object": {
+                "cctv_camera": "CCTV камера",
+                "fire_hydrant": "пожарный кран",
+                "mailbox": "почтовый ящик",
+                "manhole": "люк",
+                "phone_booth": "телефонная будка",
+                "sign": {
+                    "advertisement": "реклама",
+                    "information": "информационный знак",
+                    "store": "знак магазина"
+                },
+                "street_light": "уличный фонарь",
+                "traffic_cone": "дорожный конус",
+                "trash_can": "урна для мусора"
+            }
+        },
         "mapillary": {
             "title": "Mapillary",
             "signs": {
@@ -1259,8 +1320,7 @@
                 "before_start_h": "Прежде чем начать",
                 "before_start": "Вам следует немного разобраться в OpenStreetMap и в этом редакторе перед тем, как начать вносить изменения. iD содержит пошаговый учебник, чтобы обучить вас основам редактирование OpenStreetMap. Выберите \"Начать обучение\" на экране — это займет всего лишь 15 минут.",
                 "open_source_h": "Открытый исходный код",
-                "open_source": "Редактор iD — коллективный проект с открытым исходным кодом, используемая здесь версия {version}. Исходный код доступен [на GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Вы можете помочь iD [переводя его](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) или [сообщая об ошибках](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "Редактор iD — коллективный проект с открытым исходным кодом, используемая здесь версия {version}. Исходный код доступен [на GitHub](https://github.com/openstreetmap/iD)."
             },
             "overview": {
                 "title": "Основное",
@@ -1472,15 +1532,18 @@
             "rules": {
                 "title": "Правила"
             },
+            "user_resolved_issues": "Проблемы, исправленные вашими правками",
             "warnings_and_errors": "Предупреждения и ошибки",
             "no_issues": {
                 "message": {
                     "everything": "Всё выглядит хорошо",
                     "everything_in_view": "При просмотре всё выглядит хорошо",
                     "edits": "Ваши изменения выглядят хорошо",
-                    "edits_in_view": "При просмотре ваши изменения выглядят хорошо"
+                    "edits_in_view": "При просмотре ваши изменения выглядят хорошо",
+                    "no_edits": "Вы ничего не изменили…"
                 },
                 "hidden_issues": {
+                    "none": "Обнаруженные проблемы появятся здесь",
                     "elsewhere": "Проблемы в другом месте: {count}",
                     "everything_else": "Проблемы со всем остальным: {count}",
                     "everything_else_elsewhere": "Проблемы в другом месте со всем остальным: {count}",
@@ -1502,8 +1565,12 @@
                     "all": "Везде"
                 }
             },
+            "suggested": "Предлагаемые обновления:",
             "enable_all": "Включить все",
             "disable_all": "Отключить все",
+            "fix_one": {
+                "title": "исправлено"
+            },
             "fix_all": {
                 "title": "Исправить все"
             },
@@ -1517,7 +1584,10 @@
             },
             "crossing_ways": {
                 "title": "Пересечения путей",
-                "message": "{feature} пересекает {feature2} "
+                "message": "{feature} пересекает {feature2} ",
+                "waterway-waterway": {
+                    "reference": "Пересекающиеся водные пути должны быть объединены или используйте для их пересечений тоннели"
+                }
             },
             "disconnected_way": {
                 "title": "Разъединены линии"
@@ -1528,13 +1598,28 @@
             "help_request": {
                 "title": "Запросы помощи"
             },
+            "invalid_format": {
+                "title": "Некорректное форматирование",
+                "email": {
+                    "reference": "Электронный адрес должен выглядеть так \"user@example.com\"."
+                }
+            },
             "missing_role": {
                 "title": "Пропущенные роли",
                 "tip": "Поиск отношений с пропущенными или некорректными ролями участников"
             },
             "missing_tag": {
                 "title": "Пропущенные теги",
-                "tip": "Поиск объектов, в которых пропущены описательные теги"
+                "tip": "Поиск объектов, в которых пропущены описательные теги",
+                "any": {
+                    "message": "{feature} не имеет тегов"
+                },
+                "descriptive": {
+                    "message": "{feature} не имеет описательных тегов"
+                },
+                "relation_type": {
+                    "message": "{feature} отношение без типа"
+                }
             },
             "outdated_tags": {
                 "title": "Устаревшие теги",
@@ -1546,6 +1631,13 @@
                     "message": "{feature} выглядит как бренд с нестандартными тегами"
                 }
             },
+            "private_data": {
+                "title": "Конфиденциальная информация",
+                "tip": "Найти объекты, содержащие конфиденциальную информацию"
+            },
+            "suspicious_name": {
+                "title": "Подозрительные имена"
+            },
             "impossible_oneway": {
                 "title": "Некорректное указание односторонних дорог"
             },
@@ -1553,6 +1645,14 @@
                 "message": "{feature} имеет непрямые углы"
             },
             "fix": {
+                "add_a_bridge": {
+                    "title": "Добавить мост",
+                    "annotation": "Добавлен мост."
+                },
+                "add_a_tunnel": {
+                    "title": "Добавить тоннель",
+                    "annotation": "Добавлен тоннель."
+                },
                 "connect_crossing_features": {
                     "annotation": "Соединить пересекающиеся объекты"
                 },
@@ -1574,12 +1674,22 @@
                 "delete_feature": {
                     "title": "Удалить этот объект"
                 },
+                "extract_point": {
+                    "title": "Извлечь в этой точке"
+                },
                 "ignore_issue": {
                     "title": "Пропустить эту проблему"
                 },
                 "merge_points": {
                     "title": "Объединить точки"
                 },
+                "move_tags": {
+                    "title": "Переместить теги",
+                    "annotation": "Перемещенные теги."
+                },
+                "remove_from_relation": {
+                    "title": "Убрать из отношения"
+                },
                 "remove_private_info": {
                     "annotation": "Удалить конфиденциальную информацию"
                 },
@@ -1909,7 +2019,8 @@
                     "fullscreen": "Перейти в полноэкранный режим",
                     "sidebar": "Переключить боковую панель",
                     "wireframe": "Переключить режим заливки полигонов",
-                    "minimap": "Переключить миникарту"
+                    "minimap": "Переключить миникарту",
+                    "highlight_edits": "Подсветить несохранённые изменения"
                 },
                 "selecting": {
                     "title": "Выделение объектов",
@@ -1919,7 +2030,8 @@
                     "search": "Найти объекты, соответствующие поисковому запросу"
                 },
                 "with_selected": {
-                    "edit_menu": "Показать меню редактирования"
+                    "edit_menu": "Показать меню редактирования",
+                    "zoom_to": "Приблизить выделенные объекты"
                 },
                 "vertex_selected": {
                     "title": "Для выделенной точки",
@@ -1947,6 +2059,7 @@
                     "continue_line": "Продолжить линию в выделенной точке",
                     "merge": "Объединить выделенные объекты",
                     "disconnect": "Отсоединить объект в выделенной точке",
+                    "extract": "Извлечь точку из объекта",
                     "split": "Разрезать линию в выделенной точке",
                     "move": "Переместить выделенные объекты",
                     "rotate": "Повернуть выделенные объекты",
@@ -2104,7 +2217,10 @@
                 "addr/interpolation": {
                     "label": "Тип",
                     "options": {
-                        "all": "Все"
+                        "all": "Все",
+                        "alphabetic": "По алфавиту",
+                        "even": "Четные",
+                        "odd": "Нечетные"
                     }
                 },
                 "address": {
@@ -2165,7 +2281,7 @@
                     "placeholder": "500, 2500, 5000…"
                 },
                 "aerialway/duration": {
-                    "label": "Продолжительность (минут)",
+                    "label": "Продолжительность (минуты)",
                     "placeholder": "1, 2, 3…"
                 },
                 "aerialway/heating": {
@@ -2222,6 +2338,14 @@
                 "attraction": {
                     "label": "Тип"
                 },
+                "baby_feeding": {
+                    "label": "Место для грудного кормления",
+                    "options": {
+                        "no": "Нет",
+                        "room": "Выделенная комната",
+                        "yes": "Отмеченное место"
+                    }
+                },
                 "baby_seat": {
                     "label": "Сидение для младенцев"
                 },
@@ -2627,9 +2751,6 @@
                     },
                     "placeholder": "Контактная линия, электрифицированная линия…"
                 },
-                "elevation": {
-                    "label": "Высота над уровнем моря"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "example@example.com"
@@ -2870,7 +2991,6 @@
                     "label": "Непостоянный"
                 },
                 "internet_access": {
-                    "label": "Доступ в Интернет",
                     "options": {
                         "no": "Нет",
                         "terminal": "Терминал",
@@ -2879,9 +2999,6 @@
                         "yes": "Да"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Плата за доступ в Интернет"
-                },
                 "internet_access/ssid": {
                     "label": "Название WiFi-сети"
                 },
@@ -3995,10 +4112,6 @@
                     "name": "Горнолыжный подъемник",
                     "terms": "канатный подъемник"
                 },
-                "aerialway/gondola": {
-                    "name": "Гондола-кабина (по кругу)",
-                    "terms": "гондола, лодка"
-                },
                 "aerialway/goods": {
                     "name": "Торговая авиалиния",
                     "terms": "Воздушные перевозки,Карго,Авиаперевозки грузов"
@@ -4184,7 +4297,7 @@
                 },
                 "amenity/compressed_air": {
                     "name": "Сжатый воздух",
-                    "terms": "газ, воздух, сжатый"
+                    "terms": "Подкачка шин, компрессор, воздух"
                 },
                 "amenity/courthouse": {
                     "name": "Суд",
@@ -4318,6 +4431,10 @@
                 "amenity/parking/underground": {
                     "name": "Подземная парковка"
                 },
+                "amenity/parking_entrance": {
+                    "name": "Въезд в крытую парковку",
+                    "terms": "крытая парковка, въезд на парковку"
+                },
                 "amenity/parking_space": {
                     "name": "Отдельное парковочное место на парковке",
                     "terms": "парковочное место, отдельное парковочное место на стоянке"
@@ -4406,9 +4523,6 @@
                     "name": "Контейнер приёма вторичного сырья",
                     "terms": "вторсырьё, переработка, вторичное сырьё"
                 },
-                "amenity/register_office": {
-                    "name": "ЗАГС / регистраторы смерти и браков"
-                },
                 "amenity/restaurant": {
                     "name": "Ресторан",
                     "terms": "Ресторан"
@@ -4421,9 +4535,6 @@
                     "name": "Школа",
                     "terms": "школа, лицей, гимназия, СОШ"
                 },
-                "amenity/scrapyard": {
-                    "name": "Склад металлолома/свалка"
-                },
                 "amenity/shelter": {
                     "name": "Укрытие от непогоды",
                     "terms": "Укрытие, Навес, Защита от непогоды, Беседка"
@@ -4482,9 +4593,6 @@
                 "amenity/studio/radio": {
                     "name": "Радиостанция"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Бассейн (устаревший тег)"
-                },
                 "amenity/taxi": {
                     "name": "Стоянка такси",
                     "terms": "Стоянка такси"
@@ -5194,6 +5302,14 @@
                 "emergency/yes": {
                     "name": "Доступ экстренных служб разрешён"
                 },
+                "entrance": {
+                    "name": "Вход / выход",
+                    "terms": "вход, парадная, подъезд"
+                },
+                "entrance/emergency": {
+                    "name": "Эвакуационный выход",
+                    "terms": "эвакуация, аварийный выход"
+                },
                 "ford": {
                     "name": "Брод",
                     "terms": "Форд, Брод, Переправа"
@@ -5321,6 +5437,9 @@
                     "name": "Траволатор",
                     "terms": "пассажирский конвейер, движущийся тротуар, движущаяся дорожка, бегущая дорожка"
                 },
+                "highway/footway/crossing": {
+                    "name": "Пешеходный переход"
+                },
                 "highway/footway/marked": {
                     "name": "Пешеходный переход"
                 },
@@ -5423,8 +5542,8 @@
                     "terms": "Сервис не выходя из машины, Обслуживание не выходя из машины"
                 },
                 "highway/service/driveway": {
-                    "name": "Подъездная дорога",
-                    "terms": "Подъездная дорога, Подъезд к чему-либо"
+                    "name": "Проезд",
+                    "terms": "подъезд, проезд, заезд"
                 },
                 "highway/service/emergency_access": {
                     "name": "Проезд для экстренных служб",
@@ -5554,10 +5673,6 @@
                     "name": "Перекрёсток",
                     "terms": "перекресток, перекрёсток"
                 },
-                "landuse/allotments": {
-                    "name": "Садовые участки",
-                    "terms": "Участки садов и огородов, Сады и огороды, СОТ, СНТ, Дачи, огороды"
-                },
                 "landuse/aquaculture": {
                     "name": "Аквакультура",
                     "terms": "рыбная ферма, выращивание водных организмов, рыбоводство, ферма моллюсков, креветочная ферма, ферма устриц, устричная ферма"
@@ -5580,6 +5695,9 @@
                     "name": "Коммерческая застройка",
                     "terms": "магазины"
                 },
+                "landuse/construction": {
+                    "name": "Строительная площадка"
+                },
                 "landuse/farm": {
                     "name": "Сельскохозяйственные угодья (устаревший тег)"
                 },
@@ -5645,17 +5763,10 @@
                 "landuse/military/naval_base": {
                     "name": "Военно-морская база"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Полоса препятствий"
-                },
                 "landuse/military/range": {
                     "name": "Военный полигон",
                     "terms": "стрельбище, стрелковый полигон"
                 },
-                "landuse/military/training_area": {
-                    "name": "Испытательный военный полигон",
-                    "terms": "Полигон"
-                },
                 "landuse/orchard": {
                     "name": "Территория плодового сада",
                     "terms": "фруктовый сад, сад"
@@ -5948,6 +6059,9 @@
                     "name": "Волнорез",
                     "terms": "Мол, Оградительное гидросооружение"
                 },
+                "man_made/bridge": {
+                    "name": "Контур моста"
+                },
                 "man_made/bunker_silo": {
                     "name": "Силосная яма",
                     "terms": "бункер, хранилище, силос"
@@ -5979,10 +6093,6 @@
                     "name": "Газгольдер",
                     "terms": "Газовое хранилище"
                 },
-                "man_made/groyne": {
-                    "name": "Устройство для задержки гальки",
-                    "terms": "Волнорез, волнолом, буна"
-                },
                 "man_made/lighthouse": {
                     "name": "Маяк",
                     "terms": "маяк"
@@ -6228,7 +6338,7 @@
                     "terms": "Центр занятости, Биржа труда, Агентство по трудоустройству, агенство по найму"
                 },
                 "office/energy_supplier": {
-                    "name": "Поставщик топлива"
+                    "name": "Офис поставщика электроэнергии"
                 },
                 "office/estate_agent": {
                     "name": "Агентство недвижимости",
@@ -6581,54 +6691,25 @@
                     "name": "Заброшенная железная дорога",
                     "terms": "Неиспользуемая железнодорожная ветка"
                 },
-                "railway/funicular": {
-                    "name": "Фуникулёр",
-                    "terms": "фуникулёр, канатная дорога"
-                },
                 "railway/halt": {
                     "name": "Остановочный пункт (маленькая станция)"
                 },
                 "railway/level_crossing": {
                     "name": "Железнодорожный переезд"
                 },
-                "railway/light_rail": {
-                    "name": "Легкорельсовый транспорт"
-                },
                 "railway/milestone": {
                     "name": "Километровый знак (железнодорожный)",
                     "terms": "километровый столбик, столб, знак, железная дорога"
                 },
-                "railway/miniature": {
-                    "name": "Мини-железная дорога"
-                },
-                "railway/monorail": {
-                    "name": "Монорельс",
-                    "terms": "монорельсовая железная дорога, монорельс"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Узкоколейная железная дорога",
-                    "terms": "узкоколейная железная дорога, узкоколейка, узкоколейная ЖД"
-                },
                 "railway/platform": {
                     "name": "Железнодорожная платформа"
                 },
-                "railway/rail": {
-                    "name": "Рельсовый путь",
-                    "terms": "рельсы, вокзал, железнодорожный"
-                },
-                "railway/rail/highspeed": {
-                    "name": "Высокоскоростная железная дорога"
-                },
                 "railway/signal": {
                     "name": "Железнодорожная сигнализация"
                 },
                 "railway/station": {
                     "name": "Железнодорожная станция"
                 },
-                "railway/subway": {
-                    "name": "Метро",
-                    "terms": "Метро, Подземка, Метрополитен"
-                },
                 "railway/subway_entrance": {
                     "name": "Вход в метро",
                     "terms": "вход  в метро, вход в подземку"
@@ -6640,10 +6721,6 @@
                     "name": "Мойка для поездов/вагонов",
                     "terms": "мойка вагонов, мойка поездов"
                 },
-                "railway/tram": {
-                    "name": "Трамвайные пути",
-                    "terms": "трамвай"
-                },
                 "railway/tram_stop": {
                     "name": "Место остановки трамвая"
                 },
@@ -6688,6 +6765,9 @@
                     "name": "Алкогольный магазин",
                     "terms": "Вино-водочный магазин, горилка, пиво, пивной"
                 },
+                "shop/anime": {
+                    "name": "Магазин аниме / манги"
+                },
                 "shop/antiques": {
                     "name": "Магазин антиквариата",
                     "terms": "атниквариат"
@@ -6867,12 +6947,12 @@
                 "shop/fashion": {
                     "name": "Магазин модной брендовой одежды"
                 },
+                "shop/fashion_accessories": {
+                    "name": "Магазин модных аксессуаров"
+                },
                 "shop/fishing": {
                     "name": "Рыболовный магазин"
                 },
-                "shop/fishmonger": {
-                    "name": "Рыбный магазин"
-                },
                 "shop/florist": {
                     "name": "Цветочный магазин",
                     "terms": "Цветочный магазин, цветы, букет"
@@ -6885,9 +6965,6 @@
                     "name": "Бюро похоронных услуг",
                     "terms": "Бюро похоронных услуг, кремация, ритуальные услуги"
                 },
-                "shop/furnace": {
-                    "name": "Магазин систем отопления (устаревший тег)"
-                },
                 "shop/furniture": {
                     "name": "Мебельный магазин",
                     "terms": "Мебельный магазин"
@@ -6962,6 +7039,9 @@
                     "name": "Магазин кожаных изделий",
                     "terms": "кожа, кожаные куртки, кожаные, кожаная"
                 },
+                "shop/lighting": {
+                    "name": "Магазин светильников"
+                },
                 "shop/locksmith": {
                     "name": "Изготовление ключей",
                     "terms": "ключи, изготовление ключей"
@@ -6982,6 +7062,9 @@
                     "name": "Медицинские принадлежности",
                     "terms": "магазин, медицина, техника, оборудование, препараты, медицинские принадлежности"
                 },
+                "shop/military_surplus": {
+                    "name": "Армейский магазин"
+                },
                 "shop/mobile_phone": {
                     "name": "Магазин мобильных телефонов и аксессуаров",
                     "terms": "Салон сотовой связи, Продажа сотовых телефонов"
@@ -7025,6 +7108,9 @@
                     "name": "Магазин снаряжения для активного отдыха",
                     "terms": "палатки, GPS, туризм, скалолазание"
                 },
+                "shop/outpost": {
+                    "name": "Пункт выдачи интернет-магазина"
+                },
                 "shop/paint": {
                     "name": "Магазин красочных изделий",
                     "terms": "лаки, краски"
@@ -7270,6 +7356,9 @@
                     "name": "Музей",
                     "terms": "музей"
                 },
+                "tourism/museum/history": {
+                    "name": "Исторический музей"
+                },
                 "tourism/picnic_site": {
                     "name": "Место для пикника",
                     "terms": "Место для пикника, Поляна для пикника"
@@ -7726,6 +7815,11 @@
             }
         },
         "community": {
+            "Bahia-telegram": {
+                "name": "Telegram-чат OSM в Баия",
+                "description": "Присоединиться к сообществу OSM в Баия",
+                "extendedDescription": "Присоединиться к сообществу, чтобы узнать больше об OSM, задавать вопросы или участвовать в наших встречах. Всем добро пожаловать!"
+            },
             "Bay-Area-OpenStreetMappers": {
                 "description": "Улучшить перевод OpenStreetMap в Bay Area"
             },
@@ -7901,6 +7995,9 @@
             "osm-gh-twitter": {
                 "description": "Подписывайтесь на нас в Twitter {url}"
             },
+            "osm-india-website": {
+                "name": "OpenStreetMap Индия"
+            },
             "se-mailinglist": {
                 "name": "Список рассылки Talk-se"
             },

vendor/assets/iD/iD/locales/si.json

@@ -171,7 +171,6 @@
             "upload_explanation": "ඔබ ඇතුලත් කරන ලද වෙනස්කම් OpenStreetMap දත්ත බාවිතා කරන සියලු සිතියම් තුල දිස්වනු ඇත",
             "upload_explanation_with_user": "{user} වශයෙන් ඔබ ඇතුලත් කරන ලද වෙනස්කම් OpenStreetMap දත්ත බාවිතා කරන සියලු සිතියම් තුල දිස්වනු ඇත",
             "cancel": "අහෝසි කරන්න",
-            "changes": " වෙනස්කම් {count} ක් ",
             "warnings": "අනතුරු ඇගවීම්",
             "modified": "වෙනස් කරන ලදී",
             "deleted": "මකාදමන ලදී",

vendor/assets/iD/iD/locales/sk.json

@@ -280,7 +280,6 @@
             "request_review": "Chcem aby niekto skontroloval moje úpravy.",
             "save": "Nahrať",
             "cancel": "Zrušiť",
-            "changes": "{count} Zmien",
             "download_changes": "Stiahnuť osmChange súbor",
             "warnings": "Upozornenia",
             "modified": "Upravené",
@@ -1313,9 +1312,6 @@
                     },
                     "placeholder": "Troleje, elektrifikované koľaje..."
                 },
-                "elevation": {
-                    "label": "Nadmorská výška"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "http://priklad.sk/"
@@ -1474,7 +1470,6 @@
                     "label": "Striedavý"
                 },
                 "internet_access": {
-                    "label": "Prístup k Internetu",
                     "options": {
                         "no": "Nie",
                         "terminal": "Terminál",
@@ -1483,9 +1478,6 @@
                         "yes": "Áno"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Poplatok za prístup k Internetu"
-                },
                 "kerb": {
                     "label": "Obrubník"
                 },
@@ -2194,10 +2186,6 @@
                     "name": "Vlek",
                     "terms": "lyžiarsky vlek, lyziarsky vlek"
                 },
-                "aerialway/gondola": {
-                    "name": "Kyvadlová lanovka",
-                    "terms": "kyvadlova lanovka,kyvadlo,lanovka,kabínka,kabinka"
-                },
                 "aerialway/goods": {
                     "name": "Zásobovacia lanovka",
                     "terms": "zasobovacia lanovka"
@@ -2522,9 +2510,6 @@
                     "name": "Recyklačné centrum",
                     "terms": "recyklacne centrum"
                 },
-                "amenity/register_office": {
-                    "name": "Matričný úrad"
-                },
                 "amenity/restaurant": {
                     "name": "Reštaurácia",
                     "terms": "bar,kafetéria,kantýna,jedáleň,pizzeria,jedlo,rýchloobčerstvenie,fastfood,večera,reštaurácia,reštika,jedenie,kantyna,jedalen,rychloobcerstvenie,vecera,restauracia,restika"
@@ -2537,9 +2522,6 @@
                     "name": "Školský areál",
                     "terms": "Skolsky areal,skola,druzina"
                 },
-                "amenity/scrapyard": {
-                    "name": "Vrakovisko"
-                },
                 "amenity/shelter": {
                     "name": "Prístrešok",
                     "terms": "pristresok,útulňa,utulna"
@@ -2572,9 +2554,6 @@
                     "name": "Štúdio",
                     "terms": "Studio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Plaváreň"
-                },
                 "amenity/taxi": {
                     "name": "Stanovisko taxíkov",
                     "terms": "taxík, taxislužba, taxi,taxik,taxisluzba,odvoz"
@@ -3278,10 +3257,6 @@
                     "name": "Križovatka",
                     "terms": "krizovatka"
                 },
-                "landuse/allotments": {
-                    "name": "Komunitná záhrada",
-                    "terms": "komunitna zahrada,pestovatelska plocha,poestvateľská plocha"
-                },
                 "landuse/basin": {
                     "name": "Zadržiavacia nádrž"
                 },
@@ -3774,37 +3749,13 @@
                     "name": "Železnica mimo prevádzky",
                     "terms": "zeleznica mimo prevadzky,mimo prevadzky"
                 },
-                "railway/funicular": {
-                    "name": "Lanová dráha",
-                    "terms": "lanova zeleznica,lanova draha"
-                },
-                "railway/monorail": {
-                    "name": "Jednokoľajnicová dráha",
-                    "terms": "jednokolajnicova draha,jednokolajka,monorail"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Úzkorozchodná železnica",
-                    "terms": "uzkorozchodna zeleznica,uzkokolajka,úzkoľajka"
-                },
-                "railway/rail": {
-                    "name": "Železničná trať",
-                    "terms": "zeleznicna trat,trat,trať,železnica,zeleznica"
-                },
                 "railway/station": {
                     "name": "Vlaková stanica"
                 },
-                "railway/subway": {
-                    "name": "Metro",
-                    "terms": "metro,podzemna draha,podzemná dráha"
-                },
                 "railway/subway_entrance": {
                     "name": "Vstup do metra",
                     "terms": "vstup,metro,podchod,stanica metra"
                 },
-                "railway/tram": {
-                    "name": "Električka",
-                    "terms": "elektricka,tramvaj"
-                },
                 "relation": {
                     "name": "Relácia",
                     "terms": "relacia,linka,trasa"
@@ -3976,9 +3927,6 @@
                 "shop/fashion": {
                     "name": "Obchod s módnymi doplnkami"
                 },
-                "shop/fishmonger": {
-                    "name": "Predaj rýb"
-                },
                 "shop/florist": {
                     "name": "Kvetinárstvo",
                     "terms": "kvetinarstvo,kvety,kytice"
@@ -3991,9 +3939,6 @@
                     "name": "Pohrebný ústav",
                     "terms": "pohrebny ustav,pohreb,pohreb,pohrebníctvo,pohrebnictvo"
                 },
-                "shop/furnace": {
-                    "name": "Obchod so kotlami"
-                },
                 "shop/furniture": {
                     "name": "Obchod s nábytkom",
                     "terms": "obchod s nabytkom,nabytok"

vendor/assets/iD/iD/locales/sl.json

@@ -423,6 +423,8 @@
             "best_imagery": "Najbolj znan slikovni vir ozadja za to območje",
             "switch": "Preklopi nazaj na to ozadje.",
             "custom": "Po meri",
+            "overlays": "Prekrivni zemljevidi",
+            "imagery_problem_faq": "Prijavi težavo z ozadjem",
             "reset": "ponastavi",
             "display_options": "Možnosti prikaza",
             "brightness": "Svetlost",
@@ -575,10 +577,6 @@
             "on_wiki": "{tag} na wiki.osm.org",
             "used_with": "uporabljeno: {type}"
         },
-        "zoom": {
-            "in": "Približaj",
-            "out": "Oddalji"
-        },
         "cannot_zoom": "V trenutnem načinu nadaljnje oddaljevanje pogleda ni mogoče.",
         "full_screen": "Preklopi celozaslonski način",
         "streetside": {
@@ -608,7 +606,8 @@
             "key": "H",
             "help": {
                 "title": "Pomoč",
-                "welcome": "Dobrodošli v urejevalniku iD za [OpenStreetMap](https://www.openstreetmap.org/). S tem urejevalnikom lahko OpenStreetMap posodobite neposredno iz brskalnika."
+                "welcome": "Dobrodošli v urejevalniku iD za [OpenStreetMap](https://www.openstreetmap.org/). S tem urejevalnikom lahko OpenStreetMap posodobite neposredno iz brskalnika.",
+                "open_source_h": "Odprta koda"
             },
             "overview": {
                 "title": "Pregled",
@@ -1444,9 +1443,6 @@
                     },
                     "placeholder": "Elektrificiran tir"
                 },
-                "elevation": {
-                    "label": "Nadmorska višina"
-                },
                 "email": {
                     "label": "Elektronski naslov",
                     "placeholder": "ime.naziv@naziv.domene.si"
@@ -1567,7 +1563,6 @@
                     "label": "Presihajoč"
                 },
                 "internet_access": {
-                    "label": "Dostop do interneta",
                     "options": {
                         "no": "Ne",
                         "terminal": "Računalniški terminal",
@@ -1576,9 +1571,6 @@
                         "yes": "Da"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Brezplačen dostop do interneta"
-                },
                 "kerb": {
                     "label": "Cestni robnik"
                 },
@@ -2216,10 +2208,6 @@
                     "name": "Vlečnica",
                     "terms": "vlečnica, krogci, krožci,sidro,kramp"
                 },
-                "aerialway/gondola": {
-                    "name": "Kabinska žičnica",
-                    "terms": "gondola"
-                },
                 "aerialway/goods": {
                     "name": "Oskrbovalna žičnica",
                     "terms": "oskrbovalka,žičnica,zipline"
@@ -2539,9 +2527,6 @@
                 "amenity/recycling_centre": {
                     "name": "Center za recikliranje"
                 },
-                "amenity/register_office": {
-                    "name": "Prijavi urad"
-                },
                 "amenity/restaurant": {
                     "name": "Restavracija",
                     "terms": "gostilna,gostinski obrat"
@@ -2584,9 +2569,6 @@
                     "name": "Studio",
                     "terms": "snemalni studio,radijski studio,televizijski studio"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Plavalni bazen"
-                },
                 "amenity/taxi": {
                     "name": "Postajališče za taksi",
                     "terms": "taksi stop,taksi,taxi"
@@ -3420,15 +3402,9 @@
                 "landuse/military/naval_base": {
                     "name": "Vojaško pomorsko oporišče"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Vojaške ovire za trening"
-                },
                 "landuse/military/range": {
                     "name": "Vojaško strelišče"
                 },
-                "landuse/military/training_area": {
-                    "name": "Vojaško vadbišče"
-                },
                 "landuse/orchard": {
                     "name": "Sadovnjak",
                     "terms": "sadni nasad"
@@ -3645,9 +3621,6 @@
                 "man_made/gasometer": {
                     "name": "Plinski rezervoar"
                 },
-                "man_made/groyne": {
-                    "name": "Leseni valolom"
-                },
                 "man_made/lighthouse": {
                     "name": "Svetilnik",
                     "terms": "svetilničar"
@@ -3965,32 +3938,12 @@
                     "name": "Opuščena železnica",
                     "terms": "zapuščena železnica"
                 },
-                "railway/funicular": {
-                    "name": "Vzpenjača",
-                    "terms": "tirna vzpenjača"
-                },
                 "railway/level_crossing": {
                     "name": "Železniški prehod (cesta)"
                 },
-                "railway/monorail": {
-                    "name": "Enotirna železnica",
-                    "terms": "monorail"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Ozkotirna železnica",
-                    "terms": "železnica z ozkimi tiri"
-                },
-                "railway/rail": {
-                    "name": "Železniški tir",
-                    "terms": "železnica,železniški tir,tirnica"
-                },
                 "railway/station": {
                     "name": "Železniška postaja"
                 },
-                "railway/subway": {
-                    "name": "Podzemna železnica",
-                    "terms": "metro"
-                },
                 "railway/subway_entrance": {
                     "name": "Vhod podzemne železnice",
                     "terms": "vhod v podzemno železnico"
@@ -3998,10 +3951,6 @@
                 "railway/switch": {
                     "name": "Kretnica"
                 },
-                "railway/tram": {
-                    "name": "Tramvaj",
-                    "terms": "tramvaj"
-                },
                 "relation": {
                     "name": "Zveza",
                     "terms": "relacija,povezava,odnos"
@@ -4169,9 +4118,6 @@
                 "shop/fashion": {
                     "name": "Trgovina z modnimi oblačili"
                 },
-                "shop/fishmonger": {
-                    "name": "Ribarnica"
-                },
                 "shop/florist": {
                     "name": "Cvetličarna",
                     "terms": "cvetlice,cvetličarstvo"
@@ -4180,9 +4126,6 @@
                     "name": "Pogrebne storitve",
                     "terms": "pogrebni zavod"
                 },
-                "shop/furnace": {
-                    "name": "Trgovina s pečmi"
-                },
                 "shop/furniture": {
                     "name": "Trgovina s pohištvom",
                     "terms": "pohištvo,notranja oprema"

vendor/assets/iD/iD/locales/so.json

@@ -176,10 +176,6 @@
         "tag_reference": {
             "description": "Sharaxaad"
         },
-        "zoom": {
-            "in": "Soo dhawee",
-            "out": "Fogee"
-        },
         "help": {
             "title": "Caawin",
             "help": {
@@ -393,7 +389,6 @@
                     "label": "Nooca"
                 },
                 "internet_access": {
-                    "label": "Helitaanka Internet-ka",
                     "options": {
                         "no": "Maya",
                         "yes": "Haa"

vendor/assets/iD/iD/locales/sq.json

@@ -261,7 +261,6 @@
             "request_review": "Unë do doja që dikush ti rishikonte editimet e mia",
             "save": "Ngarkoni",
             "cancel": "Anullo",
-            "changes": "{count} Ndryshime",
             "warnings": "Paralajmërime",
             "modified": "Modifikuar",
             "deleted": "Fshirë",
@@ -507,10 +506,6 @@
             "on_wiki": "{tag} në wiki.osm.org",
             "used_with": "përdorur me {type}"
         },
-        "zoom": {
-            "in": "Zmadhoni",
-            "out": "Zvogëloni"
-        },
         "streetside": {
             "view_on_bing": "Shikoje në hartat e Bing",
             "hires": "Rezolucion i lartë"
@@ -556,8 +551,7 @@
                 "open_data_h": "Të dhëna të hapura",
                 "open_data": "Editimet që do bëni në këtë hartë do të jenë të dukshme tek çdokush që përdor OpenStreetMap. Editimet tuaja mund të bazohen në dijet vetjake, vëzhgimet tokësore apo imazheritë e mbledhura nga fotot aeriale apo tokësore. Të kopjuarit nga burime komerciale si Google Maps, [është rreptësisht e ndaluar](https://www.openstreetmap.org/copyright).",
                 "before_start_h": "Përpara se të filloni",
-                "open_source": "Editori iD është një projekt bashkëpunues me kodburim të hapur dhe ju po përdorni versionin {version} tani. Kodburimi është i disponueshëm [në Github](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Ju mund të ndihmoni iD duke [përkthyer](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) ose [të raportoni problematika](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "Editori iD është një projekt bashkëpunues me kodburim të hapur dhe ju po përdorni versionin {version} tani. Kodburimi është i disponueshëm [në Github](https://github.com/openstreetmap/iD)."
             },
             "overview": {
                 "navigation_h": "Navigim",

vendor/assets/iD/iD/locales/sr.json

@@ -313,7 +313,6 @@
             "request_review": "Желим да неко провери моје измене.",
             "save": "Учитај",
             "cancel": "Откажи",
-            "changes": "{count} измена",
             "download_changes": "Преузми ОСМ датотеку са изменама",
             "warnings": "Упозорења",
             "modified": "Измењено",
@@ -394,12 +393,6 @@
             "locating": "Одређивање положаја, молимо сачекајте..."
         },
         "inspector": {
-            "zoom_to": {
-                "tooltip_feature": "Центрирај и увеличај мапу да се фокусираш на ово обележје.",
-                "tooltip_note": "Центрирај и увеличај мапу да се фокусираш на ову белешку.",
-                "tooltip_data": "Центрирај и увеличај мапу да се фокусираш на овај податак.",
-                "tooltip_issue": "Центрирај и увеличај мапу да се фокусираш на овај проблем."
-            },
             "show_more": "Прикажи још",
             "view_on_osm": "Прикажи на openstreetmap.org",
             "new_relation": "Нови однос...",
@@ -1403,9 +1396,6 @@
                         "yes": "да (неодређено)"
                     }
                 },
-                "elevation": {
-                    "label": "Надморска висина"
-                },
                 "email": {
                     "label": "Електронско писмо",
                     "placeholder": "example@example.com"
@@ -1591,7 +1581,6 @@
                     "label": "Натпис"
                 },
                 "internet_access": {
-                    "label": "Приступ Интернету",
                     "options": {
                         "no": "Не",
                         "terminal": "Терминал",
@@ -1600,9 +1589,6 @@
                         "yes": "Да"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "Накнада за приступ интернету"
-                },
                 "junction_line": {
                     "options": {
                         "roundabout": "Кружни ток"
@@ -2195,9 +2181,6 @@
                 "aerialway/cable_car": {
                     "name": "Жичара"
                 },
-                "aerialway/gondola": {
-                    "name": "Гондола"
-                },
                 "aeroway/aerodrome": {
                     "name": "Аеродром"
                 },
@@ -2478,9 +2461,6 @@
                 "amenity/school": {
                     "name": "Школско двориште"
                 },
-                "amenity/scrapyard": {
-                    "name": "Ауто-отпад"
-                },
                 "amenity/shelter": {
                     "name": "Склониште"
                 },
@@ -2508,9 +2488,6 @@
                 "amenity/studio": {
                     "name": "Студио"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Базен"
-                },
                 "amenity/taxi": {
                     "name": "Такси стајалиште"
                 },
@@ -3214,17 +3191,9 @@
                 "landuse/military/naval_base": {
                     "name": "Поморска база"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Коњички терен са препрекама",
-                    "terms": "терен са препрекама,коњички терен са препрекама"
-                },
                 "landuse/military/range": {
                     "name": "Војни полигон"
                 },
-                "landuse/military/training_area": {
-                    "name": "Тренажна област ",
-                    "terms": "тренажна област,тренажна зона,вежбалиште"
-                },
                 "landuse/orchard": {
                     "name": "Воћњак"
                 },
@@ -3361,9 +3330,6 @@
                 "leisure/track/cycling": {
                     "name": "Бициклистичка стаза"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Бициклистичка стаза"
-                },
                 "leisure/water_park": {
                     "name": "Водени парк",
                     "terms": "водени парк,аква парк, аква-парк"
@@ -3510,9 +3476,6 @@
                 "military/bunker": {
                     "name": "Војни бункер"
                 },
-                "military/checkpoint": {
-                    "name": "Контролна тачка"
-                },
                 "military/office": {
                     "name": "Војна канцеларија"
                 },
@@ -3693,27 +3656,9 @@
                 "railway/disused": {
                     "name": "Некоришћена железница"
                 },
-                "railway/funicular": {
-                    "name": "Успињача"
-                },
-                "railway/monorail": {
-                    "name": "Пруга са једним колосеком"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Уски колосек"
-                },
-                "railway/rail": {
-                    "name": "Шина"
-                },
-                "railway/subway": {
-                    "name": "Подземна железница"
-                },
                 "railway/subway_entrance": {
                     "name": "Улаз у подземну железницу"
                 },
-                "railway/tram": {
-                    "name": "Трамвај"
-                },
                 "relation": {
                     "name": "Однос"
                 },
@@ -3813,9 +3758,6 @@
                 "shop/fashion": {
                     "name": "Бутик"
                 },
-                "shop/fishmonger": {
-                    "name": "Рибарница"
-                },
                 "shop/florist": {
                     "name": "Цвећар"
                 },

vendor/assets/iD/iD/locales/sv.json

@@ -20,6 +20,14 @@
             "favorites": "Favoriter",
             "add_feature": "Lägg till objekt"
         },
+        "title": {
+            "format": {
+                "context": "{base} – {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} – {context}"
+            },
+            "labeled_and_more": "{labeled} och {count} mer"
+        },
         "modes": {
             "add_feature": {
                 "title": "Lägg till ett objekt",
@@ -590,7 +598,7 @@
             "request_review": "Jag vill att någon granskar mina ändringar.",
             "save": "Ladda upp",
             "cancel": "Avbryt",
-            "changes": "{count} ändringar",
+            "changes": "Ändringar ({count})",
             "download_changes": "Ladda ned osmChange-fil",
             "errors": "Fel",
             "warnings": "Varningar",
@@ -678,20 +686,19 @@
             "no_results_worldwide": "Inget hittades"
         },
         "geolocate": {
+            "key": "L",
             "title": "Visa var jag är",
-            "locating": "Lokaliserar, var god vänta..."
+            "locating": "Lokaliserar, var god vänta...",
+            "location_unavailable": "Din plats är inte tillgänglig."
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "Zooma till detta",
-                "tooltip_feature": "Centrera och zooma kartan för att fokusera på detta objekt.",
-                "tooltip_note": "Centrera och zooma kartan för att fokusera på denna anteckning.",
-                "tooltip_data": "Centrera och zooma kartan för att fokusera på denna data.",
-                "tooltip_issue": "Centrera och zooma kartan för att fokusera på detta problem."
+                "title": "Zooma till markering"
             },
             "show_more": "Visa mer",
             "view_on_osm": "Visa på openstreetmap.org",
+            "view_on_osmose": "Visa på osmose.openstreetmap.fr",
             "view_on_keepRight": "Visa på keepright.at",
             "feature_type": "Objekttyp",
             "fields": "Egenskaper",
@@ -711,6 +718,8 @@
             "wiki_en_reference": "Visa dokumentation på engelska",
             "key_value": "nyckel=värde",
             "multiple_values": "Multipla värden",
+            "multiple_types": "Flera typer",
+            "unshared_value_tooltip": "inte gemensam för alla objekt",
             "hidden_preset": {
                 "manual": "{features} är dolda. Aktivera dem i panelen Kartdata.",
                 "zoom": "{features} är dolda. Zooma in för att aktivera dem. "
@@ -1045,11 +1054,18 @@
         },
         "cannot_zoom": "Går ej att zooma ut ytterligare i nuvarande läge. ",
         "full_screen": "Växla fullskärm",
+        "self_intersection": {
+            "error": {
+                "lines": "En linje kan inte korsa sig själv",
+                "areas": "En yta kan inte överlappa sig själv."
+            }
+        },
         "QA": {
             "osmose": {
                 "title": "Osmose-problem",
                 "detail_title": "Detaljer",
                 "elems_title": "Objekt",
+                "fix_title": "Riktlinjer för att åtgärda buggar",
                 "trap_title": "Vanliga misstag"
             },
             "improveOSM": {
@@ -1082,7 +1098,7 @@
                     },
                     "tr": {
                         "title": "Saknar svängrestriktion ",
-                        "description": "{num_passed} av {num_trips} inspelade restor (åt {travel_direction}) gör en sväng från {from_way} till {to_way} vid {junction}. Det kan saknas en svängrestriktion av typen \"{turn_restriction}\"."
+                        "description": "{num_passed} av {num_trips} inspelade resor (åt {travel_direction}) gör en sväng från {from_way} till {to_way} vid {junction}. Det kan saknas en svängrestriktion av typen \"{turn_restriction}\"."
                     }
                 }
             },
@@ -1510,7 +1526,7 @@
                 "before_start": "Du bör vara bekant med OpenStreetMap och denna redigerare innan du börja redigera. iD har en genomgång för att lära dig grunderna i att redigera på OpenStreetMap. Klicka på \"Starta genomgången\" på skärmen för att komma till genomgången – det tat bara omkring 15 minuter. ",
                 "open_source_h": "Öppen källkod",
                 "open_source": "iD-redigeraren är ett open source-projekt gemensamt framtaget av dess användare, och du använder nu version {version}. Källkoden finns tillgänglig [på GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Du kan hjälpa iD genom att [översätta text](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) och [rapportera buggar](https://github.com/openstreetmap/iD/issues)."
+                "open_source_help": "Du kan hjälpa iD genom att [översätta](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translatin) eller [rapportera buggar](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
                 "title": "Översikt",
@@ -1722,7 +1738,7 @@
         },
         "issues": {
             "title": "Problem",
-            "key": "P",
+            "key": "I",
             "list_title": "Problem ({count})",
             "errors": {
                 "list_title": "Fel ({count})"
@@ -2429,7 +2445,8 @@
                     "pan": "Panorera kartan",
                     "pan_more": "Panorera kartan en skärm åt gången",
                     "zoom": "Zooma in / Zooma ut",
-                    "zoom_more": "Zooma in / Zooma ut mycket"
+                    "zoom_more": "Zooma in / Zooma ut mycket",
+                    "geolocate": "Zooma till min position"
                 },
                 "help": {
                     "title": "Hjälp",
@@ -2932,6 +2949,12 @@
                     "placeholder": "50, 100, 200...",
                     "terms": "Kapacitet, antal, besökare, användare, antal"
                 },
+                "capacity/disabled_parking": {
+                    "placeholder": "1, 2, 3..."
+                },
+                "capacity_parking": {
+                    "placeholder": "10, 20, 30..."
+                },
                 "cash_in": {
                     "label": "Insättning av pengar"
                 },
@@ -2952,7 +2975,13 @@
                     "terms": "Avgift, tull, kostnad"
                 },
                 "check_date": {
-                    "label": "Datum senast kontrollerad"
+                    "label": "Datum senast kontrollerad",
+                    "placeholder": "ÅÅÅÅ-MM-DD"
+                },
+                "circumference": {
+                    "label": "Omkrets",
+                    "placeholder": "1 m, 20 cm, 30 in…",
+                    "terms": "Omkrets, omfång, storlek, vidd"
                 },
                 "clothes": {
                     "label": "Kläder"
@@ -3034,7 +3063,8 @@
                     "label": "Refug"
                 },
                 "cuisine": {
-                    "label": "Typer av mat"
+                    "label": "Typer av mat",
+                    "terms": "mat,kök,matgrupp,regional mat,världens mat,kost,kostalternativ,meny,menyutbud"
                 },
                 "currency_multi": {
                     "label": "Valutor",
@@ -3112,6 +3142,9 @@
                         "yes": "Ja"
                     }
                 },
+                "depth": {
+                    "label": "Djup (meter)"
+                },
                 "description": {
                     "label": "Beskrivning",
                     "terms": "Beskrivning, sammanfattning"
@@ -3149,7 +3182,8 @@
                 },
                 "direction": {
                     "label": "Riktning (grader medurs)",
-                    "placeholder": "45, 90, 180, 270"
+                    "placeholder": "45, 90, 180, 270",
+                    "terms": "Riktning (grader medsols), riktning, grader, medsol, medsols, väderstreck"
                 },
                 "direction_cardinal": {
                     "label": "Riktning",
@@ -3221,7 +3255,8 @@
                     "label": "Drycker"
                 },
                 "drinking_water": {
-                    "label": "Drickbart"
+                    "label": "Drickbart",
+                    "terms": "dricksvatten,drickbart,drickbar"
                 },
                 "drive_through": {
                     "label": "Genomkörning (Drive-through)",
@@ -3240,11 +3275,8 @@
                         "rail": "Elektrifierad räls",
                         "yes": "Ja (ospecificerad)"
                     },
-                    "placeholder": "Kontaktledning, elektrifierad räls..."
-                },
-                "elevation": {
-                    "label": "Höjd",
-                    "terms": "Höjd, altitud, höjd över havet, höh"
+                    "placeholder": "Kontaktledning, elektrifierad räls...",
+                    "terms": "el,elektrisk,elektrifierad,ström,strömförsörjd,kraftledning"
                 },
                 "email": {
                     "label": "E-post",
@@ -3273,6 +3305,12 @@
                 "except": {
                     "label": "Undantag"
                 },
+                "expected_rcn_route_relations": {
+                    "label": "Angränsande cykelnoder"
+                },
+                "expected_rwn_route_relations": {
+                    "label": "Angränsande gångnoder"
+                },
                 "faces": {
                     "label": "Sidor"
                 },
@@ -3382,6 +3420,9 @@
                 "generator/type": {
                     "label": "Typ"
                 },
+                "geyser/height": {
+                    "label": "Utbrottets höjd"
+                },
                 "gnis/feature_id": {
                     "label": "GNIS objekt-ID"
                 },
@@ -3480,6 +3521,9 @@
                         "undefined": "Nej"
                     }
                 },
+                "hot_water": {
+                    "label": "Varmvatten"
+                },
                 "iata": {
                     "label": "IATA-flygplatskod"
                 },
@@ -3526,19 +3570,21 @@
                     "label": "Periodisk"
                 },
                 "internet_access": {
-                    "label": "Internetaccess",
                     "options": {
                         "no": "Nej",
                         "terminal": "Terminal",
                         "wired": "Trådbunden",
                         "wlan": "Wifi",
                         "yes": "Ja"
-                    },
-                    "terms": "Internetaccess, internetåtkomst, internet, wifi, wlan, ethernet, trådlöst"
+                    }
                 },
                 "internet_access/fee": {
-                    "label": "Avgift för internetåtkomst",
-                    "terms": "Avgift, kostnad, belopp, wifi-avgift, wifi, internet, internetkostnad"
+                    "label": "Internetåtkomst",
+                    "options": {
+                        "customers": "Enbart kunder",
+                        "no": "Fri",
+                        "yes": "Betald"
+                    }
                 },
                 "internet_access/ssid": {
                     "label": "Wifi-nätverksnamn",
@@ -3800,8 +3846,7 @@
                     "terms": "Nätverk, bussnätverk, vägnätverk"
                 },
                 "network/type": {
-                    "label": "Nätverkstyp",
-                    "terms": "Nätverkstyp, typ av nätverk, nätverk, rutt, vandringsrutt, cykelrutt"
+                    "label": "Nätverkstyp"
                 },
                 "network_bicycle": {
                     "label": "Nätverksklass",
@@ -3871,8 +3916,13 @@
                         "yes": "Ja"
                     }
                 },
+                "openfire": {
+                    "label": "Öppen eld tillåtet",
+                    "terms": "öppen eld, eldstad, eldning tillåten,grill,flamma"
+                },
                 "opening_date": {
-                    "label": "Förväntat öppningsdatum"
+                    "label": "Förväntat öppningsdatum",
+                    "placeholder": "ÅÅÅÅ-MM-DD"
                 },
                 "opening_hours": {
                     "label": "Öppettider ",
@@ -4050,6 +4100,9 @@
                 "playground/theme": {
                     "label": "Tema"
                 },
+                "plots": {
+                    "placeholder": "10, 20, 30..."
+                },
                 "polling_station": {
                     "label": "Vallokal",
                     "terms": "vallokal, valurna, valsedel, val, rösta, röstning, folkomröstning, omröstning, röstmaskin, valmaskin, omröstningsapparat, valbås"
@@ -4469,6 +4522,7 @@
                 },
                 "start_date": {
                     "label": "Startdatum",
+                    "placeholder": "ÅÅÅÅ-MM-DD",
                     "terms": "Startdatum, öppnat, början, påbörjat, start"
                 },
                 "step_count": {
@@ -4583,6 +4637,9 @@
                 "target": {
                     "label": "Riktas mot"
                 },
+                "telecom/medium": {
+                    "label": "Medium"
+                },
                 "tidal": {
                     "label": "Tidvatten",
                     "terms": "Tidvatten, flod, ebb"
@@ -4703,7 +4760,8 @@
                     "label": "Typ"
                 },
                 "trolley_wire": {
-                    "label": "Frihängande strömkabel för vagnar"
+                    "label": "Frihängande strömkabel för vagnar",
+                    "terms": "kontaktledning,kontakttrådar,luftledning,lufttrådar,tågledning,spårvagnsledning"
                 },
                 "tunnel": {
                     "label": "Typ",
@@ -4876,10 +4934,6 @@
                     "name": "Släplift",
                     "terms": "Släplift, Draglift, skidlift, lift, linbana"
                 },
-                "aerialway/gondola": {
-                    "name": "Gondol",
-                    "terms": "Gondol, Gondolbana, lift, linbana, skidlift, lift"
-                },
                 "aerialway/goods": {
                     "name": "Transportlinbana",
                     "terms": "Transportlift, transportlinbana, varulift, gruvlift, linbana, transport, varor, gods, transportbana, lift, industri, industrilift"
@@ -5397,6 +5451,10 @@
                     "name": "Permanent vallokal",
                     "terms": "vallokal, valurna, valsedel, val, rösta, röstning, folkomröstning, omröstning, röstmaskin, valmaskin, omröstningsapparat, valbås"
                 },
+                "amenity/post_box": {
+                    "name": "Brevlåda",
+                    "terms": "brevlåda,postlåda,brevinkast,brevinlämning,paketinlämning,postfack,postbox"
+                },
                 "amenity/post_depot": {
                     "name": "Postsorteringskontor",
                     "terms": "Postsorteringskontor, post, postsortering, sortering, postdistribution, postterminal, brev, brevsortering, brevdistribution"
@@ -5456,9 +5514,6 @@
                     "name": "Återvinningscontainer ",
                     "terms": "återvinning, återbruk, återvinningsstation, sopstation, burkar, flaskor, skrot, skräp, sopor, återvinningscontainer, container, metall, glas"
                 },
-                "amenity/register_office": {
-                    "name": "Registreringsbyrå"
-                },
                 "amenity/restaurant": {
                     "name": "Restaurang",
                     "terms": "Restaurang, matservering, matställe, servering, restauration, näringsställe, grillbar, bar, krog, värdshus, pub, bodega, brasserie, rotisseri, pizzeria, kafé, cafeteria, sylta, café. matsal, kaffe, lunch"
@@ -5543,9 +5598,6 @@
                     "name": "Skolområde",
                     "terms": "Skolgård, skolområde, Campus, universitetsområde, högskoleområde, universitet, högskola, grundskola, mellanstadium, lågstadium, högstadium, gymnasium"
                 },
-                "amenity/scrapyard": {
-                    "name": "Bilskrot"
-                },
                 "amenity/shelter": {
                     "name": "Väderskydd",
                     "terms": "Skydd, tak över huvudet, hydda, vindskydd, koja, väntkur, grotta, väderskydd, lusthus, picknick"
@@ -5617,9 +5669,6 @@
                     "name": "Filmstudio",
                     "terms": "Filmstudio, film, filmproduktion, video, videoproduktion, videoinspelning, filminspelning"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Simbassäng"
-                },
                 "amenity/taxi": {
                     "name": "Taxihållplats",
                     "terms": "Taxihållplats, taxificka, taxistation, taxi"
@@ -6959,10 +7008,6 @@
                 "landuse": {
                     "name": "Markanvändning"
                 },
-                "landuse/allotments": {
-                    "name": "Koloniområde",
-                    "terms": "Kolonilott, lott, täppa, koloniträdgård, odlingslott, koloniområde"
-                },
                 "landuse/aquaculture": {
                     "name": "Akvakultur",
                     "terms": "Fiskodling, vattenbruk, akvakultur, fisk, skaldjur, alger, vattenväxter, utplantering av fisk, Ostronodling, musselodling,  pärlodling, räkor"
@@ -7064,18 +7109,10 @@
                     "name": "Marinbas",
                     "terms": "Marinbas, marint förband, marinen, flottan, amfibiekåren, Kustartilleriet, flottilj, flottbas, örlogsbas"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Hinderbana",
-                    "terms": "Hinderbana, hoppbana, hinderlöpning, hinderlopp"
-                },
                 "landuse/military/range": {
                     "name": "Militärt övningsområde",
                     "terms": "Militärt övningsområde, övningsområde, skjutbana"
                 },
-                "landuse/military/training_area": {
-                    "name": "Övningsfält",
-                    "terms": "Övningsfält, skjutbana, övningsområde"
-                },
                 "landuse/orchard": {
                     "name": "Fruktodling",
                     "terms": "Fruktodling, fruktträdgård, fruktträd, äppelträd"
@@ -7417,25 +7454,14 @@
                 "leisure/track/cycling": {
                     "name": "Tävlingsbana (Cykel)"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Tävlingsbana (Cykel)"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Tävlingsbana (Hästkapplöpning)",
                     "terms": "Hästkapplöpningsbana, Hästkapplöpning, kapplöpningsbana, häst, kapplöpning, trav, galopp"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Tävlingsbana (Hästkapplöpning)",
-                    "terms": "Hästkapplöpningsbana, Hästkapplöpning, kapplöpningsbana, häst, kapplöpning, trav, galopp"
-                },
                 "leisure/track/running": {
                     "name": "Tävlingsbana (Löpning)",
                     "terms": "Tävlingsbana, Löpning, kapplöpningsbana, löpbana, löparbana, sprint, språng, springa"
                 },
-                "leisure/track/running_point": {
-                    "name": "Tävlingsbana (Löpning)",
-                    "terms": "Tävlingsbana, Löpning, kapplöpningsbana, löpbana, löparbana, sprint, språng, springa"
-                },
                 "leisure/water_park": {
                     "name": "Äventyrsbad / Vattenpark",
                     "terms": "Äventyrsbad, Vattenpark, vattenlekpark, vattenland"
@@ -7491,10 +7517,6 @@
                     "name": "Gasklocka",
                     "terms": "Gasklocka, gasbehållare, gas, gasometer, cistern, gascistern, stadsgas, naturgas"
                 },
-                "man_made/groyne": {
-                    "name": "Hövd, vågbrytare vinkelrätt mot kusten",
-                    "terms": "hövd, vågbrytare, pir, erosion, erosionsskydd"
-                },
                 "man_made/lighthouse": {
                     "name": "Fyr",
                     "terms": "Fyr, fyrtorn, fyrskepp"
@@ -7634,10 +7656,6 @@
                     "name": "Militär bunker",
                     "terms": "militär bunker, bunker, flygförsvar, militär, arme, försvar, marin, flottan, krig"
                 },
-                "military/checkpoint": {
-                    "name": "Kontrollpunkt",
-                    "terms": "Kontrollpunkt, kontrollstation, militär kontroll, luftvapen, luftförsvar, militär, armé, bas, flotta, marin, soldat, krig, försvar, trupp, vakt"
-                },
                 "military/nuclear_explosion_site": {
                     "name": "Område för kärnvapenprov",
                     "terms": "Område för kärnvapenprov, kärnvapenprov, kärnvapen, vapentest"
@@ -7893,7 +7911,8 @@
                     "name": "Läkare"
                 },
                 "office/political_party": {
-                    "name": "Partikontor"
+                    "name": "Partikontor",
+                    "terms": "partikontor,partihögkvarter,politiskt parti,politik,parti,"
                 },
                 "office/private_investigator": {
                     "name": "Privatdetektiv",
@@ -8319,10 +8338,6 @@
                     "name": "Oanvänd järnväg",
                     "terms": "Oanvänd järnväg, övergiven järnväg, övergiven tågbana, oanvänd tågbana"
                 },
-                "railway/funicular": {
-                    "name": "Bergbana ",
-                    "terms": "Bergbana, linbana"
-                },
                 "railway/halt": {
                     "name": "Mindre järnvägshållplats"
                 },
@@ -8330,37 +8345,13 @@
                     "name": "Järnvägskorsning (väg)",
                     "terms": "korsning, järnvägskorsning, järnvägsövergång, järnvägspassage, plankorsning, spårpassage, tågövergång, tågkorsning, tågpassage"
                 },
-                "railway/light_rail": {
-                    "name": "Snabbspårväg / stadsbana",
-                    "terms": "smalspårig järnväg, smalspår, järnväg, snabbspårväg,  stadsbana"
-                },
                 "railway/milestone": {
                     "name": "Kilometerstolpe vid järnväg",
                     "terms": "Kilometerstolpe, kilometertavla, avståndsmärke, milsten, referenstavla, kilometerpåle"
                 },
-                "railway/miniature": {
-                    "name": "Miniatyrjärnväg",
-                    "terms": "Miniatyrjärnväg, Åkbar miniatyrjärnväg, smalspårig järnväg, smalspår, trädgårdsjärnväg"
-                },
-                "railway/monorail": {
-                    "name": "Monorail",
-                    "terms": "Monorail, enskensbana, balkbana, räls, spår, kollektivtrafik, linjetrafik, transport"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Smalspårbana",
-                    "terms": "Smalspårbana, smalspår"
-                },
                 "railway/platform": {
                     "name": "Järnvägsperrong"
                 },
-                "railway/rail": {
-                    "name": "Räls",
-                    "terms": "Räls, järnvägsspår, spår, bana"
-                },
-                "railway/rail/highspeed": {
-                    "name": "Höghastighetsbana",
-                    "terms": "Höghastighetsbana, snabbspår, höghastighet, Järnväg, snabbjärnväg, räls, järnvägsspår, spår, bana"
-                },
                 "railway/signal": {
                     "name": "Järnvägssignal",
                     "terms": "järnvägssignal, signal, ljus, järnvägsljus, semafor, försignal,  huvudsignal, dvärgsignal"
@@ -8368,10 +8359,6 @@
                 "railway/station": {
                     "name": "Järnvägsstation"
                 },
-                "railway/subway": {
-                    "name": "Tunnelbana",
-                    "terms": "Tunnelbana, T-bana, metro"
-                },
                 "railway/subway_entrance": {
                     "name": "Tunnelbaneingång",
                     "terms": "Tunnelbaneingång, tunnelbanenergång, t-baneingång, t-banenedgång"
@@ -8384,10 +8371,6 @@
                     "name": "Tågtvätt",
                     "terms": "Tågtvätt, loktvätt, tvätthall"
                 },
-                "railway/tram": {
-                    "name": "Spårvagn",
-                    "terms": "Spårvagn, spårväg, motorvagn"
-                },
                 "railway/tram_stop": {
                     "name": "Stopposition för spårvagn"
                 },
@@ -8636,9 +8619,6 @@
                     "name": "Fiskeaffär",
                     "terms": "Fiskeaffär, fiskeutrustning, sommarfiske, vinterfiske, levande bete, bete, fiske, fiska, fisk, fiskare"
                 },
-                "shop/fishmonger": {
-                    "name": "Fiskhandlare"
-                },
                 "shop/florist": {
                     "name": "Florist",
                     "terms": "Florist, blommor, blomförsäljning, bukett, blomsterbindare, blomsterhandlare"
@@ -8647,10 +8627,6 @@
                     "name": "Ramaffär",
                     "terms": "Ramaffär, ramar, inramning"
                 },
-                "shop/frozen_food": {
-                    "name": "Fryst mat",
-                    "terms": "Fryst mat, frysmat,  snabbmat, matlådor, fryst, frys, färdigmat, färdigrätt, färdigrätter, mat, lunch"
-                },
                 "shop/fuel": {
                     "name": "Bränsleaffär",
                     "terms": "Bränsleaffär, bränslebutik, bränsle, motorbränsle, kol, träkol, eldningsolja, motorbränsle, propan, LPG, fotogen"
@@ -8659,9 +8635,6 @@
                     "name": "Begravningsbyrå",
                     "terms": "begravningsbyrå, begravningsceremoni, begravning, bodelning, jordfästning, gravsättning, kremering, begravningsentreprenör, gravsten, gravstenar"
                 },
-                "shop/furnace": {
-                    "name": "Värmepannor"
-                },
                 "shop/furniture": {
                     "name": "Möbelaffär",
                     "terms": "Möbelaffär, möbelgrossist, möbelvaruhus, inredning, stolar, soffor, soffa, stol, bord, hylla"
@@ -9657,6 +9630,13 @@
                 "description": "Stadskartan är en översiktlig karta som beskriver Göteborg. Den innehåller generell information om mark, kommunikation, hydrografi, byggnader, adressnummer och gatunamn, administrativ indelning och övrig orienterande text.",
                 "name": "Göteborg Stadskarta"
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© Göteborgs Stad, CC0"
+                },
+                "description": "Flygfoto för Göteborgs Stad",
+                "name": "Flygfoton Göteborg"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI Japan"
@@ -9824,6 +9804,12 @@
                 },
                 "name": "Thunderforest landskap"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Kartor © Thunderforest, Data © OpenStreetMaps bidragsgivare"
+                },
+                "name": "Thunderforest utomhus"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -9865,6 +9851,12 @@
                 },
                 "description": "Svenska nationella vägdatabasen, NVDB, med flera kartlager att välja",
                 "name": "Trafikverkets vägdatabas anpassningsbar"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Wrocław stadshus"
+                },
+                "name": "Wrocław: Flygfoton 2018"
             }
         },
         "community": {
@@ -9904,6 +9896,10 @@
                 "name": "OpenStreetMap Galicien på Twitter",
                 "description": "Följ oss på Twitter på {url}"
             },
+            "Galicia-Xeoinquedos-Twitter": {
+                "name": "Geoinquetos på Twitter",
+                "description": "Följ oss på Twitter på {url}"
+            },
             "GeoPhilly": {
                 "name": "GeoPhilly",
                 "description": "Träffar för kart-entusiaster kring Philadelphia",
@@ -10012,6 +10008,10 @@
             "OSM-CA-mailinglist": {
                 "name": "E-postlistan OSM-CA"
             },
+            "OSM-CA-telegram": {
+                "name": "@osmca på Telegram",
+                "description": "Telegram-chatt för OpenStreetMap Canada"
+            },
             "OSM-CL-facebook": {
                 "name": "OpenStreetMap Chile på Facebook",
                 "description": "Anslut till gemenskapen i OpenStreetMap Child via Facebook",
@@ -10030,6 +10030,10 @@
                 "name": "OpenStreetMap Chile på Twitter",
                 "description": "Följ oss på Twitter på {url}"
             },
+            "OSM-CN-telegram": {
+                "name": "Telegram för OpenStreetMap Kina",
+                "description": "Telegram-grupp för den kinesiska OSM-gemenskapen {url}"
+            },
             "OSM-CO": {
                 "name": "OpenStreetMap Colombia",
                 "description": "Nyheter om OpenStreetMap Colombia-gemenskapen och OSMCo Foundation"
@@ -10055,6 +10059,10 @@
                 "name": "OSM Kuba på Telegram",
                 "description": "Telegram-chatt för OpenStreetMap Kuba"
             },
+            "OSM-CZ-telegram": {
+                "name": "Telegram för OpenStreetMap CZ",
+                "description": "Telegram-grupp för den tjeckiska OSM-gemenskapen {url}"
+            },
             "OSM-Central-Salish-Sea": {
                 "name": "OpenStreetMap Central Salish Sea",
                 "description": "Kartläggare och OpenStreetMap-användare runt Mount Vernon, Washington",
@@ -10113,6 +10121,10 @@
                 "description": "Förbättra OpenStreetMap i Indien",
                 "extendedDescription": "Kartlägger i Indien? Har du frågor, vill komma i kontakt med gemenskapen här? Gå med på {url}. Alla är välkomna!"
             },
+            "OSM-Japan-telegram": {
+                "name": "Telegram för OpenStreetMap Japan",
+                "description": "Telegram-grupp för den japanska OSM-gemenskapen {url}"
+            },
             "OSM-MMR-facebook": {
                 "name": "OpenStreetMap Burma",
                 "description": "Förbättra OpenStreetMap i Burma",

vendor/assets/iD/iD/locales/ta.json

@@ -142,7 +142,6 @@
         "commit": {
             "save": "பதிவேற்றுக",
             "cancel": "ரத்து",
-            "changes": "{எண்ணிக்கை} மாற்றங்கள்",
             "warnings": "எச்சரிக்கைகள்",
             "modified": "திருத்தப்பட்ட",
             "deleted": "நீக்கப்பட்டது",
@@ -853,9 +852,6 @@
                         "yes": "ஆம் (குறிப்பிடப்படவில்லை)"
                     }
                 },
-                "elevation": {
-                    "label": "உயரம்"
-                },
                 "email": {
                     "label": "மின்னஞ்சல்"
                 },
@@ -979,7 +975,6 @@
                     "label": "வகை"
                 },
                 "internet_access": {
-                    "label": "இணைய அணுகல்",
                     "options": {
                         "no": "இல்லை",
                         "terminal": "முணையம்",
@@ -988,9 +983,6 @@
                         "yes": "ஆம்"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "இணைய அணுகல் கட்டணம்"
-                },
                 "lamp_type": {
                     "label": "வகை"
                 },
@@ -1738,9 +1730,6 @@
                 "amenity/pub": {
                     "name": "பப் "
                 },
-                "amenity/register_office": {
-                    "name": "பதிவு அலுவலகம்"
-                },
                 "amenity/restaurant": {
                     "name": "உணவகம்"
                 },
@@ -1750,9 +1739,6 @@
                 "amenity/social_facility/food_bank": {
                     "name": "உணவு வங்கி"
                 },
-                "amenity/swimming_pool": {
-                    "name": "நீச்சல் குளம்"
-                },
                 "amenity/telephone": {
                     "name": "தொலைபேசி"
                 },
@@ -2185,30 +2171,15 @@
                 "railway/disused": {
                     "name": "பயன்படுத்தப்படாத இரயில்வே"
                 },
-                "railway/light_rail": {
-                    "name": "இலகு இரயில்"
-                },
                 "railway/milestone": {
                     "name": "இரயில்வே மைல்கல்"
                 },
-                "railway/monorail": {
-                    "name": "மோனோ இரயில்"
-                },
-                "railway/rail": {
-                    "name": "இரயில்"
-                },
                 "railway/station": {
                     "name": "தொடருந்து நிலையம்"
                 },
-                "railway/subway": {
-                    "name": "சுரங்கப்பாதை"
-                },
                 "railway/subway_entrance": {
                     "name": "சுரங்கப்பாதை நுழைவுவாயில்"
                 },
-                "railway/tram": {
-                    "name": "அமிழ் தண்டூர்தி"
-                },
                 "relation": {
                     "name": "தொடர்பு"
                 },

vendor/assets/iD/iD/locales/te.json

@@ -181,7 +181,6 @@
             "title": "OpenStreetMapలో మార్పులను భద్రపరచండి ",
             "upload_explanation": "మీరు ఎక్కించే మార్పులు ఓపెన్‌స్ట్రీట్‌మ్యాప్ డేటాను వాడే పటాలన్నింటిలోనూ కనిపిస్తాయి.",
             "cancel": "రద్దుచేయి",
-            "changes": "{count} మార్పులు",
             "warnings": "హెచ్చరికలు",
             "modified": "మార్చబడింది",
             "deleted": "తొలగించబడింది",
@@ -520,9 +519,6 @@
                 "amenity/restaurant": {
                     "name": "రెస్టారెంట్"
                 },
-                "amenity/swimming_pool": {
-                    "name": "ఈత కొలను"
-                },
                 "amenity/toilets": {
                     "name": "మరుగుదొడ్లు"
                 },

vendor/assets/iD/iD/locales/th.json

@@ -286,14 +286,10 @@
                     "label": "แหล่งที่มา"
                 },
                 "internet_access": {
-                    "label": "การเข้าใช้อินเทอร์เน็ต",
                     "options": {
                         "wired": "ใช้สาย",
                         "wlan": "ไร้สาย"
                     }
-                },
-                "internet_access/fee": {
-                    "label": "ค่าธรรมเนียมการเข้าใช้อินเทอร์เน็ต"
                 }
             },
             "presets": {

vendor/assets/iD/iD/locales/tl.json

@@ -266,7 +266,6 @@
             "upload_explanation_with_user": "Ang mga pagbabagong na-upload bilang {user} ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
             "save": "I-upload",
             "cancel": "Kanselahin",
-            "changes": "{count} Changes",
             "warnings": "Mga babala",
             "modified": "Binago",
             "deleted": "Binura",

vendor/assets/iD/iD/locales/tr.json

@@ -389,7 +389,6 @@
             "request_review": "Birisinin yaptığım düzenlemeleri gözden geçirmesini isterim.",
             "save": "Yükle",
             "cancel": "İptal",
-            "changes": "{count} Değişiklik",
             "download_changes": "osmChange dosyasını indirin",
             "errors": "Hatalar",
             "warnings": "Uyarılar",
@@ -477,13 +476,6 @@
             "locating": "Buluyor, lütfen bekle..."
         },
         "inspector": {
-            "zoom_to": {
-                "title": "Buna yakınlaştır",
-                "tooltip_feature": "Bu özelliğe odaklanmak için haritayı ortala ve yaklaştır.",
-                "tooltip_note": "Bu nota odaklanmak için haritayı ortala ve yaklaştır.",
-                "tooltip_data": "Bu veriye odaklanmak için haritayı ortala ve yaklaştır.",
-                "tooltip_issue": "Bu soruna odaklanmak için haritayı ortala ve yaklaştır."
-            },
             "show_more": "Daha Fazla Göster",
             "view_on_osm": "OpenStreetMap.org sayfasında bak",
             "view_on_keepRight": "keepright.at sitesinde görüntüle",
@@ -756,10 +748,6 @@
             "on_wiki": "wiki.osm.org sitesinde {tag} ",
             "used_with": "{type} ile birlikte kullanılır"
         },
-        "zoom": {
-            "in": "Yakınlaştır",
-            "out": "Uzaklaştır"
-        },
         "cannot_zoom": "Bu modda daha fazla uzaklaşılamaz.",
         "full_screen": "Tam Ekran",
         "QA": {
@@ -835,8 +823,7 @@
                 "before_start_h": "Başlamadan önce",
                 "before_start": "Düzenlemeye başlamadan önce OpenStreetMap ve bu düzenleyiciye aşina olmanız gerekir. iD, OpenStreetMap'i düzenlemenin temellerini size öğretmej için bir gezinti içerir. Bu ekrandaki \"Gezintiyi Başlatınız\" tuşuna basarak öğreticiyi başlatabilirsiniz, sadece 15 dakika sürmektedir.",
                 "open_source_h": "Açık Kaynak",
-                "open_source": "iD düzenleyicisi işbirliğine dayalı bir açık kaynak projesidir ve şu anda  versiyon {version} kullanmaktasınız. Kaynak kodlar [on GitHub](https://github.com/openstreetmap/iD) erişime açıktır.",
-                "open_source_help": "iD'ye [translating] ile yardımcı olabilirsiniz (https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "iD düzenleyicisi işbirliğine dayalı bir açık kaynak projesidir ve şu anda  versiyon {version} kullanmaktasınız. Kaynak kodlar [on GitHub](https://github.com/openstreetmap/iD) erişime açıktır."
             },
             "overview": {
                 "title": "Genel Bakış",
@@ -1889,9 +1876,6 @@
                     },
                     "placeholder": "Kablolu, Ray..."
                 },
-                "elevation": {
-                    "label": "Yükseklik"
-                },
                 "email": {
                     "label": "e-posta",
                     "placeholder": "ornek@adres.com"
@@ -2062,7 +2046,6 @@
                     "label": "Aralıklı"
                 },
                 "internet_access": {
-                    "label": "İnternet Bağlantısı",
                     "options": {
                         "no": "Hayır",
                         "terminal": "Bilgisayar",
@@ -2071,9 +2054,6 @@
                         "yes": "Evet"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "İnternet Erişim Ücreti"
-                },
                 "junction/ref_oneway": {
                     "label": "Kavşak Numarası"
                 },
@@ -2864,10 +2844,6 @@
                     "name": "Kayak Teleferiği",
                     "terms": "Kayak Teleferiği"
                 },
-                "aerialway/gondola": {
-                    "name": "Gondol Teleferik",
-                    "terms": "Gondol Teleferik"
-                },
                 "aerialway/goods": {
                     "name": "Taşıma Teleferiği",
                     "terms": "Taşıma Teleferiği, Mal Teleferiği"
@@ -3254,9 +3230,6 @@
                     "name": "Geri Dönüşüm Merkezi",
                     "terms": "Geri Dönüşüm Merkezi"
                 },
-                "amenity/register_office": {
-                    "name": "Nüfus Dairesi"
-                },
                 "amenity/restaurant": {
                     "name": "Lokanta",
                     "terms": "Lokanta, Restoran"
@@ -3320,9 +3293,6 @@
                     "name": "Okul",
                     "terms": "Okul, Okul Bahçesi"
                 },
-                "amenity/scrapyard": {
-                    "name": "Hurdalık"
-                },
                 "amenity/shelter": {
                     "name": "Barınak",
                     "terms": "Barınak"
@@ -3359,9 +3329,6 @@
                     "name": "Stüdyo",
                     "terms": "Stüdyo"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Yüzme Havuzu"
-                },
                 "amenity/taxi": {
                     "name": "Taksi Durağı",
                     "terms": "Taksi Durağı"
@@ -4350,10 +4317,6 @@
                 "landuse": {
                     "name": "Arazi Kullanım Özelliği"
                 },
-                "landuse/allotments": {
-                    "name": "Hobi Bahçesi",
-                    "terms": "Hobi Bahçesi"
-                },
                 "landuse/aquaculture": {
                     "name": "Su Kültürü",
                     "terms": "Su Kültürü"
@@ -4441,18 +4404,10 @@
                     "name": "Deniz Üssü",
                     "terms": "Deniz Üssü"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Engelli Antreman Sahası",
-                    "terms": "Engelli Antreman Sahası"
-                },
                 "landuse/military/range": {
                     "name": "Atış Sahası",
                     "terms": "Atış Sahası, Poligon"
                 },
-                "landuse/military/training_area": {
-                    "name": "Antreman Sahası",
-                    "terms": "Antreman Sahası"
-                },
                 "landuse/orchard": {
                     "name": "Bağ",
                     "terms": "Bağ, Bahçe, Bostan, Meyve Bahçesi"
@@ -4704,10 +4659,6 @@
                     "name": "Gazölçer",
                     "terms": "Gazölçer"
                 },
-                "man_made/groyne": {
-                    "name": "Kıyı Koruyucu Direk Şeridi",
-                    "terms": "Kıyı Koruyucu Direk Şeridi"
-                },
                 "man_made/lighthouse": {
                     "name": "Deniz Feneri",
                     "terms": "Deniz Feneri, Fener"
@@ -4789,9 +4740,6 @@
                     "name": "Fabrika",
                     "terms": "Fabrika, Sanayi"
                 },
-                "military/checkpoint": {
-                    "name": "Kontrol Noktası"
-                },
                 "natural/bare_rock": {
                     "name": "Kayalık Bölge",
                     "terms": "Kayalık Bölge, Kayalar, Kaya Dizisi"
@@ -5258,39 +5206,19 @@
                     "name": "Kullanılmayan Demiryolu",
                     "terms": "Kullanılmayan Demiryolu"
                 },
-                "railway/funicular": {
-                    "name": "Kablolu Tren",
-                    "terms": "Kablolu Tren, Füniküler"
-                },
                 "railway/level_crossing": {
                     "name": "Hemzemin Geçit (Yol ile Kesişim)",
                     "terms": "Hemzemin Geçit (Yol ile Kesişim)"
                 },
-                "railway/monorail": {
-                    "name": "Tekray",
-                    "terms": "Tekray, Monoray"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Dar Demiryolu Geçidi",
-                    "terms": "Dar Demiryolu Geçidi"
-                },
                 "railway/platform": {
                     "name": "Tren Platformu"
                 },
-                "railway/rail": {
-                    "name": "Demiryolu",
-                    "terms": "Demiryolu"
-                },
                 "railway/signal": {
                     "name": "Demiryolu Sinyali"
                 },
                 "railway/station": {
                     "name": "Tren İstasyonu"
                 },
-                "railway/subway": {
-                    "name": "Metro",
-                    "terms": "Metro"
-                },
                 "railway/subway_entrance": {
                     "name": "Metro Girişi",
                     "terms": "Metro Girişi"
@@ -5298,10 +5226,6 @@
                 "railway/train_wash": {
                     "name": "Tren Yıkama"
                 },
-                "railway/tram": {
-                    "name": "Tramvay",
-                    "terms": "Tramvay"
-                },
                 "railway/yard": {
                     "name": "Demir Yolu Sahası"
                 },
@@ -5499,9 +5423,6 @@
                 "shop/fashion": {
                     "name": "Giyim Mağazası"
                 },
-                "shop/fishmonger": {
-                    "name": "Balıkçı"
-                },
                 "shop/florist": {
                     "name": "Çiçekçi",
                     "terms": "Çiçekçi"
@@ -5514,9 +5435,6 @@
                     "name": "Cenaze Koordinatörü",
                     "terms": "Cenaze Koordinatörü"
                 },
-                "shop/furnace": {
-                    "name": "Soba Mağazası"
-                },
                 "shop/furniture": {
                     "name": "Mobilya Mağazası",
                     "terms": "Mobilya Mağazası"

vendor/assets/iD/iD/locales/uk.json

@@ -20,6 +20,14 @@
             "favorites": "Закладки",
             "add_feature": "Додати об'єкт"
         },
+        "title": {
+            "format": {
+                "context": "{base} – {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} – {context}"
+            },
+            "labeled_and_more": "{labeled} та {count}"
+        },
         "modes": {
             "add_feature": {
                 "title": "Додати об'єкт",
@@ -590,7 +598,7 @@
             "request_review": "Я бажаю, щоб хтось переглянув мої зміни.",
             "save": "Надіслати",
             "cancel": "Скасувати",
-            "changes": "Зміни - {count}",
+            "changes": "Зміни ({count})",
             "download_changes": "Завантажити файл osmChange",
             "errors": "Помилки",
             "warnings": "Попередження",
@@ -678,20 +686,19 @@
             "no_results_worldwide": "Нічого не знайдено"
         },
         "geolocate": {
+            "key": "L",
             "title": "Моє місцезнаходження",
-            "locating": "Визначаємо положення, зачекайте…"
+            "locating": "Визначаємо положення, зачекайте…",
+            "location_unavailable": "Неможливо визначити ваше місцезнаходження."
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "Масштабувати",
-                "tooltip_feature": "Масштабувати мапу, щоб показати цей об'єкт.",
-                "tooltip_note": "Масштабувати мапу, щоб показати цю нотатку.",
-                "tooltip_data": "Масштабувати мапу, щоб показати ці дані.",
-                "tooltip_issue": "Масштабувати мапу, щоб показати цю ваду."
+                "title": "Масштабувати"
             },
             "show_more": "Ще",
             "view_on_osm": "Подивитись на openstreetmap.org",
+            "view_on_osmose": "Подивитись на osmose.openstreetmap.fr",
             "view_on_keepRight": "Подивитись на keepright.at",
             "feature_type": "Тип об'єкта",
             "fields": "Поля",
@@ -1048,14 +1055,19 @@
         },
         "cannot_zoom": "Не можливо зменшити масштаб в поточному режимі.",
         "full_screen": "Розвернути на весь екран",
+        "self_intersection": {
+            "error": {
+                "lines": "Лінії не мають перетинати себе.",
+                "areas": "Полігони не мають перетинати себе."
+            }
+        },
         "QA": {
             "osmose": {
                 "title": "Проблема з Osmose",
                 "detail_title": "Подробиці",
                 "elems_title": "Об’єкти",
                 "fix_title": "Поради щодо виправлення",
-                "trap_title": "Поширені помилки",
-                "translation": "Переклад з Osmose"
+                "trap_title": "Поширені помилки"
             },
             "improveOSM": {
                 "title": "ImproveOSM Знахідки",
@@ -1515,7 +1527,7 @@
                 "before_start": "Вам потрібно ознайомитись з OpenStreetMap та цим редактором, перш ніж почати вносити зміни. iD має покрокове керівництво, яке допоможе вам навчитись основ редагування в OpenStreetMap. Клацніть кнопку \"Покрокове керівництво\", щоб перейти до навчання, яке триватиме близько 15 хвилин.",
                 "open_source_h": "Відкриті сирці",
                 "open_source": "Редактор iD є суспільним проєктом з відкритими сирцями. На поточний момент ви користуєтесь версією {version}. Сирці знаходяться [на GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Ви можете зробити свій внесок в iD взявши участь у [перекладі](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) або [сповіщаючи про помилки](https://github.com/openstreetmap/iD/issues)."
+                "open_source_help": "Ви можете зробити свій внесок в iD взявши участь у [перекладі](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) або [сповіщаючи про помилки](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
                 "title": "Огляд",
@@ -2434,7 +2446,8 @@
                     "pan": "Перетягування мапи",
                     "pan_more": "Пересунути мапу на один екран",
                     "zoom": "Наблизитись / Віддалитись",
-                    "zoom_more": "Швидко Наблизитись / Віддалитись"
+                    "zoom_more": "Швидко Наблизитись / Віддалитись",
+                    "geolocate": "Масштабувати до мого місцезнаходження"
                 },
                 "help": {
                     "title": "Довідка",
@@ -2893,6 +2906,9 @@
                 "bridge/support": {
                     "label": "Тип"
                 },
+                "bridge_combo": {
+                    "label": "Тип"
+                },
                 "building": {
                     "label": "Будівля",
                     "terms": "будова,будівля,споруда,структура"
@@ -2947,6 +2963,14 @@
                     "placeholder": "50, 100, 200…",
                     "terms": "об'єм,обсяг,місткість,кількість"
                 },
+                "capacity/disabled_parking": {
+                    "label": "Місця для інвалідів",
+                    "placeholder": "1, 2, 3…"
+                },
+                "capacity_parking": {
+                    "label": "Місць всього",
+                    "placeholder": "10, 20, 30…"
+                },
                 "cash_in": {
                     "label": "Купюроприймач"
                 },
@@ -2967,7 +2991,13 @@
                     "terms": "плата,такса,ціна,проїзд"
                 },
                 "check_date": {
-                    "label": "Востаннє перевірялось"
+                    "label": "Востаннє перевірялось",
+                    "placeholder": "РРРР-ММ-ДД"
+                },
+                "circumference": {
+                    "label": "Окружність",
+                    "placeholder": "1 м, 20 см, 30 дюймів…",
+                    "terms": "стовбур,дерево,окружність,обхват"
                 },
                 "clothes": {
                     "label": "Одяг"
@@ -3134,6 +3164,9 @@
                         "yes": "В наявності"
                     }
                 },
+                "depth": {
+                    "label": "Глибина (метрів)"
+                },
                 "description": {
                     "label": "Опис",
                     "terms": "опис,конспект,перелік,резюме"
@@ -3217,11 +3250,15 @@
                     "label": "Циферблат"
                 },
                 "distance": {
-                    "label": "Відстань"
+                    "label": "Відстань",
+                    "terms": "відстань,км,кілометр,метр,миля"
                 },
                 "disused/railway": {
                     "label": "Тип"
                 },
+                "disused/shop": {
+                    "label": "Тип"
+                },
                 "dock": {
                     "label": "Тип"
                 },
@@ -3256,6 +3293,14 @@
                     "placeholder": "00:00",
                     "terms": "тривалість,час,термін,інтервал"
                 },
+                "ele": {
+                    "label": "Висота над р.м.",
+                    "terms": "висота,вершина"
+                },
+                "ele_node": {
+                    "label": "Висота над р.м.",
+                    "terms": "висота,вершина"
+                },
                 "electrified": {
                     "label": "Електрифікація",
                     "options": {
@@ -3267,10 +3312,6 @@
                     "placeholder": "Контактна лінія, електрифіковані рейки…",
                     "terms": "лінія,напруга,частота,контакт,електрика,вольтаж,мережа"
                 },
-                "elevation": {
-                    "label": "Висота над р.м.",
-                    "terms": "висота,вершина"
-                },
                 "email": {
                     "label": "Е-пошта",
                     "placeholder": "example@example.com",
@@ -3387,6 +3428,9 @@
                 "gambling": {
                     "label": "Ігри"
                 },
+                "garden/type": {
+                    "label": "Тип саду"
+                },
                 "gauge": {
                     "label": "Колія"
                 },
@@ -3576,11 +3620,16 @@
                         "wlan": "Wifi",
                         "yes": "Так"
                     },
-                    "terms": "wifi,мережа,кабель,бездортовий"
+                    "terms": "wifi,мережа,кабель,бездортовий,мобільний,зв'язок"
                 },
                 "internet_access/fee": {
                     "label": "Плата за доступ до Інтернету",
-                    "terms": "плата,за гроші"
+                    "options": {
+                        "customers": "Тільки для клієнтів",
+                        "no": "Безоплатно",
+                        "yes": "За плату"
+                    },
+                    "terms": "плата,за гроші,безоплатно,вільно,wifi"
                 },
                 "internet_access/ssid": {
                     "label": "Назва мережі WiFi",
@@ -3778,6 +3827,10 @@
                     "label": "Міні-пивоварня",
                     "terms": "пиво,крафт,пивоварня,мікро"
                 },
+                "mimics": {
+                    "label": "Схоже на",
+                    "terms": "дерево,виглядає,замасковане,камуфляж"
+                },
                 "min_age": {
                     "label": "Мінімальний вік",
                     "terms": "вік,років,рік,возраст,граничний"
@@ -3845,8 +3898,7 @@
                     "terms": "мережа"
                 },
                 "network/type": {
-                    "label": "Тип мережі",
-                    "terms": "мережа"
+                    "label": "Тип мережі"
                 },
                 "network_bicycle": {
                     "label": "Клас мережі",
@@ -3921,7 +3973,8 @@
                     "terms": "вогонь,вогнище,багаття,костер,полум'я"
                 },
                 "opening_date": {
-                    "label": "Очікувана дата відкриття"
+                    "label": "Очікувана дата відкриття",
+                    "placeholder": "РРРР-ММ-ДД"
                 },
                 "opening_hours": {
                     "label": "Розклад роботи",
@@ -3959,6 +4012,9 @@
                         "underground": "Підземна"
                     }
                 },
+                "parking_space": {
+                    "label": "Тип"
+                },
                 "payment_multi": {
                     "label": "Види розрахунків",
                     "terms": "готівка,чек,монети,гроші,картка,купон,онлайн"
@@ -4099,6 +4155,10 @@
                 "playground/theme": {
                     "label": "Тема"
                 },
+                "plots": {
+                    "label": "Ділянки",
+                    "placeholder": "10, 20, 30…"
+                },
                 "polling_station": {
                     "label": "Місце для голосування",
                     "terms": "дільниця,голосування,вибори,виборча"
@@ -4518,6 +4578,7 @@
                 },
                 "start_date": {
                     "label": "Дата початку",
+                    "placeholder": "РРРР-ММ-ДД",
                     "terms": "початок,починання,відкриття"
                 },
                 "step_count": {
@@ -4632,6 +4693,9 @@
                 "target": {
                     "label": "Представництво"
                 },
+                "telecom/medium": {
+                    "label": "Тип"
+                },
                 "tidal": {
                     "label": "Заплава",
                     "terms": "прилив,відлив,вода,мілина,ранок,вечір"
@@ -4759,6 +4823,9 @@
                     "label": "Тип",
                     "placeholder": "Типово"
                 },
+                "tunnel_combo": {
+                    "label": "Тип"
+                },
                 "usage_rail": {
                     "label": "Тіп колії",
                     "options": {
@@ -4952,8 +5019,8 @@
                     "terms": "витяг,бугель,підйомник,лижі,сніг,гори,відпочинок,дозвілля,спорт,сноуборд"
                 },
                 "aerialway/gondola": {
-                    "name": "Гондоли",
-                    "terms": "gondola,ujyljkb,гондола"
+                    "name": "Гондольний підйомник",
+                    "terms": "витяг,бугель,підйомник,лижі,сніг,гори,відпочинок,дозвілля,спорт,сноуборд,гондола"
                 },
                 "aerialway/goods": {
                     "name": "Вантажна канатна дорога",
@@ -5439,6 +5506,10 @@
                     "name": "Місце на стоянці",
                     "terms": "стоянка,місце,автомобіль"
                 },
+                "amenity/parking_space/disabled": {
+                    "name": "Місця стоянки для інвалідів",
+                    "terms": "стоянка,пракінг,інвалід,місце,автомобіль"
+                },
                 "amenity/payment_centre": {
                     "name": "Приймання платежів",
                     "terms": "термінал,комуналка,платіжка,прийом,каса,гроші"
@@ -5578,9 +5649,6 @@
                     "name": "Контейнер для вторсировини",
                     "terms": "бляшанки,банки,пляшки,сміття,лахміття,лахи,вторинні ресурси,відходи"
                 },
-                "amenity/register_office": {
-                    "name": "РАГС (ЗАГС)"
-                },
                 "amenity/research_institute": {
                     "name": "Територія науково-дослідного інституту",
                     "terms": "НДІ,інститут,досліди,проект,лабораторія"
@@ -5669,9 +5737,6 @@
                     "name": "Територія школи",
                     "terms": "шкільний двір,школа"
                 },
-                "amenity/scrapyard": {
-                    "name": "Авторозборка"
-                },
                 "amenity/shelter": {
                     "name": "Притулок",
                     "terms": "накриття,навіс,альтанка,газебо"
@@ -5748,9 +5813,6 @@
                     "name": "Кіностудія",
                     "terms": "кіно,зйомки,майданчик,знімальний,студія,виробництво"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Басейн"
-                },
                 "amenity/taxi": {
                     "name": "Стоянка таксі",
                     "terms": "Taxi Stand, cnjzyrf nfrcs,таксі, зупинка таксі"
@@ -6592,6 +6654,9 @@
                 "disused/railway": {
                     "name": "Покинуті об'єкти залізниці"
                 },
+                "disused/shop": {
+                    "name": "Закинутий магазин"
+                },
                 "embankment": {
                     "name": "Насип"
                 },
@@ -7517,6 +7582,14 @@
                     "name": "Сад",
                     "terms": "Garden, cfl, сад"
                 },
+                "leisure/garden/botanical": {
+                    "name": "Ботанічний сад",
+                    "terms": "рослини,сад,ботаніка,колекція,рідкісні"
+                },
+                "leisure/garden/community": {
+                    "name": "Комунальний сад",
+                    "terms": "садівництво,комуна,спільнота,росдлинництво,спільно"
+                },
                 "leisure/golf_course": {
                     "name": "Поле для гольфу",
                     "terms": "Golf Course, gjkt lkz ujkmae, поле для гольфу"
@@ -7709,26 +7782,14 @@
                     "name": "Велотрек",
                     "terms": "трек,велосипед,перегони,спорт"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "Велотрек",
-                    "terms": "вело,трек,велодром"
-                },
                 "leisure/track/horse_racing": {
                     "name": "Іподром",
                     "terms": "скачки,перегони,коні,жокей,стайня,ставки,виграш"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Іподром",
-                    "terms": "скачки,перегони,коні,жокей,стайня,ставки,виграш"
-                },
                 "leisure/track/running": {
                     "name": "Бігова доріжка",
                     "terms": "бігова доріжка,трек"
                 },
-                "leisure/track/running_point": {
-                    "name": "Бігова доріжка",
-                    "terms": "бігова доріжка,трек,марафон,спринт,середня відстань"
-                },
                 "leisure/water_park": {
                     "name": "Аквапарк",
                     "terms": "розваги,вода,горка,басейн,пірнання,душова,роздягальня,веселощі,гідромасаж"
@@ -7810,7 +7871,7 @@
                 },
                 "man_made/groyne": {
                     "name": "Хвилеріз",
-                    "terms": "хвилі,споруда,захист,пляж,бухта"
+                    "terms": "хвилі,споруда,захист,пляж,бухта,мол"
                 },
                 "man_made/lighthouse": {
                     "name": "Маяк",
@@ -8127,6 +8188,10 @@
                     "name": "Галечник",
                     "terms": "галечниковий пляж,галька,каміння,насип"
                 },
+                "natural/shrub": {
+                    "name": "Кущ",
+                    "terms": "кущ,чагарник,зелень"
+                },
                 "natural/spring": {
                     "name": "Джерело",
                     "terms": "Spring, lthtkj, вода, джерело"
@@ -8567,6 +8632,9 @@
                 "power": {
                     "name": "Енергетика"
                 },
+                "power/cable": {
+                    "name": "Електричний кабель"
+                },
                 "power/cable/underground": {
                     "name": "Підземний силовий кабель",
                     "terms": "кабель,підземний,електрика,постачання"
@@ -8838,7 +8906,7 @@
                 },
                 "railway/funicular": {
                     "name": "Фунікулер",
-                    "terms": "фунікулер, канат, трос"
+                    "terms": "фунікулер,канат,трос,вагон,рейки"
                 },
                 "railway/halt": {
                     "name": "Полустанок (на вимогу)"
@@ -8861,18 +8929,26 @@
                 },
                 "railway/monorail": {
                     "name": "Монорейка",
-                    "terms": "Monorail, vjyjhtqrf, монорейка"
+                    "terms": "monorail,монорейка,потяг,вагон"
+                },
+                "railway/monorail/hanging": {
+                    "name": "Підвісна монорейка",
+                    "terms": "транспорт,монорйка,вагон,підвіс"
                 },
                 "railway/narrow_gauge": {
                     "name": "Вузькоколійна Залізниця",
-                    "terms": "залізниця, колія, вокзал"
+                    "terms": "залізниця,колія,вокзал,потяг,вагон,перевезення"
                 },
                 "railway/platform": {
                     "name": "Залізнична платформа"
                 },
+                "railway/preserved": {
+                    "name": "Історична залізнична колія",
+                    "terms": "рейки,колія,залізниця,дорога,потяг,вагон,історія"
+                },
                 "railway/rail": {
                     "name": "Рейки",
-                    "terms": "Rail,htqrb, колії"
+                    "terms": "рейки,колія,залізниця,дорога,потяг,вагон"
                 },
                 "railway/rail/highspeed": {
                     "name": "Швидкісна залізниця",
@@ -8887,7 +8963,7 @@
                 },
                 "railway/subway": {
                     "name": "Метрополітен",
-                    "terms": "Subway, vtnhjgjksnty, підземка, метро"
+                    "terms": "підземка,метро,труба,залізниця,маршрут"
                 },
                 "railway/subway_entrance": {
                     "name": "Вхід до метро",
@@ -8903,7 +8979,7 @@
                 },
                 "railway/tram": {
                     "name": "Трамвай",
-                    "terms": "Tram, nhfvdfq, трамвай"
+                    "terms": "трамвай,колія,рейки"
                 },
                 "railway/tram_stop": {
                     "name": "Місце зупинки трамвая"
@@ -9213,9 +9289,6 @@
                     "name": "Рибальський магазин",
                     "terms": "рибалка,наживка,волосінь,приманка,вудка,рибальство"
                 },
-                "shop/fishmonger": {
-                    "name": "Риботорговець"
-                },
                 "shop/flooring": {
                     "name": "Магазин напільних матеріалів",
                     "terms": "підлога,плитка,кахель,паркет"
@@ -9230,7 +9303,7 @@
                 },
                 "shop/frozen_food": {
                     "name": "Заморожені продукти",
-                    "terms": "магазин,їжа,продукти,напівфабрикати"
+                    "terms": "магазин,їжа,продукти,напівфабрикати,заморозка"
                 },
                 "shop/fuel": {
                     "name": "Паливо",
@@ -9240,9 +9313,6 @@
                     "name": "Ритуальні послуги",
                     "terms": "похорони, поховання"
                 },
-                "shop/furnace": {
-                    "name": "Опалювальні котли"
-                },
                 "shop/furniture": {
                     "name": "Меблі",
                     "terms": "Furniture Store, vtks, меблі"
@@ -9618,6 +9688,10 @@
                     "name": "Дата-центр",
                     "terms": "комп'ютер,дані,сервер,хмара,ферма,телеком"
                 },
+                "telecom/exchange": {
+                    "name": "Комутаційна шафа",
+                    "terms": "телеком,шафа,комутатор,РП"
+                },
                 "tourism": {
                     "name": "Туризм"
                 },
@@ -9976,6 +10050,10 @@
                     "name": "Трамвайний маршрут",
                     "terms": "Tram Route, nhfvdfqybq vfhihen, трамвайний маршрут"
                 },
+                "type/route/trolleybus": {
+                    "name": "Тролейбусний маршрут",
+                    "terms": "тролейбус,вагон,електротранспорт,електробус,дроти,платформа,зупинка,транзит,громадський,транспорт,перевезення,рогатий"
+                },
                 "type/route_master": {
                     "name": "Маршрут громадського транспорту",
                     "terms": "Route Master,nhfycgjhnybq vfhihen,транспортний маршрут,маршрут,громадський,транспорт"
@@ -10322,6 +10400,13 @@
                 "description": "Мапа міста - це оглядова мапа, яка зображує Гетеборг. Вона містить загальну інформацію про землю, комунікації, гідрографію, будинки, адресні номери та назви вулиць, адміністративний поділ та інший орієнтаційний текст.",
                 "name": "Мапа міста Гетеборг"
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© Муніципалітет Гетеборга, CC0"
+                },
+                "description": "Ортофото муніципалітету Гетеборга",
+                "name": "Гетеборг ортофото"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI Japan"
@@ -10348,7 +10433,7 @@
                     "text": "© Helsingborg municipality"
                 },
                 "description": "Ортофото муніципалітету Хельсінгборг, 2016 р., суспільне надбання",
-                "name": "Helsingborg Orthophoto"
+                "name": "Хельсінгборг ортофото"
             },
             "kalmar-orto-2014": {
                 "attribution": {
@@ -10489,6 +10574,12 @@
                 },
                 "name": "Thunderforest Landscape"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Мапи © Thunderforest, Дані © Учасники OpenStreetMap"
+                },
+                "name": "Thunderforest Outdoors"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -10530,6 +10621,12 @@
                 },
                 "description": "Дорожня мережа Швеції NVDB з кількома варіантами шарів мапи",
                 "name": "Trafikverket Дорожня мережа, додатково"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Уряд міста Вроцлав"
+                },
+                "name": "Вроцлав, ортофотомапа 2018"
             }
         },
         "community": {

vendor/assets/iD/iD/locales/vi.json

@@ -20,6 +20,14 @@
             "favorites": "Ưa thích",
             "add_feature": "Thêm Đối tượng"
         },
+        "title": {
+            "format": {
+                "context": "{base} – {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} – {context}"
+            },
+            "labeled_and_more": "{labeled} và {count} nữa"
+        },
         "modes": {
             "add_feature": {
                 "title": "Thêm một đối tượng",
@@ -197,7 +205,7 @@
                     "points": "Làm thẳng hàng điểm này.",
                     "line": "Làm thẳng đường kẻ này."
                 },
-                "key": "L",
+                "key": "S",
                 "annotation": {
                     "points": "làm thẳng một hàng điểm",
                     "line": "làm thẳng một đường kẻ"
@@ -590,7 +598,7 @@
             "request_review": "Tôi muốn ai đó xem lại những thay đổi này.",
             "save": "Đăng lên",
             "cancel": "Hủy bỏ",
-            "changes": "{count} Thay đổi",
+            "changes": "Thay đổi ({count})",
             "download_changes": "Tải về tập tin osmChange",
             "errors": "Lỗi",
             "warnings": "Cảnh báo",
@@ -678,20 +686,19 @@
             "no_results_worldwide": "Không tìm thấy kết quả"
         },
         "geolocate": {
+            "key": "J",
             "title": "Nhảy tới Vị trí của Tôi",
-            "locating": "Đang tải, vui lòng chờ đợi…"
+            "locating": "Đang tải, vui lòng chờ đợi…",
+            "location_unavailable": "Vị trí của bạn không có sẵn."
         },
         "inspector": {
             "zoom_to": {
                 "key": "P",
-                "title": "Phóng vừa",
-                "tooltip_feature": "Đặt đối tượng này vào giữa bản đồ và phóng vừa.",
-                "tooltip_note": "Đặt ghi chú này vào giữa bản đồ và phóng vừa.",
-                "tooltip_data": "Đặt dữ liệu này vào giữa bản đồ và phóng vừa.",
-                "tooltip_issue": "Đặt vấn đề này vào giữa bản đồ và phóng vừa."
+                "title": "Phóng vừa Lựa chọn"
             },
             "show_more": "Xem thêm",
             "view_on_osm": "Xem tại openstreetmap.org",
+            "view_on_osmose": "Xem tại osmose.openstreetmap.fr",
             "view_on_keepRight": "Xem tại keepright.at",
             "feature_type": "Thể loại Đối tượng",
             "fields": "Thuộc tính",
@@ -1048,14 +1055,19 @@
         },
         "cannot_zoom": "Không thể thu nhỏ hơn trong chế độ hiện tại.",
         "full_screen": "Bật/tắt Chế độ Toàn màn hình",
+        "self_intersection": {
+            "error": {
+                "lines": "Đường kẻ không thể tự giao điểm.",
+                "areas": "Vùng không thể tự giao điểm."
+            }
+        },
         "QA": {
             "osmose": {
                 "title": "Vấn đề Osmose",
                 "detail_title": "Chi tiết",
                 "elems_title": "Đối tượng",
                 "fix_title": "Gợi ý Sửa chữa",
-                "trap_title": "Lỗi Thường Gặp",
-                "translation": "Bản dịch do Osmose cung cấp"
+                "trap_title": "Lỗi Thường Gặp"
             },
             "improveOSM": {
                 "title": "Sự dò ImproveOSM",
@@ -1515,7 +1527,7 @@
                 "before_start": "Bạn nên quen với OpenStreetMap và chương trình này trước khi bắt đầu sửa đổi bản đồ. iD có chế độ hướng dẫn những căn bản sửa đổi OpenStreetMap. Nhấn chuột vào “Mở trình hướng dẫn” trong cửa sổ này để bắt đầu tìm hiểu thêm – điều này chỉ mất vào khoảng 15 phút.",
                 "open_source_h": "Mã nguồn mở",
                 "open_source": "Chương trình iD nhờ dự án mã nguồn mở cộng tác xây dựng. Bạn đang sử dụng phiên bản {version}. Mã nguồn có sẵn [tại GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "Mời bạn góp sức [biên dịch](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) hoặc [báo cáo lỗi](https://github.com/openstreetmap/iD/issues)."
+                "open_source_help": "Mời bạn góp sức [biên dịch](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) hoặc [báo cáo lỗi](https://github.com/openstreetmap/iD/issues)."
             },
             "overview": {
                 "title": "Giới thiệu",
@@ -2434,7 +2446,8 @@
                     "pan": "Di chuyển bản đồ",
                     "pan_more": "Di chuyển bản đồ cả chiều rộng/cao màn hình",
                     "zoom": "Thu phóng",
-                    "zoom_more": "Thu phóng rất nhiều"
+                    "zoom_more": "Thu phóng rất nhiều",
+                    "geolocate": "Phóng vừa vị trí của tôi"
                 },
                 "help": {
                     "title": "Trợ giúp",
@@ -2886,6 +2899,9 @@
                 "bridge/support": {
                     "label": "Kiểu"
                 },
+                "bridge_combo": {
+                    "label": "Kiểu"
+                },
                 "building": {
                     "label": "Tòa nhà",
                     "terms": "tòa nhà, toà nhà, nhà, toa nha, nha"
@@ -2938,6 +2954,13 @@
                     "label": "Sức chứa",
                     "placeholder": "50, 100, 200…"
                 },
+                "capacity/disabled_parking": {
+                    "placeholder": "1, 2, 3…"
+                },
+                "capacity_parking": {
+                    "label": "Tổng số Chỗ Đậu xe",
+                    "placeholder": "10, 20, 30…"
+                },
                 "cash_in": {
                     "label": "Nhận tiền"
                 },
@@ -2958,7 +2981,13 @@
                     "terms": "giá thu phí, gia thu phi"
                 },
                 "check_date": {
-                    "label": "Lần Kiểm tra Cuối"
+                    "label": "Lần Kiểm tra Cuối",
+                    "placeholder": "YYYY-MM-DD (Năm-Tháng-Ngày)"
+                },
+                "circumference": {
+                    "label": "Chu vi",
+                    "placeholder": "1 m, 20 cm, 30 in…",
+                    "terms": "chu vi, đường tròn, duong tron"
                 },
                 "clothes": {
                     "label": "Quần áo"
@@ -3120,6 +3149,9 @@
                         "yes": "Có"
                     }
                 },
+                "depth": {
+                    "label": "Độ sâu (Mét)"
+                },
                 "description": {
                     "label": "Miêu tả",
                     "terms": "miêu tả, mô tả, lời miêu tả, lời mô tả, mieu ta, mo ta, loi mieu ta, loi mo ta"
@@ -3206,6 +3238,9 @@
                 "disused/railway": {
                     "label": "Kiểu"
                 },
+                "disused/shop": {
+                    "label": "Kiểu"
+                },
                 "dock": {
                     "label": "Loại"
                 },
@@ -3240,6 +3275,14 @@
                     "placeholder": "00:00",
                     "terms": "mất thời gian, thời gian, giây, phút, giờ, tiếng đồng hồ, tiếng hồ, tiếng, ngày, đêm, tuần, tuần lễ, tháng, năm, khoảng thời gian, thời khoảng, trường độ"
                 },
+                "ele": {
+                    "label": "Cao độ",
+                    "terms": "cao độ, độ cao, số mét trên mặt biển, cao do, do cao, so met tren mat bien"
+                },
+                "ele_node": {
+                    "label": "Cao độ",
+                    "terms": "cao độ, độ cao, số mét trên mặt biển, cao do, do cao, so met tren mat bien"
+                },
                 "electrified": {
                     "label": "Điện khí hóa",
                     "options": {
@@ -3250,10 +3293,6 @@
                     },
                     "placeholder": "Dây điện Bên trên, Đường ray Điện…"
                 },
-                "elevation": {
-                    "label": "Cao độ",
-                    "terms": "cao độ, độ cao, số mét trên mặt biển, cao do, do cao, so met tren mat bien"
-                },
                 "email": {
                     "label": "Thư điện tử",
                     "placeholder": "vidu@example.com",
@@ -3364,6 +3403,9 @@
                 "gambling": {
                     "label": "Trò chơi"
                 },
+                "garden/type": {
+                    "label": "Kiểu Vườn"
+                },
                 "gauge": {
                     "label": "Khổ"
                 },
@@ -3540,17 +3582,24 @@
                     "label": "Lúc có nước Lúc không"
                 },
                 "internet_access": {
-                    "label": "Truy cập Internet",
+                    "label": "Kết nối Internet",
                     "options": {
                         "no": "Không có",
                         "terminal": "Máy tính công cộng",
                         "wired": "Qua dây điện",
                         "wlan": "Wi-Fi",
                         "yes": "Có"
-                    }
+                    },
+                    "terms": "kết nối internet, kết nối mạng, ket noi internet, ket noi mang, wi-fi, wifi, wlan"
                 },
                 "internet_access/fee": {
-                    "label": "Phí Truy cập Internet"
+                    "label": "Truy cập Internet",
+                    "options": {
+                        "customers": "Chỉ Khách hàng",
+                        "no": "Miễn phí",
+                        "yes": "Phí"
+                    },
+                    "terms": "truy cập internet, truy cập mạng, truy cap internet, truy cap mang, wi-fi, wifi"
                 },
                 "internet_access/ssid": {
                     "label": "Tên Mạng Wi-Fi",
@@ -3576,6 +3625,9 @@
                 "kerb/height": {
                     "label": "Chiều cao"
                 },
+                "kneipp_water_cure_multi": {
+                    "label": "Kiểu Bồn"
+                },
                 "label": {
                     "label": "Chữ đề"
                 },
@@ -3739,6 +3791,10 @@
                     "label": "Bia Thủ công",
                     "terms": "bia thủ công, bia làm lấy, bia thu cong, bia lam lay"
                 },
+                "mimics": {
+                    "label": "Bắt chước",
+                    "terms": "bắt chước, trá hình, cải trang, bat chuoc, tra hinh, cai trang"
+                },
                 "min_age": {
                     "label": "Tuổi Tối thiểu",
                     "terms": "tuổi tối thiểu, tuoi toi thieu"
@@ -3876,17 +3932,20 @@
                     "terms": "cho phép đánh lửa dã ngoại, cho phép nhóm lửa dã ngoại, cho phép đánh lửa giã ngoại, cho phép nhóm lửa dã ngoại, đánh lửa dã ngoại, nhóm lửa dã ngoại, đánh lửa giã ngoại, nhóm lửa dã ngoại, cho phep danh lua da ngoai, cho phep nhom lua da ngoai, cho phep danh lua gia ngoai, cho phep nhom lua da ngoai, danh lua da ngoai, nhom lua da ngoai, danh lua gia ngoai, nhom lua da ngoai"
                 },
                 "opening_date": {
-                    "label": "Ngày Dự kiến Khai trương"
+                    "label": "Ngày Dự kiến Khai trương",
+                    "placeholder": "YYYY-MM-DD (Năm-Tháng-Ngày)"
                 },
                 "opening_hours": {
                     "label": "Giờ Mở cửa",
-                    "placeholder": "Không rõ"
+                    "placeholder": "Không rõ",
+                    "terms": "giờ mở cửa, giờ giấc mở cửa, gio mo cua, gio giac mo cua"
                 },
                 "operator": {
-                    "label": "Cơ quan Chủ quản"
+                    "label": "Tổ chức Chủ quản",
+                    "terms": "tổ chức chủ quản, cơ quan chủ quản, nhà chủ quản, tổ chức quản lý, tổ chức quản lí, cơ quan quản lý, cơ quan quản lí, nhà quản lý, nhà quản lí, tổ chức hoạt động, cơ quan hoạt động, nhà hoạt động, to chuc chu quan, co quan chu quan, nha chu quan, to chuc quan ly, to chuc quan li, co quan quan ly, co quan quan li, nha quan ly, nha quan li, to chuc hoat dong, co quan hoat dong, nha hoat dong"
                 },
                 "operator/type": {
-                    "label": "Kiểu Cơ quan Chủ quan"
+                    "label": "Kiểu Tổ chức Chủ quản"
                 },
                 "outdoor_seating": {
                     "label": "Ngồi Ngoài trời"
@@ -3911,6 +3970,9 @@
                         "underground": "Ngầm"
                     }
                 },
+                "parking_space": {
+                    "label": "Kiểu"
+                },
                 "payment_multi": {
                     "label": "Phương thức Thanh toán"
                 },
@@ -4049,6 +4111,10 @@
                 "playground/theme": {
                     "label": "Chủ đề"
                 },
+                "plots": {
+                    "label": "Số Miếng đất",
+                    "placeholder": "10, 20, 30…"
+                },
                 "polling_station": {
                     "label": "Địa điểm Đi bầu",
                     "terms": "địa điểm đi bầu, địa điểm bỏ phiếu, địa điểm bầu cử, dia diem di bau, dia diem bo phieu, dia diem bau cu"
@@ -4193,7 +4259,8 @@
                     "label": "Hạn chế rẽ"
                 },
                 "roof/colour": {
-                    "label": "Màu Mái"
+                    "label": "Màu Mái",
+                    "terms": "màu mái, màu nóc, mau mai, mau noc"
                 },
                 "room": {
                     "label": "Kiểu"
@@ -4448,10 +4515,13 @@
                     "label": "Số Sao"
                 },
                 "start_date": {
-                    "label": "Ngày Bắt đầu"
+                    "label": "Ngày Bắt đầu",
+                    "placeholder": "YYYY-MM-DD (Năm-Tháng-Ngày)",
+                    "terms": "ngày bắt đầu, ngày tháng bắt đầu, lúc bắt đầu, ngày xây dựng, lúc xây dựng, ngày tạo thành, lúc tạo thành, ngày khánh thành, lúc khánh thành, ngày mở cửa, lúc mở cửa, ngày thành lập, lúc thành lập, ngày sáng lập, lúc sáng lập, ngày khởi đầu, lúc khởi đầu, ngay bat dau, ngay thang bat dau, luc bat dau, ngay xay dung, luc xay dung, ngay tao thanh, luc tao thanh, ngay khanh thanh, luc khanh thanh, ngay mo cua, luc mo cua, ngay thanh lap, luc thanh lap, ngay sang lap, luc sang lap, ngay khoi dau, luc khoi dau"
                 },
                 "step_count": {
-                    "label": "Số Bước"
+                    "label": "Số Bước",
+                    "terms": "số bước, số bậc, số nấc, so buoc, so bac, so nac"
                 },
                 "stile": {
                     "label": "Kiểu"
@@ -4554,6 +4624,9 @@
                 "target": {
                     "label": "Nước Bạn"
                 },
+                "telecom/medium": {
+                    "label": "Phương tiện"
+                },
                 "tidal": {
                     "label": "Thủy triều"
                 },
@@ -4676,6 +4749,9 @@
                     "label": "Kiểu",
                     "placeholder": "Bình thường"
                 },
+                "tunnel_combo": {
+                    "label": "Kiểu"
+                },
                 "usage_rail": {
                     "label": "Kiểu Sử dụng",
                     "options": {
@@ -4685,7 +4761,8 @@
                         "military": "Quân sự",
                         "test": "Thử nghiệm",
                         "tourism": "Du lịch"
-                    }
+                    },
+                    "terms": "kiểu sử dụng, kiểu dùng, kieu su dung, kieu dung"
                 },
                 "valve": {
                     "label": "Kiểu"
@@ -4693,6 +4770,10 @@
                 "vending": {
                     "label": "Loại Hàng hóa"
                 },
+                "video_calls": {
+                    "label": "Cuộc gọi Video",
+                    "terms": "cuộc gọi video, gọi video, cuộc gọi hình, cuộc gọi ảnh, cuoc goi video, goi video, cuoc goi hinh, cuoc goi anh"
+                },
                 "visibility": {
                     "label": "Tầm Nhìn Xa",
                     "options": {
@@ -4838,10 +4919,6 @@
                     "name": "Đường Cáp Kéo",
                     "terms": "đường cáp kéo, thang kéo trượt tuyết, thang kéo xki, duong cao keo, thang keo truot tuyet, thang keo xki"
                 },
-                "aerialway/gondola": {
-                    "name": "Xe Cáp treo Nhỏ",
-                    "terms": "xe cáp treo nhỏ, toa cáp treo nhỏ, xe cap treo nho, toa cap treo nho"
-                },
                 "aerialway/goods": {
                     "name": "Cáp Kéo Hàng",
                     "terms": "cáp kéo hàng, thang kéo hàng, cao keo hang, thang keo hang"
@@ -4893,10 +4970,18 @@
                     "name": "Sân bay Trực thăng",
                     "terms": "máy bay trực thăng, máy bay lên thẳng, sân bay trực thăng, sân bay lên thẳng, phi trường trực thăng, sàn đỗ trực thăng, sàn đáp trực thăng, sân máy bay trực thăng, bãi đáp máy bay trực thăng, may bay truc thang, may bay len thang, san bay truc thang, san bay len thang, phi truong truc thang, san do truc thang, san dap truc thang, san may bay truc thang, bai dap may bay truc thang"
                 },
+                "aeroway/holding_position": {
+                    "name": "Vị trí Chờ đợi dành cho Máy bay",
+                    "terms": "vị trí chờ đợi dành cho máy bay, chỗ chờ dành cho máy bay, vị trí chờ đợi dành cho phi cơ, chỗ chờ dành cho phi cơ, vi tri cho doi danh cho may bay, cho cho danh cho may bay, vi tri cho doi danh cho phi co, cho cho danh cho phi co"
+                },
                 "aeroway/jet_bridge": {
                     "name": "Cầu Hành khách",
                     "terms": "cầu hành khách, cầu hàng không, cau hanh khach, cau hang khong"
                 },
+                "aeroway/parking_position": {
+                    "name": "Chỗ Đậu Máy bay",
+                    "terms": "chỗ đậu máy bay, vị trí đậu máy bay, chỗ đỗ máy bay, vị trí đỗ máy bay, chỗ đậu phi cơ, vị trí đậu phi cơ, chỗ đỗ phi cơ, vị trí đỗ phi cơ, cho dau may bay, vi tri dau may bay, cho do may bay, vi tri do may bay, cho dau phi co, vi tri dau phi co, cho do phi co, vi tri do phi co"
+                },
                 "aeroway/runway": {
                     "name": "Đường băng",
                     "terms": "phi đạo, đường cất hạ cánh, đường cất cánh, đường hạ cánh, phi dao, duong cat ha canh, duong cat canh, duong ha canh"
@@ -4964,6 +5049,10 @@
                     "name": "Chỗ Đậu Xe đạp",
                     "terms": "chỗ đậu xe đạp, chỗ đỗ xe đạp, giá đậu xe đạp, giá đỗ xe đạp, đậu xe đạp, đỗ xe đạp, cho dau xe dap, cho do xe dap, gia dau xe dap, gia do xe dap, dau xe dap, do xe dap"
                 },
+                "amenity/bicycle_parking/building": {
+                    "name": "Bãi Đậu Xe đạp Cao tầng",
+                    "terms": "bãi đậu xe đạp cao tầng, bãi đỗ xe đạp cao tầng, bãi đậu xe đạp, bãi đỗ xe đạp, bai dau xe dap cao tang, bai do xe dap cao tang, bai dau xe dap, bai do xe dap"
+                },
                 "amenity/bicycle_rental": {
                     "name": "Cho thuê Xe đạp",
                     "terms": "dịch vụ cho mướn xe đạp, chỗ mướn xe đạp, tiệm mướn xe đạp, mướn xe đạp, dịch vụ cho thuê xe đạp, chỗ thuê xe đạp, tiệm thuê xe đạp, thuê xe đạp, dich vu cho muon xe dap, cho muon xe dap, tiem muon xe dap, muon xe dap, dich vu cho thue xe dap, cho thue xe dap, tiem thue xe dap, thue xe dap"
@@ -5203,6 +5292,10 @@
                     "name": "Sân Nhà trẻ",
                     "terms": "sân nhà trẻ, sân nhà giữ trẻ, sân trường mẫu giáo, sân trường mầm non, san nha tre, san nha giu tre, san truong mau giao, san truong mam non"
                 },
+                "amenity/kneipp_water_cure": {
+                    "name": "Bồn tắm Trị liệu Kneipp",
+                    "terms": "bồn tắm trị liệu kneipp, bồn tắm kneipp, bon tam tri lieu kneipp, bon tam kneipp"
+                },
                 "amenity/language_school": {
                     "name": "Trường học Ngoại ngữ",
                     "terms": "trường học ngoại ngữ, trường học ngôn ngữ, trường ngoại ngữ, trường ngôn ngữ, truong hoc ngoai ngu, truong hoc ngon ngu, truong ngoai ngu, truong ngon ngu"
@@ -5340,7 +5433,7 @@
                 },
                 "amenity/prison": {
                     "name": "Sân Nhà tù",
-                    "terms": "sân nhà tù, sân tù, san nha tu, san tu"
+                    "terms": "sân nhà tù, nhà tù, sân tù, tù, sân nhà giam, nhà giam, sân nhà tạm giam, nhà tạm giam, sân nhà lao, nhà lao, san nha tu, san tu, tu, san nha giam, nha giam, san nha tam giam, nha tam giam, san nha lao, nha lao"
                 },
                 "amenity/pub": {
                     "name": "Quán rượu Pub",
@@ -5369,9 +5462,6 @@
                     "name": "Thùng Tái chế",
                     "terms": "thùng tái chế, thùng thu hồi, thung tai che, thung thu hoi"
                 },
-                "amenity/register_office": {
-                    "name": "Văn phòng Hộ tịch"
-                },
                 "amenity/restaurant": {
                     "name": "Nhà hàng",
                     "terms": "quán ăn, nhà hàng, tiệm ăn, nhà ăn, phòng ăn, quán ăn nhanh, nhà hàng ăn nhanh, quán ăn qua loa, căng tin, căng-tin, xe đẩy, quán rượu, quán bia, tiệm rượu, hiệu chả cá, quán chả nướng, quán phở, tiệm phở, quán cơm, quán bánh cuốn, tiệm bánh cuốn, quán bánh mì, tiệm bánh mì, quán bánh xèo, tiệm bánh xèo, quán chè, tiệm chè, quán gỏi cuốn, quán bún, quán hải sản, quán gà, quán cà ri, quán cà-ri, tiệm cà ri, tiệm cà-ri, quan an, nha hang, tiem an, nha an, phong an, quan an nhanh, nha hang an nhanh, quan an qua loa, can tin, cang-tin, xe day, quan ruou, quan bia, tiem ruou, hieu cha ca, quan cha nuong, quan pho, tiem pho, quan com, quan banh cuon, tiem banh cuon, quan banh mi, tiem banh mi, quan banh xeo, tiem banh xeo, quan che, tiem che, quan goi cuon, quan bun, quan hai san, quan ga, quan ca ri, quan ca-ri, tiem ca ri, tiem ca-ri"
@@ -5456,9 +5546,6 @@
                     "name": "Sân Trường",
                     "terms": "sân trường, sân trường học, sân nhà trường, sân trung tâm giáo dục, san truong, san truong hoc, san nha truong, san trung tam giao duc"
                 },
-                "amenity/scrapyard": {
-                    "name": "Bãi Phế liệu"
-                },
                 "amenity/shelter": {
                     "name": "Nhà trú",
                     "terms": "nhà trú, chỗ che chở, nhà trú bão, nhà trú mưa, nhà trú ẩn, điểm trú bão, điểm trú mưa, điểm trú ẩn, túp lều, mái, nóc, cho che cho, nha tru bao, nha tru mua, nha tru an, diem tru bao, diem tru mau, diem tru an, tup leu, mai, noc"
@@ -5527,9 +5614,6 @@
                     "name": "Xưởng Phim",
                     "terms": "xưởng phim, hãng phim, phim trường, xưởng điện ảnh, hãng điện ảnh, phòng quay phim, xuong phim, hang phim, phim truong, xuong dien anh, hang dien anh, phong quay phim"
                 },
-                "amenity/swimming_pool": {
-                    "name": "Hồ Bơi"
-                },
                 "amenity/taxi": {
                     "name": "Bến Tắc xi",
                     "terms": "bến tắc xi, bến tắc-xi, bến taxi, ben tac xi ben tac-xi, ben taxi"
@@ -5808,6 +5892,10 @@
                     "name": "Hàng rào Cây",
                     "terms": "hàng rào cây, hàng cây, hang rao cay, hang cay"
                 },
+                "barrier/height_restrictor": {
+                    "name": "Thanh Giới hạn Chiều cao",
+                    "terms": "thanh giới hạn chiều cao, thanh hạn chế chiều cao, thanh chắn giới hạn chiều cao, thanh chắn hạn chế chiều cao, thanh chắn cầu vượt, cổng cầu vượt, thanh gioi han chieu cao, thanh han che chieu cao, thanh chan gioi han chieu cao, thanh chan han che chieu cao, thanh chan cau vuot, cong cau vuot"
+                },
                 "barrier/kerb": {
                     "name": "Bờ Lề đường",
                     "terms": "bờ lề đường, bờ đường, bo le duong, bo duong"
@@ -6283,6 +6371,9 @@
                 "disused/railway": {
                     "name": "Đường sắt Không hoạt động"
                 },
+                "disused/shop": {
+                    "name": "Tiệm Đóng cửa"
+                },
                 "embankment": {
                     "name": "Đường đắp cao"
                 },
@@ -6520,6 +6611,10 @@
                 "highway/cycleway/crossing": {
                     "name": "Lối Đạp Xe đạp qua Đường"
                 },
+                "highway/cycleway/crossing/bicycle_foot": {
+                    "name": "Lối Đi bộ & Xe đạp Qua đường",
+                    "terms": "lối đi bộ và xe đạp qua đường, loi di bo va xe dap qua duong"
+                },
                 "highway/cycleway/crossing/marked": {
                     "name": "Vạch Xe đạp Qua đường",
                     "terms": "vạch xe đạp qua đường, vạch kẻ đường cho xe đạp, vach xe dap qua duong, vach ke duong cho xe dap"
@@ -6854,10 +6949,6 @@
                 "landuse": {
                     "name": "Sử dụng Đất"
                 },
-                "landuse/allotments": {
-                    "name": "Khu Vườn Gia đình",
-                    "terms": "khu vườn gia đình, khu vườn cộng đồng, khu vuon gia dinh, khu vuon cong dong"
-                },
                 "landuse/aquaculture": {
                     "name": "Nuôi trồng Thủy sản",
                     "terms": "nuôi trồng thủy sản, nuôi trồng thuỷ sản, nuôi thủy sản, nuôi thuỷ sản, trồng thủy sản, trồng thuỷ sản, nuoi trong thuy san, nuoi thuy san, trong thuy san"
@@ -6963,17 +7054,13 @@
                     "name": "Căn cứ Hải quân",
                     "terms": "căn cứ hải quân, trạm hải quân, can cu hai quan, tram hai quan"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "Đường Chạy vượt Chướng ngại vật",
-                    "terms": "đường chạy vượt chướng ngại vật, duong chay vuot chuong ngai vat"
-                },
                 "landuse/military/range": {
                     "name": "Tầm đạn",
                     "terms": "tầm đạn, tầm súng, tam dan, tam sung"
                 },
                 "landuse/military/training_area": {
-                    "name": "Khu Tập luyện",
-                    "terms": "khu tập luyện, khu luyện tập, khu tap luyen, khu luyen tap"
+                    "name": "Khu Huấn luyện Quân đội",
+                    "terms": "khu huấn luyện quân đội, đất huấn luyện quân đội, khu huấn luyện không quân, đất huấn luyện không quân, khu huấn luận hải quân, khu huan luyen quan doi, dat huan luyen quan doi, khu huan luyen khong quan, dat huan luyen khong quan, khu huan luan hai quan"
                 },
                 "landuse/orchard": {
                     "name": "Vườn Cây",
@@ -7136,6 +7223,14 @@
                     "name": "Vườn",
                     "terms": "vườn, làm vườn, vuon, lam vuon"
                 },
+                "leisure/garden/botanical": {
+                    "name": "Vườn Bách thảo",
+                    "terms": "vườn bách thảo, vuon bach thao"
+                },
+                "leisure/garden/community": {
+                    "name": "Khu Vườn Gia đình",
+                    "terms": "khu vườn gia đình, khu vườn cộng đồng, khu vuon gia dinh, khu vuon cong dong"
+                },
                 "leisure/golf_course": {
                     "name": "Sân Golf",
                     "terms": "sân golf, sân gôn, san golf, san gon"
@@ -7320,18 +7415,10 @@
                     "name": "Đường Đua Ngựa",
                     "terms": "đường đua ngựa, trường đua ngựa, duong dua ngua, truong dua ngua"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "Đường Đua Ngựa",
-                    "terms": "đường đua ngựa, trường đua ngựa, duong dua ngua, truong dua ngua"
-                },
                 "leisure/track/running": {
                     "name": "Đường Chạy",
                     "terms": "đường chạy, đường chạy đua, đường chạy điền kinh, duong chay, duong chay dua, duong chay dien kinh"
                 },
-                "leisure/track/running_point": {
-                    "name": "Đường Chạy",
-                    "terms": "đường chạy, đường chạy đua, đường chạy điền kinh, duong chay, duong chay dua, duong chay dien kinh"
-                },
                 "leisure/water_park": {
                     "name": "Công viên Nước",
                     "terms": "công viên nước, công viên chơi nước, cong vien nuoc, cong vien choi nuoc"
@@ -7403,10 +7490,6 @@
                     "name": "Bể Khí",
                     "terms": "bể khí, bể chứa khí, bể đựng khí, thùng chứa khí, thùng đựng khí, be khi, be chua khi, be dung khi, thung chua khi, thung dung khi"
                 },
-                "man_made/groyne": {
-                    "name": "Đê Chắn Sóng",
-                    "terms": "đê chắn sóng, đập chắn sóng, êpi, ê-pi, đê biển, de chan song, dap chan song, epi, e-pi"
-                },
                 "man_made/lighthouse": {
                     "name": "Hải đăng",
                     "terms": "hải đăng, đèn biển, hai dang, den bien"
@@ -7555,10 +7638,6 @@
                     "name": "Boong Ke",
                     "terms": "boong ke, boong-ke, boongke"
                 },
-                "military/checkpoint": {
-                    "name": "Trạm Kiểm soát",
-                    "terms": "trạm kiểm soát, tram kiem soat"
-                },
                 "military/nuclear_explosion_site": {
                     "name": "Nơi Nổ Vũ khí Hạt nhân",
                     "terms": "nơi nổ vũ khí hạt nhân, nơi nổ bom hạt nhân, noi no vu khi hat nhan, noi no bom hat nhan"
@@ -8062,6 +8141,10 @@
                     "name": "Khu Nhà máy Điện",
                     "terms": "khu nhà máy điện, khu nha may dien"
                 },
+                "power/plant/source/hydro": {
+                    "name": "Nhà máy Thủy điện",
+                    "terms": "nhà máy thủy điện, nhà máy thuỷ điện, nha may thuy dien"
+                },
                 "power/plant/source/nuclear": {
                     "name": "Nhà máy Điện Hạt nhân",
                     "terms": "nhà máy điện hạt nhân, nhà máy hạt nhân, lò phản ứng hạt nhân, nha may dien hat nhan, nha may hat nhan, lo phan ung hat nhan"
@@ -8070,6 +8153,10 @@
                     "name": "Trang trại Điện Mặt trời",
                     "terms": "trang trại điện mặt trời, trang trại điện năng lượng mặt trời, trại quang năng, tấm quang năng, trang trai dien mat troi, trang trai dien nang luong mat troi, trai quang nang, tam quang nang"
                 },
+                "power/plant/source/wind": {
+                    "name": "Trang trại Gió",
+                    "terms": "trang trại gió, trang trai gio"
+                },
                 "power/pole": {
                     "name": "Cột điện",
                     "terms": "cột điện, cot dien"
@@ -8458,6 +8545,10 @@
                     "name": "Tiệm Xe đạp",
                     "terms": "tiệm xe đạp, cửa hàng xe đạp, chỗ bán xe đạp, tiem xe dap, cua hang xe dap, cho ban xe dap"
                 },
+                "shop/boat": {
+                    "name": "Tiệm Tàu thuyền",
+                    "terms": "tiệm tàu thuyền, cửa hàng tàu thuyền, tiệm tàu, cửa hàng tàu, tiệm tàu bè, cửa hàng tàu bè, tiệm thuyền, cửa hàng thuyền, tiem tau thuyen, cua hang tau thuyen, tiem tau, cua hang tau, tiem tau be, cua hang tau be, tiem thuyen, cua hang thuyen"
+                },
                 "shop/bookmaker": {
                     "name": "Phòng Đánh cá Ngựa",
                     "terms": "phòng đánh cá ngựa, văn phòng đánh cá ngựa, cửa sổ đánh cá ngựa, tiệm đánh cá ngựa, cửa hàng đánh cá ngựa, nơi đánh cá ngựa, phong danh ca ngua, van phong danh ca ngua, cua so danh ca ngua, tiem danh ca ngua, cua hang danh ca ngua, noi danh ca ngua"
@@ -8481,6 +8572,10 @@
                     "name": "Tiệm Xe hơi",
                     "terms": "tiệm xe hơi, tiệm bán xe hơi, cửa hàng xe hơi, chỗ bán xe cộ, tiem xe hoi, tiem ban xe hoi, cua hang xe hoi, cho ban xe co"
                 },
+                "shop/car/second_hand": {
+                    "name": "Tiệm Xe hơi Cũ",
+                    "terms": "tiệm xe hơi cũ, cửa hàng xe hơi cũ, tiệm xe cũ, cửa hàng xe cũ, tiệm ô tô cũ, cửa hàng ô tô cũ, tiem xe hoi cu, cua hang xe hoi cu, tiem xe cu, cua hang xe cu, tiem o to cu, cua hang o to cu"
+                },
                 "shop/car_parts": {
                     "name": "Tiệm Phụ tùng Xe hơi",
                     "terms": "tiệm phụ tùng xe hơi, chỗ bán phụ tùng xe hơi, cửa hàng phụ tùng xe hơi, tiem phu tung xe hoi, cho ban phu tung xe hoi, cua hang phu tung xe hoi"
@@ -8545,6 +8640,10 @@
                     "name": "Tiệm Nông thôn",
                     "terms": "tiệm nông thôn, cửa hàng nông thôn, tiệm tạp hóa, tiệm tạp hoá, cửa hàng tạp hóa, cửa hàng tạp hoá, tiem nong thon, cua hang nong thon, tiem tap hoa, cua hang tap hoa"
                 },
+                "shop/craft": {
+                    "name": "Tiệm Bán đồ Thủ công",
+                    "terms": "tiệm bán đồ thủ công, cửa hàng bán đồ thủ công, cửa hiệu bán đồ thủ công, thủ công mỹ nghệ, nội thất, sơn, hoa giả, giấy, bút, khắc gỗ, tiem ban do thu cong, cua hang ban do thu cong, cua hieu ban do thu cong, thu cong my nghe, noi that, son, hoa gia, giay, but, khac go"
+                },
                 "shop/curtain": {
                     "name": "Tiệm Màn cửa",
                     "terms": "tiệm màn cửa, cửa hàng màn cửa, cửa hiệu màn cửa, tiem man cua, cua hang man cua, cua hieu man cua"
@@ -8565,6 +8664,10 @@
                     "name": "Tiệm Vật liệu Xây dựng",
                     "terms": "tiệm vật liệu xây dựng, tiệm ngũ kim, cửa hàng vật liệu xây dựng, cửa hàng ngũ kim, tiem vat lieu xay dung, tiem ngu kim, cua hang vat lieu xay dung, cua hang ngu kim"
                 },
+                "shop/doors": {
+                    "name": "Tiệm Cửa",
+                    "terms": "tiệm cửa, cửa hàng cửa, tiem cua, cua hang cua"
+                },
                 "shop/dry_cleaning": {
                     "name": "Tiệm Giặt khô",
                     "terms": "tiệm giặt khô, cửa hàng giặt khô, tiệm giặt hấp tẩy, cửa hàng giặt hấp tẩy, tiệm giặt sấy, cửa hàng giặt sấy, tiem giat kho, cua hang giat kho, tiem giat hap tay, cua hang giat hap tay, tiem giat say, cua hang giat say"
@@ -8600,9 +8703,6 @@
                     "name": "Tiệm Cần câu",
                     "terms": "tiệm cần câu, tiệm câu cá, tiệm cần câu cá, cửa hàng cần câu, cửa hàng câu cá, cửa hàng cần câu cá, tiem can cau, tiem cau ca, tiem can cau ca, cua hang can cau, cua hang cau ca, cua hang can cau ca"
                 },
-                "shop/fishmonger": {
-                    "name": "Tiệm Cá"
-                },
                 "shop/florist": {
                     "name": "Tiệm Hoa",
                     "terms": "quầy bán hoa, tiệm bán hoa, chỗ bán hoa, nơi bán hoa, cửa hàng hoa, cửa hàng bán hoa, nơi bán hoa, bông hoa, quay ban hoa, tiem ban hoa, cho ban hoa, noi ban hoa, cua hang hoa, cua hang ban hoa, noi ban hoa, bong hoa"
@@ -8623,9 +8723,6 @@
                     "name": "Nhà quàn",
                     "terms": "nhà quàn, nhà tang lễ, nha quan, nha tang le"
                 },
-                "shop/furnace": {
-                    "name": "Tiệm Máy sưởi"
-                },
                 "shop/furniture": {
                     "name": "Cửa hàng Nội thất",
                     "terms": "tiệm nội thất, cửa hàng đồ đạc, chỗ đồ đạc, cửa hàng bán đồ đạc, tiệm bán đồ đạc, quầy bán đồ đạc, nơi bán đồ đạc, đồ gỗ, giường, bàn, ghế, đèn, tiem noi that, cua hang do dac, cho do dac, cua hang ban do dac, tiem ban do dac, quay ban do dac, noi ban do dac, do go, giuong, ban, ghe, den"
@@ -8706,6 +8803,10 @@
                     "name": "Tiệm Đồ Da",
                     "terms": "tiệm đồ da, cửa hàng đồ da, cửa hiệu đồ da, quán đồ da, tiệm quần áo da, cửa hàng quần áo da, cửa hiệu quần áo da, quán quần áo da, tiem do da, cua hang do da, cua hieu do da, quan do da, tiem quan ao da, cua hang quan ao da, cua hieu quan ao da, quan quan ao da"
                 },
+                "shop/lighting": {
+                    "name": "Tiệm Đèn sáng",
+                    "terms": "tiệm đèn sáng, cửa hàng đèn sáng, tiệm đèn, cửa hàng đèn, tiem den sang, cua hang den sang, tiem den, cua hang den"
+                },
                 "shop/locksmith": {
                     "name": "Thợ khóa",
                     "terms": "thợ khóa, thợ sửa khóa, thợ khoá, trợ sửa khoá, thợ kim khí, tho khoa, tho sua khoa, tho kim khi"
@@ -8903,7 +9004,7 @@
                     "terms": "tiệm lốp xe, tiệm vỏ xe, tiệm bánh xe, chỗ bán lốp xe, cửa hàng lốp xe, cửa hiệu lốp xe, tiem lop xe, tiem vo xe, tiem banh xe, cho ban lop xe, cua hang lop xe, cua hieu lop xe"
                 },
                 "shop/vacant": {
-                    "name": "Tiệm Đóng cửa"
+                    "name": "Tiệm Trống"
                 },
                 "shop/vacuum_cleaner": {
                     "name": "Tiệm Máy Hút bụi",
@@ -9271,6 +9372,10 @@
                     "name": "Tuyến đường Xe điện",
                     "terms": "tuyến đường xe điện, tuyen duong xe dien"
                 },
+                "type/route/trolleybus": {
+                    "name": "Tuyến Xe điện Bánh hơi",
+                    "terms": "tuyến xe điện bánh hơi, tuyến xe buýt điện, tuyến xe bus điện, tuyen xe dien banh hoi, tuyen xe buyt dien, tuyen xe bus dien"
+                },
                 "type/route_master": {
                     "name": "Tuyến đường Chung",
                     "terms": "tuyến đường chung, dịch vụ xe buýt, tổ hợp tuyến đường, tuyen duong chung, dich vu xe buyt, to hop tuyen duong"
@@ -9601,6 +9706,13 @@
                 "description": "Bản đồ Göteborg tả thành phố nhìn chung. Nó bao gồm thông tin tổng quát về đất đai, viễn thông, thủy văn, tòa nhà, số nhà, tên đường, phân cấp hành chính, và các nhãn định hướng khác.",
                 "name": "Bản đồ Thành phố Göteborg"
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© đô thị Göteborg, CC0"
+                },
+                "description": "Hình ảnh trực giao đô thị Gothenburg",
+                "name": "Hình trực giao Gothenburg"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI Nhật Bản"
@@ -9768,6 +9880,12 @@
                 },
                 "name": "Thunderforest Phong cảnh"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "Bản đồ © Thunderforest, dữ liệu © những người đóng góp vào OpenStreetMap"
+                },
+                "name": "Thunderforest Ngoài trời"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Bộ Giao thông Thụy Điển, CC0"
@@ -9809,6 +9927,12 @@
                 },
                 "description": "Hệ thống đường bộ Thụy Điển có vài lớp bản đồ để lựa chọn",
                 "name": "Hệ thống Đường bộ Bộ Giao thông Thụy Điển có tùy chọn"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Văn phòng Thành phố Wrocław"
+                },
+                "name": "Wrocław: bản đồ hình trực giao 2018 (hình trên không)"
             }
         },
         "community": {
@@ -10302,6 +10426,10 @@
                 "name": "Danh sách thư OpenStreetMap Nhật Bản",
                 "description": "talk-ja là danh sách thư chính thức của cộng đồng Nhật Bản"
             },
+            "OSM-japan-slack": {
+                "name": "Slack OpenStreetMap Nhật Bản",
+                "description": "Không gian làm việc Slack dành cho cộng đồng OSM Nhật Bản: {signupUrl}"
+            },
             "OSM-japan-twitter": {
                 "name": "Twitter OpenStreetMap Nhật Bản",
                 "description": "Thẻ băm tại Twitter: {url}"
@@ -10503,6 +10631,13 @@
                 "name": "Matrix OpenStreetMap Đức",
                 "description": "Hãy tham gia #osm-de:matrix.org tại https://riot.im/app/#/room/%23osm-de:matrix.org"
             },
+            "de-mv-mailinglist": {
+                "name": "Danh sách thư Mecklenburg-Vorpommern"
+            },
+            "de-mv-twitter": {
+                "name": "Twitter OpenStreetMap Mecklenburg-Vorpommern",
+                "description": "Theo dõi chúng tôi tại Twitter: {url}"
+            },
             "de-ostwestfalen-lippe-mailinglist": {
                 "name": "Danh sách OWL",
                 "description": "Đây là danh sách thư của cộng đồng OSM tại Ostwestfalen-Lippe"
@@ -10601,6 +10736,18 @@
                 "name": "Danh sách thư talk-gb",
                 "description": "talk-gb là danh sách thư chính thức của cộng đồng OSM tại Vương quốc Liên hiệp Anh và Bắc Ireland"
             },
+            "gr-forum": {
+                "name": "Diễn đàn OpenStreetMap Hy Lạp",
+                "description": "Diễn đàn Web của OpenStreetMap Hy Lạp"
+            },
+            "gr-mailinglist": {
+                "name": "Danh sách thư talk-gr",
+                "description": "talk-gr là danh sách thư chính thức của cộng đồng Hy Lạp"
+            },
+            "gr-matrix": {
+                "name": "Matrix OpenStreetMap Hy Lạp",
+                "description": "Tham gia #osm-gr:matrix.org tại https://riot.im/app/#/room/%23osm-gr:matrix.org"
+            },
             "guatemala-telegram": {
                 "name": "OSM Guatemala tại Telegram",
                 "description": "Trò chuyện Telegram của OpenStreetMap Guatemala"
@@ -10993,6 +11140,9 @@
                 "name": "OpenStreetMap Freemap Slovakia tại Twitter",
                 "description": "OpenStreetMap Freemap Slovakia tại Twitter: {url}"
             },
+            "talk-africa": {
+                "name": "Danh sách thư talk-africa"
+            },
             "talk-au": {
                 "name": "Danh sách thư talk-au",
                 "description": "Nơi trò chuyện của những người Úc lập bản đồ"
@@ -11022,6 +11172,9 @@
                 "name": "Danh sách thư talk-nz",
                 "description": "Thảo luận cộng đồng OSM tại New Zealand"
             },
+            "talk-tz": {
+                "name": "Danh sách thư talk-tz"
+            },
             "talk-za": {
                 "name": "Danh sách thư talk-za",
                 "description": "talk-za là danh sách thư chính thức của cộng đồng OSM Nam Phi."
@@ -11189,6 +11342,7 @@
                 "description": "Nhánh YouthMappers tại Đại học Giáo dục Ignatius Ajuru"
             },
             "ym-Indiana-University-of-Pennsylvania": {
+                "name": "Câu lạc bộ Khoa học Không gian Địa lý",
                 "description": "Nhánh YouthMappers tại Đại học Indiana tiểu bang Pennsylvania"
             },
             "ym-Institute-of-Rural-Development-Planning": {
@@ -11207,6 +11361,7 @@
                 "description": "Nhánh YouthMappers tại Đại học Nông nghiệp và Công nghệ Jomo Kenyatta"
             },
             "ym-Kansas-State-University": {
+                "name": "Gamma Theta Upsilon: Nhánh Beta Psi",
                 "description": "Nhánh YouthMappers tại Đại học Tiểu bang Kansas"
             },
             "ym-Karatina-University": {
@@ -11214,7 +11369,9 @@
                 "description": "Nhánh YouthMappers tại Đại học Karatina"
             },
             "ym-Kathmandu-University": {
-                "description": "Nhánh YouthMappers tại Đại học Kathmandu"
+                "name": "Hội Kỹ thuật Địa tin học",
+                "description": "Nhánh YouthMappers tại Đại học Kathmandu",
+                "extendedDescription": "Hội Kỹ thuật Địa tin học (Geomatics Engineering Society, GES) được sáng lập năm 2008 SCN là câu lạc bộ thuộc Khoa Kỹ thuật Xây dựng Dân dụng và Địa tin học (Department of Civil and Geomatics Engineering, DCGE) tại Đại học Kathmandu. GES là nền tảng nhằm mục đích đào tạo sinh viên, chú trọng các hoạt động bổ sung như đào tạo kỹ thuật, seminar, chương trình hội thảo, đôi tác với nhà chuyên môn trong các lĩnh vực liên quan, hoạt động thể thao, v.v."
             },
             "ym-Kenyatta-University": {
                 "name": "Câu lạc bộ Hệ thống thông tin địa lý Đại học Kenyatta",

vendor/assets/iD/iD/locales/yue.json

@@ -211,7 +211,6 @@
             "request_review": "想有人翻睇我修改。",
             "save": "傳上",
             "cancel": "唔記",
-            "changes": "變更 {count} 個",
             "download_changes": "公家街圖修改嘅檔案，傳落來",
             "warnings": "警告",
             "modified": "改咗",
@@ -411,10 +410,6 @@
             "on_wiki": "喺公家街圖百科度嘅{tag}",
             "used_with": "同{type}一齊用"
         },
-        "zoom": {
-            "in": "放大",
-            "out": "縮細"
-        },
         "cannot_zoom": "今下模式，無得再縮。",
         "full_screen": "來回全螢幕",
         "mapillary_images": {
@@ -878,9 +873,6 @@
                     },
                     "placeholder": "電纜、有電軌道⋯⋯"
                 },
-                "elevation": {
-                    "label": "海拔"
-                },
                 "email": {
                     "label": "電郵",
                     "placeholder": "example@example.com"
@@ -993,7 +985,6 @@
                     "label": "類"
                 },
                 "internet_access": {
-                    "label": "用到互聯網",
                     "options": {
                         "no": "無",
                         "terminal": "終端機",
@@ -1002,9 +993,6 @@
                         "yes": "有"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "上網費"
-                },
                 "lamp_type": {
                     "label": "類"
                 },
@@ -1541,10 +1529,6 @@
                     "name": "吊櫈",
                     "terms": "Chair Lift,吊櫈"
                 },
-                "aerialway/gondola": {
-                    "name": "吊船",
-                    "terms": "Gondola,吊船"
-                },
                 "aerialway/magic_carpet": {
                     "name": "輸送帶",
                     "terms": "Magic Carpet Lift,輸送帶"
@@ -1714,9 +1698,6 @@
                     "name": "天遮或亭",
                     "terms": "Shelter,亭,天遮,蓋,避難,避難所"
                 },
-                "amenity/swimming_pool": {
-                    "name": "游水池"
-                },
                 "amenity/taxi": {
                     "name": "的士站",
                     "terms": "Taxi Stand,出租車站,的士站,計程車站"
@@ -2460,30 +2441,10 @@
                 "railway/level_crossing": {
                     "name": "鐵道口（車道）"
                 },
-                "railway/monorail": {
-                    "name": "單軌",
-                    "terms": "Monorail,單軌,單軌鐵路,單軌電車"
-                },
-                "railway/narrow_gauge": {
-                    "name": "窄軌火車",
-                    "terms": "Narrow Gauge Rails,窄軌火車,窄軌,窄軌鐵路"
-                },
-                "railway/rail": {
-                    "name": "路軌",
-                    "terms": "Rail,火車軌,路軌,軌,鐵軌"
-                },
-                "railway/subway": {
-                    "name": "地下鐵路",
-                    "terms": "MTR,Mass Transit Railway,Subway,地下鐵,地下鐵路,地鐵"
-                },
                 "railway/subway_entrance": {
                     "name": "地下鐵路入口",
                     "terms": "Subway Entrance,地下鐵路入口,地鐵入口,地鐵口"
                 },
-                "railway/tram": {
-                    "name": "電車",
-                    "terms": "Tram,電車"
-                },
                 "relation": {
                     "name": "關係",
                     "terms": "Relation,關係,關系"
@@ -2567,9 +2528,6 @@
                     "name": "檔",
                     "terms": "Produce Stand,檔,水果攤,農場"
                 },
-                "shop/fishmonger": {
-                    "name": "魚檔"
-                },
                 "shop/florist": {
                     "name": "花舖",
                     "terms": "Florist,花店,花舖"

vendor/assets/iD/iD/locales/zh-CN.json

@@ -590,7 +590,7 @@
             "request_review": "我想要让其他人复核我的编辑。",
             "save": "上传",
             "cancel": "取消",
-            "changes": "{count} 个更改",
+            "changes": "更改 ({count})",
             "download_changes": "下载 osmChange 文件",
             "errors": "错误",
             "warnings": "警告",
@@ -678,20 +678,17 @@
             "no_results_worldwide": "没有找到结果"
         },
         "geolocate": {
+            "key": "L",
             "title": "显示我的位置",
             "locating": "正在定位，请稍后……"
         },
         "inspector": {
             "zoom_to": {
-                "key": "Z",
-                "title": "缩放到此处",
-                "tooltip_feature": "居中并缩放地图以关注此要素。",
-                "tooltip_note": "居中并缩放地图以关注此笔记。",
-                "tooltip_data": "居中并缩放地图以关注此数据。",
-                "tooltip_issue": "居中并缩放地图以关注此问题。"
+                "key": "Z"
             },
             "show_more": "显示更多",
             "view_on_osm": "在 openstreetmap.org 上查看",
+            "view_on_osmose": "在 osmose.openstreetmap.fr 上查看",
             "view_on_keepRight": "在 keepright.at 查看",
             "feature_type": "要素类型",
             "fields": "字段",
@@ -925,7 +922,6 @@
             "custom_background": {
                 "tooltip": "编辑自定义背景",
                 "header": "自定义背景设置",
-                "instructions": "输入地图瓦片URL地址。有效的参数有：\n   {zoom} 或 {z}, {x}, {y} 作为 Z/X/Y 坐标系\n   {-y} 或 {ty} 作为翻转的 TMS 算法 Y 坐标\n   {u} 作为四叉树坐标编码\n   {switch:a,b,c} 作为 DNS 服务器解析的并行连接子域\n\n示例：\n{example}",
                 "template": {
                     "placeholder": "输入URL地址"
                 }
@@ -1042,10 +1038,6 @@
             "on_wiki": "wiki.osm.org上的{tag}",
             "used_with": "使用 {type}"
         },
-        "zoom": {
-            "in": "放大",
-            "out": "缩小"
-        },
         "cannot_zoom": "在此模式下不能再缩小",
         "full_screen": "切换全屏",
         "QA": {
@@ -1054,8 +1046,7 @@
                 "detail_title": "详情",
                 "elems_title": "要素",
                 "fix_title": "修复指导",
-                "trap_title": "常见错误",
-                "translation": "Osmose 提供的翻译"
+                "trap_title": "常见错误"
             },
             "improveOSM": {
                 "title": "ImproveOSM 检测",
@@ -1514,8 +1505,7 @@
                 "before_start_h": "在您开始之前",
                 "before_start": "您在开始编辑之前应当先了解熟悉 OpenStreetMap 和本编辑器。iD 包含了一个导览教程，可以帮助您了解编辑 OpenStreetMap 的基本知识。点击屏幕上的“开始教程”按钮即可进入，并且只需占用您大概 15 分钟。",
                 "open_source_h": "开放源代码",
-                "open_source": "iD 编辑器是一个合作开放源代码项目，您正在使用的版本是 {version}。其源代码 [在 GitHub](https://github.com/openstreetmap/iD) 上可找到。",
-                "open_source_help": "您可以帮助 iD [翻译文本](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) 或者 [报告问题](https://github.com/openstreetmap/iD/issues)。"
+                "open_source": "iD 编辑器是一个合作开放源代码项目，您正在使用的版本是 {version}。其源代码 [在 GitHub](https://github.com/openstreetmap/iD) 上可找到。"
             },
             "overview": {
                 "title": "概览",
@@ -1861,7 +1851,7 @@
                 "tip": "查找无法导航的道路、小路和渡轮航线",
                 "routable": {
                     "message": {
-                        "multiple": "{count} 个可导航要素仅彼此连接。"
+                        "multiple": "{count} 个可导航要素仅彼此连接"
                     },
                     "reference": "所有的道路、小路和渡轮航线应连接并形成一个导航网络。"
                 },
@@ -2967,7 +2957,8 @@
                     "terms": "收费,费用,费,服务费,金额,收款"
                 },
                 "check_date": {
-                    "label": "最近检查时间"
+                    "label": "最近检查时间",
+                    "placeholder": "YYYY-MM-DD"
                 },
                 "clothes": {
                     "label": "服饰"
@@ -3265,10 +3256,6 @@
                     },
                     "placeholder": "架空接触线、第三轨供电…"
                 },
-                "elevation": {
-                    "label": "海拔",
-                    "terms": "海拔,标高,高度"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "example@example.com",
@@ -3544,7 +3531,6 @@
                     "label": "断流现象"
                 },
                 "internet_access": {
-                    "label": "互联网接入",
                     "options": {
                         "no": "否",
                         "terminal": "终端",
@@ -3553,9 +3539,6 @@
                         "yes": "是"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "上网费用"
-                },
                 "internet_access/ssid": {
                     "label": "Wi-Fi 网络名称"
                 },
@@ -3786,8 +3769,7 @@
                     "label": "网络"
                 },
                 "network/type": {
-                    "label": "网络类型",
-                    "terms": "网络类型"
+                    "label": "网络类型"
                 },
                 "network_bicycle": {
                     "label": "网络类别",
@@ -4731,10 +4713,6 @@
                     "name": "拖拽缆道",
                     "terms": "路面缆道,drag lift,surface lift,滑雪拖车"
                 },
-                "aerialway/gondola": {
-                    "name": "环路缆车",
-                    "terms": "环路缆车,很多缆车,很多很多缆车,群体打转的缆车"
-                },
                 "aerialway/goods": {
                     "name": "物品缆车线路",
                     "terms": "物资缆车"
@@ -5232,9 +5210,6 @@
                 "amenity/recycling_container": {
                     "name": "回收容器"
                 },
-                "amenity/register_office": {
-                    "name": "民政登记处"
-                },
                 "amenity/restaurant": {
                     "name": "餐馆",
                     "terms": "餐馆,餐厅,饭店,酒楼,酒家,茶楼,美食,饭馆,食堂,食物,吃,美食,食肆,菜馆"
@@ -5319,9 +5294,6 @@
                     "name": "学校",
                     "terms": "学校,高中,初中,中学,小学,校园,中专,学习"
                 },
-                "amenity/scrapyard": {
-                    "name": "废品堆放场"
-                },
                 "amenity/shelter": {
                     "name": "亭",
                     "terms": "棚,棚屋"
@@ -5366,9 +5338,6 @@
                     "name": "电影制片厂",
                     "terms": "电影,影片,影像,映画,制片,录制,录音,后期,工作室,制片厂"
                 },
-                "amenity/swimming_pool": {
-                    "name": "游泳池"
-                },
                 "amenity/taxi": {
                     "name": "出租车停车处",
                     "terms": "出租车停车处,的士停车处,计程车停车处"
@@ -6508,10 +6477,6 @@
                 "landuse": {
                     "name": "土地利用要素"
                 },
-                "landuse/allotments": {
-                    "name": "公共花园",
-                    "terms": "公共花园,公共菜园"
-                },
                 "landuse/aquaculture": {
                     "name": "水产养殖",
                     "terms": "水产养殖,水产业"
@@ -6613,18 +6578,10 @@
                     "name": "海军基地",
                     "terms": "海军,基地"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "障碍训练场",
-                    "terms": "障碍,训练场"
-                },
                 "landuse/military/range": {
                     "name": "军事靶场",
                     "terms": "军事,靶场,靶子"
                 },
-                "landuse/military/training_area": {
-                    "name": "军事训练场",
-                    "terms": "军事训练场,军事练习场,训练场,练习场,训练营,军训,基地"
-                },
                 "landuse/orchard": {
                     "name": "果园",
                     "terms": "果园"
@@ -6874,9 +6831,6 @@
                     "name": "体育跑道",
                     "terms": "跑道,田径,跑步,跑,马拉松,冲刺,竞走,健身,操场跑道"
                 },
-                "leisure/track/running_point": {
-                    "name": "体育跑道"
-                },
                 "leisure/water_park": {
                     "name": "水上乐园",
                     "terms": "水上乐园,水上公园"
@@ -6931,10 +6885,6 @@
                     "name": "大型燃气罐",
                     "terms": "大型燃气罐,大型储气罐,煤气包"
                 },
-                "man_made/groyne": {
-                    "name": "拦沙坝",
-                    "terms": "防波堤,拦沙坝"
-                },
                 "man_made/lighthouse": {
                     "name": "灯塔",
                     "terms": "灯塔"
@@ -7668,10 +7618,6 @@
                     "name": "废弃铁路",
                     "terms": "废弃的铁路"
                 },
-                "railway/funicular": {
-                    "name": "缆索铁路",
-                    "terms": "缆车"
-                },
                 "railway/halt": {
                     "name": "列车站 (小站 / 招呼)"
                 },
@@ -7679,37 +7625,13 @@
                     "name": "铁路道口 (道路)",
                     "terms": "铁路道口,平交道口,铁路道口(道路)"
                 },
-                "railway/light_rail": {
-                    "name": "轻轨",
-                    "terms": "轻轨,地铁,地下铁,有轨,电车"
-                },
                 "railway/milestone": {
                     "name": "铁路里程碑",
                     "terms": "轨道,股道,铁轨,铁路,路轨,里程碑,里程,百米桩,桩,碑,界碑,火车,列车"
                 },
-                "railway/miniature": {
-                    "name": "微型铁路",
-                    "terms": "微型铁路,铁路,模型,小火车,玩具"
-                },
-                "railway/monorail": {
-                    "name": "单轨铁路",
-                    "terms": "单轨铁路"
-                },
-                "railway/narrow_gauge": {
-                    "name": "窄轨铁路",
-                    "terms": "窄轨铁路,铁路"
-                },
                 "railway/platform": {
                     "name": "火车站台"
                 },
-                "railway/rail": {
-                    "name": "标准铁路",
-                    "terms": "铁轨"
-                },
-                "railway/rail/highspeed": {
-                    "name": "高速铁路",
-                    "terms": "高铁,高速铁路,子弹头列车,动车,列车,铁路"
-                },
                 "railway/signal": {
                     "name": "铁路信号机",
                     "terms": "色灯,信号机,信号,灯,信号灯,红绿灯,表示器,轨道,股道,铁轨,铁路,路轨,火车,列车,调车,进站,出站"
@@ -7717,10 +7639,6 @@
                 "railway/station": {
                     "name": "火车站"
                 },
-                "railway/subway": {
-                    "name": "地铁",
-                    "terms": "地铁,轻轨,轨道交通,地下铁,有轨,电车,单轨"
-                },
                 "railway/subway_entrance": {
                     "name": "地铁出入口",
                     "terms": "地铁,地铁口,地铁站,出口,入口,轻轨,地下铁,轨道交通"
@@ -7733,10 +7651,6 @@
                     "name": "列车清洗机",
                     "terms": "轨道,股道,铁轨,铁路,路轨,火车,列车,清洗,清洁,水洗,外皮,洗澡,机器"
                 },
-                "railway/tram": {
-                    "name": "电车",
-                    "terms": "电车"
-                },
                 "railway/tram_stop": {
                     "name": "有轨电车停车处"
                 },
@@ -7941,9 +7855,6 @@
                 "shop/fashion": {
                     "name": "服装店"
                 },
-                "shop/fishmonger": {
-                    "name": "海产店"
-                },
                 "shop/florist": {
                     "name": "花店",
                     "terms": "花店"
@@ -7952,17 +7863,10 @@
                     "name": "相框店",
                     "terms": "相框店"
                 },
-                "shop/frozen_food": {
-                    "name": "冷冻食品",
-                    "terms": "冷冻食品,冷冻,速冻,冷藏,生鲜,海鲜,超市,市场,卖场"
-                },
                 "shop/funeral_directors": {
                     "name": "殡仪馆",
                     "terms": "殡仪馆,墓园,墓地,坟墓,丧葬承办人,殡葬业者,殡葬,死亡,逝世,丧礼,葬"
                 },
-                "shop/furnace": {
-                    "name": "熔炉店"
-                },
                 "shop/furniture": {
                     "name": "家具店",
                     "terms": "家具店"
@@ -9248,6 +9152,10 @@
                 "name": "OSM 加拿大 邮件列表",
                 "description": "讨论在加拿大 OpenStreetMap 的邮件列表"
             },
+            "OSM-CA-telegram": {
+                "name": "Telegram 上的 @osmca",
+                "description": "OpenStreetMap 加拿大 Telegram 聊天"
+            },
             "OSM-CL-facebook": {
                 "name": "OpenStreetMap 智利 Facebook",
                 "description": "在 Facebook 上加入 OpenStreetMap 智利社区",
@@ -9480,6 +9388,9 @@
             "OSM-Rome-meetup": {
                 "description": "在罗马地区改进 OpenStreetMap"
             },
+            "OSM-Seattle": {
+                "name": "OpenStreetMap 西雅图"
+            },
             "OSM-South-Bay": {
                 "name": "OSM 南湾"
             },

vendor/assets/iD/iD/locales/zh-HK.json

@@ -6,9 +6,28 @@
             "remove": "移除",
             "undo": "復原",
             "zoom_to": "縮放至",
-            "copy": "複製"
+            "copy": "複製",
+            "view_on": "在 {domain} 上查看",
+            "favorite": "喜愛",
+            "list": "清單",
+            "text": "文本",
+            "deselect": "取消選擇"
+        },
+        "toolbar": {
+            "inspect": "檢查",
+            "undo_redo": "撤消/重做",
+            "recent": "最近",
+            "favorites": "收藏夾",
+            "add_feature": "添加功能"
         },
         "modes": {
+            "add_feature": {
+                "title": "添加功能",
+                "description": "搜尋要新增到地圖上的圖徽。",
+                "key": "分頁",
+                "result": "{count} 個結果",
+                "results": "{count} 個結果"
+            },
             "add_area": {
                 "title": "範圍",
                 "description": "新增公園、建築物、湖或其他範圍至地圖。",
@@ -34,6 +53,9 @@
                 "tail": "於地圖上按一下新增備註。",
                 "key": "N"
             },
+            "add_preset": {
+                "title": "添加 {feature}"
+            },
             "browse": {
                 "title": "瀏覽",
                 "description": "平移和縮放地圖。"
@@ -85,6 +107,9 @@
             },
             "circularize": {
                 "title": "圓形化",
+                "description": {
+                    "single": "讓此圖徽變成圓形。"
+                },
                 "key": "O"
             },
             "orthogonalize": {
@@ -354,7 +379,6 @@
             "request_review": "我希望有其他人覆核我的編輯。",
             "save": "上載",
             "cancel": "取消",
-            "changes": "{count} 項變更",
             "download_changes": "下載 osmChange 檔案",
             "errors": "錯誤",
             "warnings": "警告",
@@ -438,8 +462,7 @@
         },
         "inspector": {
             "zoom_to": {
-                "key": "Z",
-                "title": "放大至這個"
+                "key": "Z"
             },
             "show_more": "顯示更多",
             "view_on_osm": "在 openstreetmap.org 中檢視",
@@ -661,10 +684,6 @@
             "on_wiki": "在wiki.osm.org上的 {tag}",
             "used_with": "與{type}一起用"
         },
-        "zoom": {
-            "in": "放大",
-            "out": "縮小"
-        },
         "cannot_zoom": "在這個模式下不能再縮小。",
         "full_screen": "切換全螢幕",
         "QA": {
@@ -1573,9 +1592,6 @@
                     },
                     "placeholder": "電纜、已通電路軌…"
                 },
-                "elevation": {
-                    "label": "海拔"
-                },
                 "email": {
                     "label": "電郵",
                     "placeholder": "example@example.com"
@@ -1754,7 +1770,6 @@
                     "label": "間中"
                 },
                 "internet_access": {
-                    "label": "用到互聯網",
                     "options": {
                         "no": "否",
                         "terminal": "終端機",
@@ -1763,9 +1778,6 @@
                         "yes": "有"
                     }
                 },
-                "internet_access/fee": {
-                    "label": "互聯網費用"
-                },
                 "kerb": {
                     "label": "下斜路緣"
                 },
@@ -2714,10 +2726,6 @@
                     "name": "牽引纜車",
                     "terms": "Drag Lift, 牽引纜車"
                 },
-                "aerialway/gondola": {
-                    "name": "吊艙",
-                    "terms": "Gondola,吊籃,吊船,空中纜車"
-                },
                 "aerialway/goods": {
                     "name": "貨運纜車",
                     "terms": "Goods Aerialway,載貨纜車"
@@ -3131,9 +3139,6 @@
                     "name": "回收桶",
                     "terms": "回收桶,三色桶,回收箱"
                 },
-                "amenity/register_office": {
-                    "name": "人事登記處"
-                },
                 "amenity/restaurant": {
                     "name": "餐廳",
                     "terms": "Restaurant,茶樓,酒家,酒樓,飯店,飯館,餐廳,餐館"
@@ -3218,9 +3223,6 @@
                     "name": "學校範圍",
                     "terms": "學校,中學,小學,學校用地,學校範圍,國際學校"
                 },
-                "amenity/scrapyard": {
-                    "name": "廢料場"
-                },
                 "amenity/shelter": {
                     "name": "涼亭",
                     "terms": "Shelter,亭,蓋,避難,避難所,避雨亭"
@@ -3257,9 +3259,6 @@
                     "name": "工作室",
                     "terms": "影樓,畫室,放映室,美術室,工藝室,藝術工作室"
                 },
-                "amenity/swimming_pool": {
-                    "name": "游泳池"
-                },
                 "amenity/taxi": {
                     "name": "的士站",
                     "terms": "Taxi Stand,出租車站,的士站,計程車站"
@@ -4151,10 +4150,6 @@
                     "name": "路口",
                     "terms": "十字路口,交界處,交界"
                 },
-                "landuse/allotments": {
-                    "name": "社區園圃",
-                    "terms": "社區園圃"
-                },
                 "landuse/aquaculture": {
                     "name": "水產養殖",
                     "terms": "Aquaculture,水產"
@@ -4244,18 +4239,10 @@
                     "name": "海軍基地",
                     "terms": "Naval Base,軍港,海軍基地"
                 },
-                "landuse/military/obstacle_course": {
-                    "name": "越障訓練場",
-                    "terms": "Obstacle Course,越障訓練場"
-                },
                 "landuse/military/range": {
                     "name": "軍事靶場",
                     "terms": "Military Range,靶場,軍用靶場,射擊場"
                 },
-                "landuse/military/training_area": {
-                    "name": "訓練場地",
-                    "terms": "Training Area,訓練場, 練習場地, 練習場"
-                },
                 "landuse/orchard": {
                     "name": "果園",
                     "terms": "Orchard,果園,菓園"
@@ -4503,10 +4490,6 @@
                     "name": "煤氣鼓",
                     "terms": "氣鼓,石油氣鼓"
                 },
-                "man_made/groyne": {
-                    "name": "防波堤",
-                    "terms": "防波堤,防波板"
-                },
                 "man_made/lighthouse": {
                     "name": "燈塔",
                     "terms": "Lighthouse,燈塔"
@@ -4889,10 +4872,6 @@
                     "name": "停用鐵路",
                     "terms": "Disused Railway,停用鐵路,廢棄的鐵路"
                 },
-                "railway/funicular": {
-                    "name": "纜索鐵道",
-                    "terms": "纜索鐵道, 索道, 纜車"
-                },
                 "railway/level_crossing": {
                     "name": "鐵路交滙處 (道路)",
                     "terms": "Railway Crossing (Road), 鐵路交滙處 (道路)"
@@ -4901,26 +4880,10 @@
                     "name": "鐵道里程碑",
                     "terms": "Railway Milestone,鐵道里程碑"
                 },
-                "railway/monorail": {
-                    "name": "單軌鐵路",
-                    "terms": "Monorail,單軌,單軌鐵路,單軌電車,單軌火車"
-                },
-                "railway/narrow_gauge": {
-                    "name": "窄軌鐵路",
-                    "terms": "窄軌鐵路, 窄軌鐵道"
-                },
-                "railway/rail": {
-                    "name": "路軌",
-                    "terms": "Rail,火車軌,路軌,軌,鐵軌"
-                },
                 "railway/signal": {
                     "name": "鐵路訊號",
                     "terms": "Railway Signal,鐵道信號,鐵路信號"
                 },
-                "railway/subway": {
-                    "name": "地下鐵",
-                    "terms": "MTR,Mass Transit Railway,Subway,地下鐵,地下鐵路,地鐵,捷運"
-                },
                 "railway/subway_entrance": {
                     "name": "地鐵入口",
                     "terms": "Subway Entrance,地下鐵路入口,地鐵入口,地鐵口,捷運入口"
@@ -4933,10 +4896,6 @@
                     "name": "火車洗滌器",
                     "terms": "Train Wah,火車清洗處,火車洗車機"
                 },
-                "railway/tram": {
-                    "name": "電車",
-                    "terms": "Tram,電車"
-                },
                 "relation": {
                     "name": "關係",
                     "terms": "Relation,關係,關系"
@@ -5131,9 +5090,6 @@
                 "shop/fashion": {
                     "name": "時裝店"
                 },
-                "shop/fishmonger": {
-                    "name": "魚檔"
-                },
                 "shop/florist": {
                     "name": "花店",
                     "terms": "Florist,花店,花舖"
@@ -5146,9 +5102,6 @@
                     "name": "殯儀館",
                     "terms": "殯儀館"
                 },
-                "shop/furnace": {
-                    "name": "暖氣爐店"
-                },
                 "shop/furniture": {
                     "name": "傢俬店",
                     "terms": "Furniture Store,傢俬舖,傢具店,家具店"

vendor/assets/iD/iD/locales/zh-TW.json

@@ -20,6 +20,14 @@
             "favorites": "最愛",
             "add_feature": "新增圖徽"
         },
+        "title": {
+            "format": {
+                "context": "{base} – {context}",
+                "changes": "({changes}) {base}",
+                "changes_context": "({changes}) {base} – {context}"
+            },
+            "labeled_and_more": "{labeled} 與 {count} 個"
+        },
         "modes": {
             "add_feature": {
                 "title": "新增圖徽",
@@ -590,7 +598,7 @@
             "request_review": "我需要其他人檢視查核我的編輯。",
             "save": "上傳",
             "cancel": "取消",
-            "changes": "{count}  變動數",
+            "changes": "變更 ({count})",
             "download_changes": "下載 osmChange 檔案",
             "errors": "錯誤",
             "warnings": "警告",
@@ -678,20 +686,19 @@
             "no_results_worldwide": "找不到搜尋結果"
         },
         "geolocate": {
+            "key": "L",
             "title": "顯示我的位置",
-            "locating": "正在定位，請等待..."
+            "locating": "正在定位，請等待...",
+            "location_unavailable": "您的位置不可用。"
         },
         "inspector": {
             "zoom_to": {
                 "key": "Z",
-                "title": "縮放到這裡",
-                "tooltip_feature": "置中和縮放地圖到這圖徵。",
-                "tooltip_note": "置中和縮放地圖到這註解。",
-                "tooltip_data": "置中和縮放地圖到這資料。",
-                "tooltip_issue": "置中和縮放地圖到這問題。"
+                "title": "縮放到選取的部份"
             },
             "show_more": "顯示更多",
             "view_on_osm": "在 openstreetmap.org 中檢視",
+            "view_on_osmose": "在 osmose.openstreetmap.fr 上檢視",
             "view_on_keepRight": "在 keepright.at 檢視",
             "feature_type": "圖徽類型",
             "fields": "欄位",
@@ -1043,19 +1050,24 @@
             "used_with": "可與 {type} 使用"
         },
         "zoom": {
-            "in": "拉近",
-            "out": "拉遠"
+            "in": "放大",
+            "out": "縮小"
         },
         "cannot_zoom": "在此模式下不能再縮小。",
         "full_screen": "啟動全螢幕",
+        "self_intersection": {
+            "error": {
+                "lines": "線段不能跨越自己。",
+                "areas": "區域不能跨越自己。"
+            }
+        },
         "QA": {
             "osmose": {
                 "title": "Osmose 問題",
                 "detail_title": "詳細資訊",
                 "elems_title": "圖徽",
                 "fix_title": "修復指南",
-                "trap_title": "常見錯誤",
-                "translation": "由 Osmose 提供的翻譯"
+                "trap_title": "常見錯誤"
             },
             "improveOSM": {
                 "title": " ImproveOSM 偵測",
@@ -1515,7 +1527,7 @@
                 "before_start": "你應該先熟悉開放街圖以及編輯器之前再開始編輯。iD 編輯器中有教學能教你基本編輯開放街圖的方法。點螢幕上的\"開始新手教學\"進行新手教學－這只會花 15 分鐘。",
                 "open_source_h": "開源",
                 "open_source": "iD 編輯器是共同協作的開源專案，你現在則是使用 {version} 版本。專案的原始碥在 [GitHub 上面](https://github.com/openstreetmap/iD)。",
-                "open_source_help": "你可以藉由[翻譯](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) 或是 [回報臭蟲](https://github.com/openstreetmap/iD/issues)，協助 iD 專案的發展。"
+                "open_source_help": "你可以藉由[翻譯](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating) 或是[回報臭蟲](https://github.com/openstreetmap/iD/issues)，協助 iD 專案的發展。"
             },
             "overview": {
                 "title": "概要",
@@ -2434,7 +2446,8 @@
                     "pan": "平移地圖",
                     "pan_more": "全螢幕平移地圖",
                     "zoom": "放大 / 縮小",
-                    "zoom_more": "大幅度放大 / 縮小"
+                    "zoom_more": "大幅度放大 / 縮小",
+                    "geolocate": "縮放到我的位置"
                 },
                 "help": {
                     "title": "幫助",
@@ -2824,7 +2837,7 @@
                     "label": "專業",
                     "options": {
                         "foot_bath": "泡腳",
-                        "hot_spring": "熱溫泉",
+                        "hot_spring": "溫泉",
                         "onsen": "日式溫泉"
                     }
                 },
@@ -2893,6 +2906,9 @@
                 "bridge/support": {
                     "label": "類型"
                 },
+                "bridge_combo": {
+                    "label": "類型"
+                },
                 "building": {
                     "label": "建築物",
                     "terms": "建築"
@@ -2947,6 +2963,14 @@
                     "placeholder": "50, 100, 200...",
                     "terms": "容量,位子數"
                 },
+                "capacity/disabled_parking": {
+                    "label": "無障礙空間",
+                    "placeholder": "1, 2, 3..."
+                },
+                "capacity_parking": {
+                    "label": "總空間",
+                    "placeholder": "10, 20, 30..."
+                },
                 "cash_in": {
                     "label": "存款"
                 },
@@ -2967,7 +2991,13 @@
                     "terms": "收費金額"
                 },
                 "check_date": {
-                    "label": "最後檢查日期"
+                    "label": "最後檢查日期",
+                    "placeholder": "YYYY-MM-DD"
+                },
+                "circumference": {
+                    "label": "圓周",
+                    "placeholder": "1 m, 20 cm, 30 in…",
+                    "terms": "圓周"
                 },
                 "clothes": {
                     "label": "服飾"
@@ -3134,6 +3164,9 @@
                         "yes": "是"
                     }
                 },
+                "depth": {
+                    "label": "深度（公尺）"
+                },
                 "description": {
                     "label": "描述",
                     "terms": "敘述,描述"
@@ -3217,11 +3250,15 @@
                     "label": "顯示"
                 },
                 "distance": {
-                    "label": "距離"
+                    "label": "距離",
+                    "terms": "距離"
                 },
                 "disused/railway": {
                     "label": "類型"
                 },
+                "disused/shop": {
+                    "label": "類型"
+                },
                 "dock": {
                     "label": "碼頭種類"
                 },
@@ -3256,6 +3293,14 @@
                     "placeholder": "00:00",
                     "terms": "持續時間"
                 },
+                "ele": {
+                    "label": "海拔高度",
+                    "terms": "海拔高度"
+                },
+                "ele_node": {
+                    "label": "海拔高度",
+                    "terms": "海拔高度"
+                },
                 "electrified": {
                     "label": "電氣化",
                     "options": {
@@ -3267,10 +3312,6 @@
                     "placeholder": "架空電車線, 第三軌供電",
                     "terms": "電氣化"
                 },
-                "elevation": {
-                    "label": "海拔高度",
-                    "terms": "海拔,海拔高度"
-                },
                 "email": {
                     "label": "Email",
                     "placeholder": "example@example.com",
@@ -3387,6 +3428,9 @@
                 "gambling": {
                     "label": "遊戲"
                 },
+                "garden/type": {
+                    "label": "花園類型"
+                },
                 "gauge": {
                     "label": "軌距"
                 },
@@ -3568,7 +3612,7 @@
                     "label": "週期性水流"
                 },
                 "internet_access": {
-                    "label": "網際網絡存取",
+                    "label": "網際網路連線",
                     "options": {
                         "no": "無",
                         "terminal": "終端",
@@ -3576,11 +3620,16 @@
                         "wlan": "無線網絡",
                         "yes": "有"
                     },
-                    "terms": "網路連線"
+                    "terms": "網既網路連線"
                 },
                 "internet_access/fee": {
-                    "label": "網路存取費用",
-                    "terms": "網路連線費用"
+                    "label": "網際網路存取使用費",
+                    "options": {
+                        "customers": "僅客戶",
+                        "no": "免費",
+                        "yes": "付費"
+                    },
+                    "terms": "網際網路存取使用費"
                 },
                 "internet_access/ssid": {
                     "label": "Wifi 網路名稱",
@@ -3778,6 +3827,10 @@
                     "label": "微釀啤酒作坊",
                     "terms": "私釀酒"
                 },
+                "mimics": {
+                    "label": "偽裝",
+                    "terms": "偽裝"
+                },
                 "min_age": {
                     "label": "最小年齡",
                     "terms": "最小年紀"
@@ -3845,8 +3898,7 @@
                     "terms": "網路,連鎖體系"
                 },
                 "network/type": {
-                    "label": "網路類型",
-                    "terms": "網路類型"
+                    "label": "網路類型"
                 },
                 "network_bicycle": {
                     "label": "網路類型",
@@ -3921,7 +3973,8 @@
                     "terms": "允許明火"
                 },
                 "opening_date": {
-                    "label": "預計開放日期"
+                    "label": "預計開放日期",
+                    "placeholder": "YYYY-MM-DD"
                 },
                 "opening_hours": {
                     "label": "小時",
@@ -3959,6 +4012,9 @@
                         "underground": "地下"
                     }
                 },
+                "parking_space": {
+                    "label": "類型"
+                },
                 "payment_multi": {
                     "label": "付款類型",
                     "terms": "付費方式,付款方式,付費種類 "
@@ -4099,6 +4155,10 @@
                 "playground/theme": {
                     "label": "主題"
                 },
+                "plots": {
+                    "label": "小塊土地",
+                    "placeholder": "10, 20, 30..."
+                },
                 "polling_station": {
                     "label": "投票站",
                     "terms": "投票所,投開票所 "
@@ -4518,6 +4578,7 @@
                 },
                 "start_date": {
                     "label": "啟始日期",
+                    "placeholder": "YYYY-MM-DD",
                     "terms": "開始日期,開工日期,開業日期"
                 },
                 "step_count": {
@@ -4632,6 +4693,9 @@
                 "target": {
                     "label": "目標"
                 },
+                "telecom/medium": {
+                    "label": "媒介"
+                },
                 "tidal": {
                     "label": "潮汐",
                     "terms": "潮汐"
@@ -4759,6 +4823,9 @@
                     "label": "類型",
                     "placeholder": "預設"
                 },
+                "tunnel_combo": {
+                    "label": "類型"
+                },
                 "usage_rail": {
                     "label": "用途類型",
                     "options": {
@@ -4952,8 +5019,8 @@
                     "terms": "牽引纜車"
                 },
                 "aerialway/gondola": {
-                    "name": "空中纜車",
-                    "terms": "吊車"
+                    "name": "貢多拉纜車",
+                    "terms": "貢多拉纜車"
                 },
                 "aerialway/goods": {
                     "name": "載貨纜車",
@@ -5436,6 +5503,10 @@
                     "name": "停車位",
                     "terms": "停車格,停車空間"
                 },
+                "amenity/parking_space/disabled": {
+                    "name": "無障礙停車位",
+                    "terms": "無障礙停車位"
+                },
                 "amenity/payment_centre": {
                     "name": "繳費中心",
                     "terms": "繳費中心"
@@ -5445,8 +5516,8 @@
                     "terms": "繳費處"
                 },
                 "amenity/pharmacy": {
-                    "name": "藥房櫃臺",
-                    "terms": "藥房櫃臺"
+                    "name": "藥局",
+                    "terms": "藥房櫃臺,藥房,藥店"
                 },
                 "amenity/photo_booth": {
                     "name": "照相站",
@@ -5575,9 +5646,6 @@
                     "name": "回收筒",
                     "terms": "回收箱"
                 },
-                "amenity/register_office": {
-                    "name": "戶政事務所"
-                },
                 "amenity/research_institute": {
                     "name": "研究機構場地",
                     "terms": "研究機構場地"
@@ -5666,9 +5734,6 @@
                     "name": "中小學範圍",
                     "terms": "學校,中學,小學,國中,國小,高中,學校用地,學校範圍,School Grounds,School"
                 },
-                "amenity/scrapyard": {
-                    "name": "汽車廢料場"
-                },
                 "amenity/shelter": {
                     "name": "涼亭",
                     "terms": "遮雨棚,亭,亭子"
@@ -5744,9 +5809,6 @@
                     "name": "電影製片場",
                     "terms": "電影製片場"
                 },
-                "amenity/swimming_pool": {
-                    "name": "游泳池"
-                },
                 "amenity/taxi": {
                     "name": "計程車招呼站",
                     "terms": "計程車站,招呼站"
@@ -6104,6 +6166,10 @@
                     "name": "出擊口",
                     "terms": "出擊口"
                 },
+                "barrier/spikes": {
+                    "name": "地釘",
+                    "terms": "地釘"
+                },
                 "barrier/stile": {
                     "name": "梯磴",
                     "terms": "牆兩邊的階梯"
@@ -6576,6 +6642,9 @@
                 "disused/railway": {
                     "name": "廢棄鐵軌圖徽"
                 },
+                "disused/shop": {
+                    "name": "廢棄商店"
+                },
                 "embankment": {
                     "name": "路堤"
                 },
@@ -6937,6 +7006,10 @@
                     "name": "路徑",
                     "terms": "路徑"
                 },
+                "highway/path/boardwalk": {
+                    "name": "木板路",
+                    "terms": "木板路"
+                },
                 "highway/path/informal": {
                     "name": "非正式的路徑",
                     "terms": "非正式的路徑"
@@ -7206,8 +7279,8 @@
                     "name": "土地利用圖徵"
                 },
                 "landuse/allotments": {
-                    "name": "社區農園",
-                    "terms": "社區田圃,城市農園,社區園圃,社區農地,都市農園"
+                    "name": "社群花園",
+                    "terms": "社群花園"
                 },
                 "landuse/aquaculture": {
                     "name": "養殖漁業",
@@ -7315,16 +7388,16 @@
                     "terms": "軍港,海軍基地"
                 },
                 "landuse/military/obstacle_course": {
-                    "name": "障礙課程場地",
-                    "terms": "障礙課程場地,障礙課程"
+                    "name": "軍事障礙課程",
+                    "terms": "軍事障礙課程"
                 },
                 "landuse/military/range": {
                     "name": "軍用靶場",
                     "terms": "靶場,軍用靶場,射擊場,軍事靶場"
                 },
                 "landuse/military/training_area": {
-                    "name": "訓練場地",
-                    "terms": "教練場,訓練場"
+                    "name": "軍事訓練區域",
+                    "terms": "軍事訓練區域"
                 },
                 "landuse/orchard": {
                     "name": "果園",
@@ -7499,6 +7572,14 @@
                     "name": "花園",
                     "terms": "花園,果園,菜園,植物園,公園"
                 },
+                "leisure/garden/botanical": {
+                    "name": "植物園",
+                    "terms": "植物園"
+                },
+                "leisure/garden/community": {
+                    "name": "社區花園",
+                    "terms": "社區花園"
+                },
                 "leisure/golf_course": {
                     "name": "高爾夫球場",
                     "terms": "高爾夫球場"
@@ -7691,26 +7772,14 @@
                     "name": "自行車道",
                     "terms": "單車道"
                 },
-                "leisure/track/cycling_point": {
-                    "name": "自行車道",
-                    "terms": "自行車道"
-                },
                 "leisure/track/horse_racing": {
                     "name": "賽馬跑道",
                     "terms": "賽馬跑道"
                 },
-                "leisure/track/horse_racing_point": {
-                    "name": "賽馬道",
-                    "terms": "賽馬道"
-                },
                 "leisure/track/running": {
                     "name": "跑道",
                     "terms": "跑道"
                 },
-                "leisure/track/running_point": {
-                    "name": "跑道",
-                    "terms": "跑道"
-                },
                 "leisure/water_park": {
                     "name": "水上樂園",
                     "terms": "水上公園,水上遊樂園"
@@ -7791,8 +7860,8 @@
                     "terms": "煤氣筒"
                 },
                 "man_made/groyne": {
-                    "name": "堤防",
-                    "terms": "河堤,海堤"
+                    "name": "防波堤",
+                    "terms": "防波堤"
                 },
                 "man_made/lighthouse": {
                     "name": "燈塔",
@@ -8002,8 +8071,8 @@
                     "terms": "軍用掩體"
                 },
                 "military/checkpoint": {
-                    "name": "檢查站",
-                    "terms": "檢查站"
+                    "name": "軍方檢查站",
+                    "terms": "軍方檢查站"
                 },
                 "military/nuclear_explosion_site": {
                     "name": "核武測試場",
@@ -8105,9 +8174,13 @@
                 "natural/shingle": {
                     "name": "礫灘"
                 },
+                "natural/shrub": {
+                    "name": "灌木",
+                    "terms": "灌木"
+                },
                 "natural/spring": {
-                    "name": "溫泉",
-                    "terms": "溫泉"
+                    "name": "泉水",
+                    "terms": "泉水"
                 },
                 "natural/stone": {
                     "name": "孤石"
@@ -8543,6 +8616,9 @@
                 "power": {
                     "name": "電力圖徽"
                 },
+                "power/cable": {
+                    "name": "電纜"
+                },
                 "power/cable/underground": {
                     "name": "地下電纜",
                     "terms": "電纜,地底式電纜"
@@ -8812,8 +8888,8 @@
                     "terms": "廢棄鐵道,廢棄的鐵路"
                 },
                 "railway/funicular": {
-                    "name": "纜車",
-                    "terms": "纜車"
+                    "name": "纜車軌道",
+                    "terms": "纜車軌道"
                 },
                 "railway/halt": {
                     "name": "火車站 (小站/招呼)"
@@ -8823,35 +8899,43 @@
                     "terms": "鐵路平交道,平交道"
                 },
                 "railway/light_rail": {
-                    "name": "輕軌",
-                    "terms": "輕軌鐵路"
+                    "name": "輕軌軌道",
+                    "terms": "輕軌軌道"
                 },
                 "railway/milestone": {
                     "name": "鐵路里程碑",
                     "terms": "鐵路里程碑"
                 },
                 "railway/miniature": {
-                    "name": "微型鐵路",
-                    "terms": "微型鐵路,微型鐵軌"
+                    "name": "微型火車軌道",
+                    "terms": "微型火車軌道"
                 },
                 "railway/monorail": {
-                    "name": "單軌電車",
-                    "terms": "畢軌電車"
+                    "name": "單軌軌道",
+                    "terms": "單軌軌道"
+                },
+                "railway/monorail/hanging": {
+                    "name": "懸掛式單軌列車",
+                    "terms": "懸掛式單軌列車"
                 },
                 "railway/narrow_gauge": {
-                    "name": "窄軌鐵路",
-                    "terms": "窄軌鐵路"
+                    "name": "窄軌軌道",
+                    "terms": "窄軌軌道"
                 },
                 "railway/platform": {
                     "name": "火車月台"
                 },
+                "railway/preserved": {
+                    "name": "觀光鐵路",
+                    "terms": "觀光鐵路"
+                },
                 "railway/rail": {
-                    "name": "鐵軌",
-                    "terms": "路軌"
+                    "name": "火車軌道",
+                    "terms": "火車軌道"
                 },
                 "railway/rail/highspeed": {
-                    "name": "高速鐵路",
-                    "terms": "高速鐵路,高鐵"
+                    "name": "高鐵軌道",
+                    "terms": "高鐵軌道"
                 },
                 "railway/signal": {
                     "name": "鐵道信號",
@@ -8861,8 +8945,8 @@
                     "name": "火車站"
                 },
                 "railway/subway": {
-                    "name": "捷運",
-                    "terms": "地鐵,地下鐵,管子"
+                    "name": "地下鐵軌道",
+                    "terms": "地下鐵軌道"
                 },
                 "railway/subway_entrance": {
                     "name": "捷運入口",
@@ -8877,8 +8961,8 @@
                     "terms": "火車清洗處"
                 },
                 "railway/tram": {
-                    "name": "電車",
-                    "terms": "電車"
+                    "name": "路面電車軌道",
+                    "terms": "路面電車軌道"
                 },
                 "railway/tram_stop": {
                     "name": "街車停靠點"
@@ -9185,9 +9269,6 @@
                     "name": "釣魚用品店",
                     "terms": "釣魚用品店"
                 },
-                "shop/fishmonger": {
-                    "name": "魚販"
-                },
                 "shop/flooring": {
                     "name": "地板商店",
                     "terms": "地板商店"
@@ -9201,8 +9282,8 @@
                     "terms": "表框店, 裱框店"
                 },
                 "shop/frozen_food": {
-                    "name": "冷凍食品",
-                    "terms": "冷凍食品"
+                    "name": "冷凍食品商店",
+                    "terms": "冷凍食品商店"
                 },
                 "shop/fuel": {
                     "name": "燃料店",
@@ -9212,9 +9293,6 @@
                     "name": "生命禮儀公司",
                     "terms": "禮儀公司"
                 },
-                "shop/furnace": {
-                    "name": "火爐店"
-                },
                 "shop/furniture": {
                     "name": "傢具店",
                     "terms": "家具店"
@@ -9590,6 +9668,10 @@
                     "name": "資料中心",
                     "terms": "資料中心"
                 },
+                "telecom/exchange": {
+                    "name": "電信交換",
+                    "terms": "電信交換"
+                },
                 "tourism": {
                     "name": "旅遊圖徽"
                 },
@@ -9943,6 +10025,10 @@
                     "name": "電車路線",
                     "terms": "電車路線"
                 },
+                "type/route/trolleybus": {
+                    "name": "無軌電車路線",
+                    "terms": "無軌電車路線"
+                },
                 "type/route_master": {
                     "name": "路線總纜",
                     "terms": "路線總目"
@@ -10289,6 +10375,13 @@
                 "description": "城市地圖是描述哥特堡的概覽地圖。它包含了關於土地、通訊、水文、建築、地址號碼與街道名稱、行政區劃與其他方向文字等的一般性資訊。",
                 "name": "哥特堡城市地圖"
             },
+            "gothenburg-ortho": {
+                "attribution": {
+                    "text": "© 哥特堡市，CC0"
+                },
+                "description": "哥特堡市的正射影像",
+                "name": "哥特堡正射影像"
+            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI 日本"
@@ -10456,6 +10549,12 @@
                 },
                 "name": "Thunderforest Landscape"
             },
+            "tf-outdoors": {
+                "attribution": {
+                    "text": "地圖 © Thunderforest，資料 © OpenStreetMap 貢獻者們"
+                },
+                "name": "Thunderforest Outdoors"
+            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -10497,6 +10596,12 @@
                 },
                 "description": "Swedish NVDB 有多個選項的路網圖層",
                 "name": "Trafikverket 路網選項"
+            },
+            "wroclaw-orto2018": {
+                "attribution": {
+                    "text": "Urząd Miasta Wrocław"
+                },
+                "name": "Wrocław: Orthophotomap 2018（航照圖）"
             }
         },
         "community": {
@@ -10528,11 +10633,22 @@
                 "description": "達拉斯—沃斯堡的 OpenStreetMap 使用者群組",
                 "extendedDescription": "達拉斯、沃斯堡與其間的所有城市都充滿了極具創造力且技術精湛的人才。這個使用者群組的願景是找出新的方法來使用 OSM 上的驚人資源。"
             },
+            "Galicia-Telegram": {
+                "name": "開放街圖加利西亞 Telegram",
+                "description": "開放街圖加利西亞 Telegram"
+            },
+            "Galicia-Twitter": {
+                "name": "開放街圖加利西亞 Twitter",
+                "description": "在{url}於 Twitter 追隨我們"
+            },
             "GeoPhilly": {
                 "name": "GeoPhilly",
                 "description": "費城地區的地圖愛好者聚會",
                 "extendedDescription": "GeoPhilly 將開發者、地理學家、資料極客、開放原始碼愛好者、公民駭客與地圖愛好者聯合起來，並將我們對地圖的熱愛與他們的故事連結起來。如果你在工作中會用到地圖，或僅僅只是想要了解更多，這就是為你而辦的聚會！我們的活動旨在開放、友好、教育與社交，從歡樂時光到閃電講，甚至是工作坊都有。跟我們一起在費城建立一個多元化且激勵人心的地理空間社群！"
             },
+            "MapColabora-twitter": {
+                "description": "協作製圖/薩拉戈薩地理信息Twitter帳戶"
+            },
             "MapMinnesota": {
                 "name": "MapMinnesota",
                 "description": "在雙城區一帶的圖客與開放街圖使用者",

vendor/assets/iD/iD/locales/zh.json

@@ -323,9 +323,6 @@
                 "description": {
                     "label": "描述"
                 },
-                "elevation": {
-                    "label": "海拔"
-                },
                 "emergency": {
                     "label": "急诊"
                 },
@@ -352,7 +349,6 @@
                     "label": "斜度"
                 },
                 "internet_access": {
-                    "label": "互联网接入",
                     "options": {
                         "terminal": "终端",
                         "wired": "有线网络",
@@ -581,9 +577,6 @@
                 "amenity/restaurant": {
                     "name": "餐馆"
                 },
-                "amenity/swimming_pool": {
-                    "name": "游泳池"
-                },
                 "amenity/telephone": {
                     "name": "电话"
                 },
@@ -965,21 +958,9 @@
                 "railway/disused": {
                     "name": "废弃的铁路"
                 },
-                "railway/monorail": {
-                    "name": "单轨铁路"
-                },
-                "railway/rail": {
-                    "name": "铁轨"
-                },
-                "railway/subway": {
-                    "name": "地铁"
-                },
                 "railway/subway_entrance": {
                     "name": "地铁口"
                 },
-                "railway/tram": {
-                    "name": "电车"
-                },
                 "relation": {
                     "name": "关系"
                 },
@@ -1040,9 +1021,6 @@
                 "shop/electronics": {
                     "name": "电器店"
                 },
-                "shop/fishmonger": {
-                    "name": "海产店"
-                },
                 "shop/florist": {
                     "name": "花店"
                 },