Update to iD v1.3.10

vendor/assets/iD/iD.css.erb

@@ -321,111 +321,77 @@ path.shadow.selected {
     stroke-opacity: 0.7;
 }
 
-path.area.stroke {
-    stroke: white;
-    stroke-width: 1;
-}
-
-path.area.fill {
-    fill:#fff;
-    fill-opacity:0.3;
-    fill-rule: evenodd;
-}
-
 path.line.stroke {
     stroke: white;
     stroke-width: 2;
 }
 
+path.area.stroke {
+    stroke: white;
+    stroke-width: 1;
+}
+path.area.fill {
+    fill: rgba(255, 255, 255, 0.3);
+    fill-rule: evenodd;
+}
+.preset-icon-fill-area {
+    border: 1px solid rgb(170, 170, 170);
+    background-color: rgba(170, 170, 170, 0.3);
+}
+
 path.stroke.tag-natural {
-    stroke: #b6e199;
+    stroke: rgb(182, 225, 153);
 }
 path.fill.tag-natural {
-    fill: #b6e199;
+    fill: rgba(182, 225, 153, 0.3);
+}
+.preset-icon-fill-area.tag-natural {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.3);
 }
 
 path.stroke.tag-natural-water {
-    stroke: #77d3de;
+    stroke: rgb(119, 211, 222);
 }
 path.fill.tag-natural-water {
-    fill: #77d3de;
+    fill: rgba(119, 211, 222, 0.3);
+}
+.preset-icon-fill-area.tag-natural-water {
+    border-color: rgb(119, 211, 222);
+    background-color: rgba(119, 211, 222, 0.3);
 }
 
 path.stroke.tag-amenity-school {
-    stroke: #ffff94;
+    stroke: rgb(255, 255, 148);
 }
 path.fill.tag-amenity-school {
-    fill: #ffff94;
+    fill: rgba(255, 255, 148, 0.2);
-    fill-opacity: 0.2;
+}
+.preset-icon-fill-area.tag-amenity-school {
+    border-color: rgb(255, 255, 148);
+    background-color: rgba(255, 255, 148, 0.2);
 }
 
 path.stroke.tag-amenity-university {
-    stroke: #ffff94;
+    stroke: rgb(255, 255, 148);
 }
 path.fill.tag-amenity-university {
-    fill: #ffff94;
+    fill: rgba(255, 255, 148, 0.1);
-    fill-opacity: 0.1;
 }
-
+.preset-icon-fill-area.tag-amenity-university {
-path.stroke.tag-building {
+    border-color: rgb(255, 255, 148);
-    stroke: #e06e5f;
+    background-color: rgba(255, 255, 148, 0.1);
 }
-path.fill.tag-building {
-    fill: #e06e5f;
-}
-
-/* Landuse */
-
 
 path.stroke.tag-landuse,
 path.stroke.tag-natural-wood,
 path.stroke.tag-natural-tree,
 path.stroke.tag-natural-grassland,
+path.stroke.tag-natural-grass,
 path.stroke.tag-leisure-pitch,
 path.stroke.tag-leisure-park {
-    stroke: #8cd05f;
+    stroke: rgb(140, 208, 95);
 }
-
-path.stroke.tag-landuse-retail,
-path.stroke.tag-landuse-commercial {
-    stroke: #eab056;
-}
-
-path.stroke.tag-landuse-industrial {
-    stroke: #e4a4f5;
-}
-
-path.stroke.tag-landuse-basin,
-path.stroke.tag-landuse-reservoir {
-    stroke: #77d3de;
-}
-
-path.stroke.tag-landuse-quarry {
-    stroke: #a6957b;
-}
-
-path.stroke.tag-landuse-landfill {
-    stroke: #ff9933;
-}
-
-path.stroke.tag-landuse-residential,
-path.stroke.tag-landuse-construction {
-    stroke: #e06e5f;
-}
-
-path.stroke.tag-landuse-meadow,
-path.stroke.tag-natural-wetland {
-    stroke: #b6e199;
-}
-
-path.stroke.tag-natural-beach {
-    stroke: #ffff7e;
-}
-
-path.stroke.tag-natural-scrub {
-    stroke: #dbf08b;
-}
-
 path.fill.tag-landuse,
 path.fill.tag-natural-wood,
 path.fill.tag-natural-tree,
@@ -433,134 +399,186 @@ path.fill.tag-natural-grassland,
 path.fill.tag-natural-grass,
 path.fill.tag-leisure-pitch,
 path.fill.tag-leisure-park {
-    fill: #8cd05f;
+    fill: rgba(140, 208, 95, 0.2);
-    fill-opacity: 0.2;
+}
+.preset-icon-fill-area.tag-landuse,
+.preset-icon-fill-area.tag-natural-wood,
+.preset-icon-fill-area.tag-natural-tree,
+.preset-icon-fill-area.tag-natural-grassland,
+.preset-icon-fill-area.tag-natural-grass,
+.preset-icon-fill-area.tag-leisure-pitch,
+.preset-icon-fill-area.tag-leisure-park {
+    border-color: rgb(140, 208, 95);
+    background-color: rgba(140, 208, 95, 0.2);
 }
 
+path.stroke.tag-landuse-residential {
+    stroke: rgb(224, 110, 95);
+}
+path.fill.tag-landuse-residential {
+    fill: rgba(224, 110, 95, 0.1);
+}
+.preset-icon-fill-area.tag-landuse-residential {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.1);
+}
+
+path.stroke.tag-landuse-retail,
+path.stroke.tag-landuse-commercial {
+    stroke: rgb(234, 176, 86);
+}
 path.fill.tag-landuse-retail,
-path.fill.tag-landuse-residential,
+path.fill.tag-landuse-commercial {
-path.fill.tag-landuse-commercial,
+    fill: rgba(234, 176, 86, 0.1);
+}
+.preset-icon-fill-area.tag-landuse-retail,
+.preset-icon-fill-area.tag-landuse-commercial {
+    border-color: rgb(234, 176, 86);
+    background-color: rgba(234, 176, 86, 0.1);
+}
+
+path.stroke.tag-landuse-industrial {
+    stroke: rgb(228, 164, 245);
+}
 path.fill.tag-landuse-industrial {
-    fill-opacity: 0.1;
+    fill: rgba(228, 164, 245, 0.1);
+}
+.preset-icon-fill-area.tag-landuse-industrial {
+    border-color: rgb(228, 164, 245);
+    background-color: rgba(228, 164, 245, 0.1);
 }
 
-path.fill.tag-natural-wetland,
+path.stroke.tag-landuse-basin,
-path.fill.tag-natural-beach,
+path.stroke.tag-landuse-reservoir {
-path.fill.tag-natural-scrub,
+    stroke: rgb(119, 211, 222);
-path.fill.tag-landuse-cemetery,
-path.fill.tag-landuse-meadow,
-path.fill.tag-landuse-farm,
-path.fill.tag-landuse-farmland,
-path.fill.tag-landuse-construction,
-path.fill.tag-landuse-orchard {
-    /* background color is applied a further opacity later */
-    fill-opacity: 0.8;
 }
-
-.pattern-color-beach,
-.pattern-color-scrub,
-.pattern-color-meadow,
-.pattern-color-wetland,
-.pattern-color-cemetery,
-.pattern-color-farm,
-.pattern-color-farmland,
-.pattern-color-construction,
-.pattern-color-orchard {
-    fill-opacity: 0.2;
-}
-
 path.fill.tag-landuse-basin,
 path.fill.tag-landuse-reservoir {
-    fill: #77d3de;
+    fill: rgba(119, 211, 222, 0.3);
+}
+.preset-icon-fill-area.tag-landuse-basin,
+.preset-icon-fill-area.tag-landuse-reservoir {
+    border-color: rgb(119, 211, 222);
+    background-color: rgba(119, 211, 222, 0.3);
 }
 
+path.stroke.tag-landuse-quarry {
+    stroke: rgb(166, 149, 123);
+}
 path.fill.tag-landuse-quarry {
-    fill: #a6957b;
+    fill: rgba(166, 149, 123, 0.2);
-    fill-opacity: 0.2;
+}
+.preset-icon-fill-area.tag-landuse-quarry {
+    border-color: rgb(166, 149, 123);
+    background-color: rgba(166, 149, 123, 0.2);
 }
 
+path.stroke.tag-landuse-landfill {
+    stroke: rgb(255, 153, 51);
+}
 path.fill.tag-landuse-landfill {
-    fill: #ff8800;
+    fill: rgba(255, 153, 51, 0.2);
-    fill-opacity: 0.2;
+}
+.preset-icon-fill-area.tag-landuse-landfill {
+    border-color: rgb(255, 153, 51);
+    background-color: rgba(255, 153, 51, 0.2);
 }
 
-path.fill.tag-landuse-residential {
+path.stroke.tag-landuse-construction {
-    fill: #e06e5f;
+    stroke: rgb(224, 110, 95);
+}
+.pattern-color-construction {
+    fill: rgba(224, 110, 95, 0.2);
+}
+.preset-icon-fill-area.tag-landuse-construction {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.2);
 }
 
-path.fill.tag-landuse-farm,
+path.stroke.tag-landuse-military {
-path.fill.tag-landuse-farmland {
+    stroke: rgb(224, 110, 95);
-    fill: url(#pattern-farmland) #8cd05f;
+}
+.preset-icon-fill-area.tag-landuse-military {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.2);
+}
+
+path.stroke.tag-natural-wetland {
+    stroke: rgb(182, 225, 153);
+}
+.pattern-color-wetland {
+    fill: rgba(182, 225, 153, 0.2);
+}
+.preset-icon-fill-area.tag-natural-wetland {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.2);
+}
+
+path.stroke.tag-landuse-meadow {
+    stroke: rgb(182, 225, 153);
+}
+.pattern-color-meadow {
+    fill: rgba(182, 225, 153, 0.2);
+}
+.preset-icon-fill-area.tag-landuse-meadow {
+    border-color: rgb(182, 225, 153);
+    background-color: rgba(182, 225, 153, 0.2);
+}
+
+path.stroke.tag-natural-beach {
+    stroke: rgb(255, 255, 126);
+}
+.pattern-color-beach {
+    fill: rgba(255, 255, 126, 0.2);
+}
+.preset-icon-fill-area.tag-natural-beach {
+    border-color: rgb(255, 255, 126);
+    background-color: rgba(255, 255, 126, 0.2);
+}
+
+path.stroke.tag-natural-scrub {
+    stroke: rgb(219, 240, 139);
+}
+.pattern-color-scrub {
+    fill: rgba(219, 240, 139, 0.2);
+}
+.preset-icon-fill-area.tag-natural-scrub {
+    border-color: rgb(219, 240, 139);
+    background-color: rgba(219, 240, 139, 0.2);
 }
 
 .pattern-color-farm,
 .pattern-color-farmland {
-    fill: url(#pattern-farmland) #8cd05f;
+    fill: rgba(140, 208, 95, 0.2);
+}
+.preset-icon-fill-area.tag-landuse-farm,
+.preset-icon-fill-area.tag-landuse-farmland {
+    background-color: rgba(140, 208, 95, 0.2);
 }
 
-path.fill.tag-landuse-meadow {
-    fill: url(#pattern-meadow) #b6e199;
-}
-.pattern-color-meadow {
-    fill: #b6e199;
-}
-
-path.fill.tag-natural-wetland {
-    fill: url(#pattern-wetland) #b6e199;
-}
-.pattern-color-wetland {
-    fill: #B6E199;
-}
-
-path.fill.tag-natural-beach {
-    fill: url(#pattern-beach) #ffff7e;
-}
-.pattern-color-beach {
-    fill: #ffff7e;
-}
-
-path.fill.tag-natural-scrub {
-    fill: url(#pattern-scrub) #dbf08b;
-}
-.pattern-color-scrub {
-    fill: #dbf08b;
-}
-
-path.fill.tag-landuse-cemetery {
-    fill: url(#pattern-cemetery) #8cd05f;
-}
 .pattern-color-cemetery {
-    fill: #8cd05f
+    fill: rgba(140, 208, 95, 0.2)
+}
+.preset-icon-fill-area.tag-landuse-cemetery {
+    background-color: rgba(140, 208, 95, 0.2);
 }
 
-path.fill.tag-landuse-orchard {
-    fill: url(#pattern-orchard) #8cd05f;
-}
 .pattern-color-orchard {
-    fill: #8cd05f
+    fill: rgba(140, 208, 95, 0.2)
 }
-
+.preset-icon-fill-area.tag-landuse-orchard {
-path.fill.tag-landuse-construction {
+    background-color: rgba(140, 208, 95, 0.8);
-    fill: url(#pattern-construction) #e06e5f;
-}
-.pattern-color-construction {
-    fill: #e06e5f;
-}
-
-path.fill.tag-landuse-retail,
-path.fill.tag-landuse-commercial {
-    fill: #eab056;
-}
-
-path.fill.tag-landuse-industrial {
-    fill: #e4a4f5;
 }
 
 path.stroke.tag-amenity-parking {
-    stroke: #aaa;
+    stroke: rgb(170, 170, 170);
 }
 path.fill.tag-amenity-parking {
-    fill: #aaa;
+    fill: rgba(170, 170, 170, 0.3);
+}
+.preset-icon-fill-area.tag-amenity-parking {
+    border-color: rgb(170, 170, 170);
+    background-color: rgba(170, 170, 170, 0.3);
 }
 
 path.fill.tag-place,
@@ -689,9 +707,6 @@ path.stroke.area.tag-highway-pedestrian {
     stroke:#fff;
     stroke-width: 2;
 }
-path.fill.area.tag-highway-pedestrian {
-    fill:#ccc;
-}
 
 path.stroke.tag-highway-service {
     stroke:#fff;
@@ -803,121 +818,66 @@ path.casing.tag-aeroway-runway {
     stroke-linecap: square;
 }
 path.fill.tag-aeroway-runway {
-    fill: #000;
+    fill: rgba(0, 0, 0, 0.6);
-    fill-opacity: 0.6;
 }
 path.stroke.tag-aeroway-apron {
     stroke: #805C80;
 }
 path.fill.tag-aeroway-apron {
-    fill: #805C80;
+    fill: rgba(128, 92, 128, 0.2);
-    fill-opacity: 0.2;
 }
 
 
-/* bridges */
-
-path.casing.tag-bridge {
-    stroke-width: 14;
-    stroke-opacity: 0.5;
-    stroke: #000;
-}
-
-path.casing.tag-highway-living_street.tag-bridge,
-path.casing.tag-highway-path.tag-bridge {
-    stroke-width: 6;
-}
-
-path.casing.line.tag-highway-pedestrian,
-path.casing.tag-highway-service.tag-bridge,
-path.casing.tag-highway-track.tag-bridge,
-path.casing.tag-highway-steps.tag-bridge,
-path.casing.tag-highway-footway.tag-bridge,
-path.casing.tag-highway-cycleway.tag-bridge,
-path.casing.tag-highway-bridleway.tag-bridge {
-    stroke-width: 8;
-}
-
-path.shadow.tag-highway-residential.tag-bridge {
-    stroke-width:22;
-}
-
-path.shadow.tag-highway-living_street.tag-bridge,
-path.shadow.tag-highway-path.tag-bridge,
-path.shadow.line.tag-highway-pedestrian,
-path.shadow.tag-highway-service.tag-bridge,
-path.shadow.tag-highway-track.tag-bridge,
-path.shadow.tag-highway-steps.tag-bridge,
-path.shadow.tag-highway-footway.tag-bridge,
-path.shadow.tag-highway-cycleway.tag-bridge,
-path.shadow.tag-highway-bridleway.tag-bridge {
-    stroke-width: 16;
-}
-
-/* tunnels */
-
-path.stroke.tag-highway.tag-tunnel {
-    stroke-opacity: 0.3;
-}
-
-path.casing.tag-highway.tag-tunnel {
-    stroke-opacity: 0.5;
-}
-
-path.stroke.tag-highway-construction,
-path.casing.tag-highway-construction {
-    stroke-linecap: butt;
-    stroke-dasharray: 7, 7;
-}
-
-/* construction */
-
-.low-zoom path.stroke.tag-highway-construction,
-.low-zoom path.casing.tag-highway-construction {
-    stroke-linecap: butt;
-    stroke-dasharray: 5, 5;
-}
-
 /* railways */
 
-.line.stroke.tag-railway {
+path.stroke.tag-railway {
     stroke: #eee;
     stroke-width: 2;
     stroke-linecap: butt;
     stroke-dasharray: 12,12;
 }
-.line.casing.tag-railway {
+
+path.casing.tag-railway {
     stroke: #555;
     stroke-width: 4;
 }
 
-.line.stroke.tag-railway-abandoned {
+path.stroke.tag-railway-abandoned {
     stroke: #eee;
 }
-.line.casing.tag-railway-abandoned {
+path.casing.tag-railway-abandoned {
     stroke: #999;
 }
 
-.line.stroke.tag-railway-subway {
+path.stroke.tag-railway-subway {
     stroke: #666;
 }
-.line.casing.tag-railway-subway {
+path.casing.tag-railway-subway {
     stroke: #222;
 }
 
-.line.stroke.tag-railway-platform {
+path.stroke.tag-railway-platform {
     stroke: #999;
     stroke-width: 4;
     stroke-dasharray: none;
 }
-.line.casing.tag-railway-platform {
+path.casing.tag-railway-platform {
+    stroke: none;
+}
+
+.area.stroke.tag-railway {
+    stroke: white;
+    stroke-width: 1;
+    stroke-dasharray: none;
+}
+.area.casing.tag-railway {
     stroke: none;
 }
 
 /* waterways */
 
 path.fill.tag-waterway {
-    fill: #77d3de;
+    fill: rgba(119, 211, 222, 0.3);
 }
 
 path.stroke.tag-waterway {
@@ -974,6 +934,96 @@ path.casing.tag-boundary-national_park {
 }
 
 
+/* bridges */
+
+path.casing.tag-bridge {
+    stroke-width: 14;
+    stroke-opacity: 0.5;
+    stroke: #000;
+}
+
+path.casing.tag-highway-living_street.tag-bridge,
+path.casing.tag-highway-path.tag-bridge {
+    stroke-width: 6;
+}
+
+path.casing.line.tag-highway-pedestrian,
+path.casing.tag-highway-service.tag-bridge,
+path.casing.tag-highway-track.tag-bridge,
+path.casing.tag-highway-steps.tag-bridge,
+path.casing.tag-highway-footway.tag-bridge,
+path.casing.tag-highway-cycleway.tag-bridge,
+path.casing.tag-highway-bridleway.tag-bridge {
+    stroke-width: 8;
+}
+
+path.shadow.tag-highway-residential.tag-bridge {
+    stroke-width:22;
+}
+
+path.shadow.tag-highway-living_street.tag-bridge,
+path.shadow.tag-highway-path.tag-bridge,
+path.shadow.line.tag-highway-pedestrian,
+path.shadow.tag-highway-service.tag-bridge,
+path.shadow.tag-highway-track.tag-bridge,
+path.shadow.tag-highway-steps.tag-bridge,
+path.shadow.tag-highway-footway.tag-bridge,
+path.shadow.tag-highway-cycleway.tag-bridge,
+path.shadow.tag-highway-bridleway.tag-bridge {
+    stroke-width: 16;
+}
+
+/* tunnels */
+
+path.stroke.tag-tunnel {
+    stroke-opacity: 0.3;
+}
+
+path.casing.tag-tunnel {
+    stroke-opacity: 0.5;
+}
+
+/* embankments / cuttings */
+
+path.casing.tag-embankment,
+path.casing.tag-cutting {
+    stroke-opacity: 0.5;
+    stroke: #000;
+    stroke-width: 22;
+    stroke-dasharray: 2, 4;
+    stroke-linecap: butt;
+}
+
+path.shadow.tag-embankment,
+path.shadow.tag-cutting {
+    stroke-width: 28;
+}
+
+.low-zoom path.casing.tag-embankment,
+.low-zoom path.casing.tag-cutting {
+    stroke-width: 10;
+}
+
+.low-zoom path.shadow.tag-embankment,
+.low-zoom path.shadow.tag-cutting {
+    stroke-width: 14;
+}
+
+
+/* construction */
+
+path.stroke.tag-highway-construction,
+path.casing.tag-highway-construction {
+    stroke-linecap: butt;
+    stroke-dasharray: 7, 7;
+}
+
+.low-zoom path.stroke.tag-highway-construction,
+.low-zoom path.casing.tag-highway-construction {
+    stroke-linecap: butt;
+    stroke-dasharray: 5, 5;
+}
+
 text {
     font-size:10px;
     pointer-events: none;
@@ -994,6 +1044,23 @@ path.oneway {
     stroke-width: 6px;
 }
 
+/* Buildings */
+
+path.stroke.tag-building,
+path.stroke.tag-amenity-shelter {
+    stroke: rgb(224, 110, 95);
+}
+path.fill.tag-building,
+path.fill.tag-amenity-shelter {
+    fill: rgba(224, 110, 95, 0.3);
+}
+.preset-icon-fill-area.tag-building,
+.preset-icon-fill-area.tag-amenity-shelter {
+    border-color: rgb(224, 110, 95);
+    background-color: rgba(224, 110, 95, 0.3);
+}
+
+
 /*
  * Labels
  */
@@ -2158,37 +2225,26 @@ a:hover .icon.out-link   { background-position: -500px -14px;}
 
 /* Preset icon colors */
 
-.preset-icon-fill.icon-area {
+.preset-icon-fill-area {
     cursor: inherit;
-    height: 45px;
+    height: 39px;
-    width: 45px;
+    width: 39px;
     margin: auto;
     position: absolute;
-    left: 7px; top: 7px;
+    left: 10px;
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -240px -80px;
+    top: 10px;
 }
 
-.preset-icon-fill.tag-shop,
+.preset-icon-fill-area:after {
-.preset-icon-fill.tag-building {
+    content: '';
+    left: -4px;
+    top: -4px;
+    height: 45px;
+    width: 45px;
+    position: absolute;
     background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat 0 -80px;
 }
 
-.preset-icon-fill.tag-natural-water {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -60px -80px;
-}
-
-.preset-icon-fill.tag-landuse,
-.preset-icon-fill.tag-natural-wood,
-.preset-icon-fill.tag-natural-tree,
-.preset-icon-fill.tag-natural-grassland,
-.preset-icon-fill.tag-leisure-park {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -120px -80px;
-}
-
-.preset-icon-fill.tag-amenity-parking {
-    background:transparent url(<%= asset_path("iD/img/sprite.svg") %>) no-repeat -180px -80px;
-}
-
 /* preset form basics */
 
 .inspector-preset {
@@ -4253,6 +4309,10 @@ img.wiki-image {
 .feature-laundry{background-position:-108px -504px;}
 .feature-car{background-position:-162px -504px;}
 .feature-suitcase{background-position:-216px -504px;}
+.feature-hairdresser{background-position:-0px -528px;}
+.feature-chemist{background-position:-54px -528px;}
+.feature-mobilephone{background-position:-108px -528px;}
+.feature-scooter{background-position:-162px -528px;}
 .preset-icon-line.feature-highway-motorway{background-position:-20px -25px;}
 .preset-icon-line.feature-highway-trunk{background-position:-80px -25px;}
 .preset-icon-line.feature-highway-primary{background-position:-140px -25px;}

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

@@ -830,18 +830,12 @@
             "building/apartments": {
                 "name": "Woonstelle"
             },
-            "building/entrance": {
-                "name": "Ingang"
-            },
             "building/house": {
                 "name": "Huis"
             },
             "emergency/phone": {
                 "name": "Noodtelefoon"
             },
-            "entrance": {
-                "name": "Ingang"
-            },
             "highway": {
                 "name": "Snelweg"
             },

vendor/assets/iD/iD/locales/ar.json

@@ -1052,10 +1052,6 @@
                 "name": "مبني تجاري",
                 "terms": "مبنى تجاري"
             },
-            "building/entrance": {
-                "name": "مدخل",
-                "terms": "مدخل"
-            },
             "building/garage": {
                 "name": "جراج",
                 "terms": "مَرْأب , كراج, تصليح سيارات"
@@ -1088,10 +1084,6 @@
                 "name": "هاتف طوارئ",
                 "terms": "هاتف طوارئ"
             },
-            "entrance": {
-                "name": "مدخل",
-                "terms": "مدخل"
-            },
             "footway/crossing": {
                 "name": "تقاطع",
                 "terms": "تقاطع, معبر"

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

@@ -898,18 +898,12 @@
             "building/apartments": {
                 "name": "Жилищен блок"
             },
-            "building/entrance": {
-                "name": "Вход"
-            },
             "building/house": {
                 "name": "Къща"
             },
             "emergency/phone": {
                 "name": "Телефон за спешна помощ"
             },
-            "entrance": {
-                "name": "Вход"
-            },
             "highway": {
                 "name": "Път"
             },

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

@@ -809,9 +809,6 @@
             "building/commercial": {
                 "name": "বানিজ্যিক ভবন"
             },
-            "building/entrance": {
-                "name": "দ্বার"
-            },
             "building/garage": {
                 "name": "গ্যারেজ"
             },
@@ -830,9 +827,6 @@
             "emergency/phone": {
                 "name": "অাপদকালীন দুরভাষ"
             },
-            "entrance": {
-                "name": "প্রবেশপথ"
-            },
             "footway/crossing": {
                 "name": "ক্রসিং"
             },

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

@@ -1183,10 +1183,6 @@
                 "name": "Poslovna zgrada",
                 "terms": "poslovna zgrada,zgrada firme"
             },
-            "building/entrance": {
-                "name": "Ulaz",
-                "terms": "ulaz,vrata"
-            },
             "building/garage": {
                 "name": "Garaža",
                 "terms": "garaža"
@@ -1308,10 +1304,6 @@
                 "name": "Telefon za hitne slučajeve",
                 "terms": "telefon za hitne slučajeve,hitna telefonska linija"
             },
-            "entrance": {
-                "name": "Ulaz",
-                "terms": "ulaz,vrata"
-            },
             "footway/crossing": {
                 "name": "Prelaz",
                 "terms": "prelaz,pješački prelaz"

vendor/assets/iD/iD/locales/ca.json

@@ -610,6 +610,33 @@
             "fuel": {
                 "label": "Carburant"
             },
+            "fuel/biodiesel": {
+                "label": "Ven Biodièsel"
+            },
+            "fuel/diesel": {
+                "label": "Ven dièsel"
+            },
+            "fuel/e10": {
+                "label": "Ven E10"
+            },
+            "fuel/e85": {
+                "label": "Ven E85"
+            },
+            "fuel/lpg": {
+                "label": "Ven propà"
+            },
+            "fuel/octane_100": {
+                "label": "Ven benzina de competició"
+            },
+            "fuel/octane_91": {
+                "label": "Ven benzina regular"
+            },
+            "fuel/octane_95": {
+                "label": "Ven benzina de mig grau"
+            },
+            "fuel/octane_98": {
+                "label": "Ven benzina premium"
+            },
             "gauge": {
                 "label": "Ample"
             },
@@ -673,6 +700,9 @@
             "leisure": {
                 "label": "Tipus"
             },
+            "length": {
+                "label": "Llargada (metres)"
+            },
             "levels": {
                 "label": "Nivells",
                 "placeholder": "2, 4, 6..."
@@ -744,6 +774,9 @@
             "place": {
                 "label": "Tipus"
             },
+            "population": {
+                "label": "Població"
+            },
             "power": {
                 "label": "Tipus"
             },
@@ -807,6 +840,9 @@
             "shop": {
                 "label": "Tipus"
             },
+            "sloped_curb": {
+                "label": "Corba peraltada"
+            },
             "smoking": {
                 "label": "Apte per a fumadors"
             },
@@ -830,7 +866,8 @@
                     "bridge": "Pont",
                     "tunnel": "Túnel",
                     "embankment": "Terraplè ",
-                    "cutting": "Trinxera"
+                    "cutting": "Trinxera",
+                    "ford": "Ford"
                 }
             },
             "studio_type": {
@@ -842,6 +879,9 @@
             "surface": {
                 "label": "Superfície"
             },
+            "tactile_paving": {
+                "label": "Paviment rugós"
+            },
             "toilets/disposal": {
                 "label": "Contenidor"
             },
@@ -885,6 +925,9 @@
             "wheelchair": {
                 "label": "Accés per a cadires de rodes"
             },
+            "width": {
+                "label": "Amplada (metres)"
+            },
             "wikipedia": {
                 "label": "Viquipèdia"
             },
@@ -1016,6 +1059,9 @@
                 "name": "Rentat de cotxes",
                 "terms": "Servei de neteja de cotxes, Tren de rentat de cotxes, Estació d'autorentat de cotxes"
             },
+            "amenity/charging_station": {
+                "name": "Estació de càrrega"
+            },
             "amenity/childcare": {
                 "name": "Servei de guarderia",
                 "terms": "Servei de guarderia, Servei de cangur, Servei de cura de la infància"
@@ -1034,6 +1080,9 @@
                 "name": "Campus universitari",
                 "terms": "Col·legi, Campus universitàri, universitat, facultat"
             },
+            "amenity/compressed_air": {
+                "name": "Aire comprimit"
+            },
             "amenity/courthouse": {
                 "name": "Jutjat",
                 "terms": "Jutjats, Palau de justícia"
@@ -1073,7 +1122,8 @@
                 "terms": "Cementiri, Camp de tombes, necròpoli, ciutat dels difunts"
             },
             "amenity/hospital": {
-                "name": "Terrenys hospitalaris"
+                "name": "Terrenys hospitalaris",
+                "terms": "Hospital, centre hospitalari, policlínica, clínica. "
             },
             "amenity/kindergarten": {
                 "name": "Terrenys de Jardí d'infància"
@@ -1093,6 +1143,9 @@
                 "name": "Aparcament",
                 "terms": "Aparcament, Pàrquing, Garatge"
             },
+            "amenity/parking_entrance": {
+                "name": "Entrada de Garatge/Sortida"
+            },
             "amenity/pharmacy": {
                 "name": "Farmàcia",
                 "terms": "Farmàcia, establiment de venda de medicaments,"
@@ -1144,7 +1197,8 @@
                 "terms": "Restaurant, Lloc per menjar, Bistro, Wok, Trattoria, Pizzeria"
             },
             "amenity/school": {
-                "name": "Terrenys d'escola"
+                "name": "Terrenys d'escola",
+                "terms": "Escola, CEIP, IES, Col·legi, Institut, Centre educatiu, Guarderia"
             },
             "amenity/shelter": {
                 "name": "Refugi"
@@ -1316,8 +1370,7 @@
                 "name": "Edifici d'habitacions"
             },
             "building/entrance": {
-                "name": "Entrada",
+                "name": "Entrada/Sortida"
-                "terms": "Entrada, Porta, Portes, Portalada, Accés"
             },
             "building/garage": {
                 "name": "garatge "
@@ -1530,15 +1583,18 @@
                 "terms": "Telèfon d'emergències, SOS, S.O.S"
             },
             "entrance": {
-                "name": "Entrada",
+                "name": "Entrada/Sortida"
-                "terms": "Entrada, Porta, Portes, Portalada, Accés"
             },
             "footway/crossing": {
-                "name": "Cruïlla"
+                "name": "Pas de vianants",
+                "terms": "Travessera, Cruïlla, Pas de Vianants, Pas Zebra, Pas de peatons, pas de transeünts"
             },
             "footway/sidewalk": {
                 "name": "Vorera"
             },
+            "ford": {
+                "name": "Ford"
+            },
             "golf/bunker": {
                 "name": "Bunker"
             },
@@ -1567,20 +1623,23 @@
                 "name": "Via"
             },
             "highway/bridleway": {
-                "name": "Camí de ferradura"
+                "name": "Camí de ferradura",
+                "terms": "Camí de ferradura, cavall, camí eqüestre, via eqüestre, ferradura, via de ferradura"
             },
             "highway/bus_stop": {
                 "name": "Parada d'autobús",
                 "terms": "Parada de bus, Parada"
             },
             "highway/crossing": {
-                "name": "Cruïlla"
+                "name": "Pas de vianants",
+                "terms": "Travessera, Cruïlla, Pas de Vianants, Pas Zebra, Pas de peatons, pas de transeünts"
             },
             "highway/cycleway": {
                 "name": "Carril bici"
             },
             "highway/footway": {
-                "name": "Camí per a vianants"
+                "name": "Camí per a vianants",
+                "terms": "Camí per a vianants, carrer peatonal, camí per a peatons, a peu, camí per caminar, vianant, vianants, peató, peatons, transeünt, transeünts, peatonal"
             },
             "highway/living_street": {
                 "name": "Carrer residencial"
@@ -1596,7 +1655,8 @@
                 "name": "sortida d'autopista"
             },
             "highway/motorway_link": {
-                "name": "Enllaç d'autopista"
+                "name": "Enllaç d'autopista",
+                "terms": "Rampa, entrada, incorporació, baixada, addició, autopista, autovia, eix"
             },
             "highway/path": {
                 "name": "Camí"
@@ -1650,7 +1710,8 @@
                 "name": "Àrea de servei"
             },
             "highway/steps": {
-                "name": "Escales"
+                "name": "Escales",
+                "terms": "esgraons, graons, escalinata, escala, escalons"
             },
             "highway/stop": {
                 "name": "Senyal de stop"
@@ -1727,6 +1788,9 @@
                 "name": "Cementiri",
                 "terms": "Cementiri, Camp Sant"
             },
+            "landuse/churchyard": {
+                "name": "Terrenys d'església"
+            },
             "landuse/commercial": {
                 "name": "Zona comercial"
             },
@@ -1758,6 +1822,9 @@
             "landuse/meadow": {
                 "name": "Prat"
             },
+            "landuse/military": {
+                "name": "Militar"
+            },
             "landuse/orchard": {
                 "name": "Verger"
             },
@@ -1800,7 +1867,8 @@
                 "terms": "Port esportiu, Marina"
             },
             "leisure/park": {
-                "name": "Parc"
+                "name": "Parc",
+                "terms": "parc, àrea verda, àrea enjardinada, jardí, verger, gespa, arbres, flors"
             },
             "leisure/picnic_table": {
                 "name": "Taula de picnic"
@@ -1924,7 +1992,8 @@
                 "name": "Penya-segat"
             },
             "natural/coastline": {
-                "name": "Línia costanera"
+                "name": "Línia costanera",
+                "terms": "Línia costera, costa, litoral, línia de platja, costa, platja, mar"
             },
             "natural/fell": {
                 "name": "Prat d'alta muntanya"
@@ -1939,7 +2008,8 @@
                 "name": "Landa"
             },
             "natural/peak": {
-                "name": "Pic"
+                "name": "Pic",
+                "terms": "Pic, cim, cimadal, pollegó, agulla."
             },
             "natural/scree": {
                 "name": "Tartera"
@@ -1963,7 +2033,8 @@
                 "terms": "Llac, Estany"
             },
             "natural/water/pond": {
-                "name": "Estany"
+                "name": "Estany",
+                "terms": "estany, bassa, bassal, llac, reserva"
             },
             "natural/water/reservoir": {
                 "name": "Embassament"
@@ -2130,7 +2201,8 @@
                 "name": "Parada de Ferrocarril"
             },
             "railway/level_crossing": {
-                "name": "Pas a nivell"
+                "name": "Pas a nivell",
+                "terms": "Pas a nivell, Pas de ferrocarril, guardaagulles, pas de ferrocarril, barreres, semàfors, tren, cotxe"
             },
             "railway/monorail": {
                 "name": "Monocarril",
@@ -2157,7 +2229,8 @@
                 "terms": "Boca de metro, Entrada de metro"
             },
             "railway/tram": {
-                "name": "Tramvia "
+                "name": "Tramvia ",
+                "terms": "Tranvia, Tram"
             },
             "relation": {
                 "name": "Relació",
@@ -2364,6 +2437,9 @@
             "shop/video": {
                 "name": "Botiga de vídeos"
             },
+            "shop/wine": {
+                "name": "Botiga de vins"
+            },
             "tourism": {
                 "name": "Turisme"
             },
@@ -2386,7 +2462,8 @@
                 "name": "Xalet"
             },
             "tourism/guest_house": {
-                "name": "Habitacions de lloguer"
+                "name": "Habitacions de lloguer",
+                "terms": "Casa de convidats, convidats, hostes, invitats"
             },
             "tourism/hostel": {
                 "name": "Alberg",
@@ -2506,7 +2583,8 @@
                 "name": "Banc fluvial"
             },
             "waterway/stream": {
-                "name": "Rierol"
+                "name": "Rierol",
+                "terms": "Sèquia, rierol, fil d'aigua, rajolí, riuet, riachuelu, ramal, reguer, segla, canal, rec, regueró, sequiola, sequió, cavim."
             },
             "waterway/weir": {
                 "name": "Assut"

vendor/assets/iD/iD/locales/cs.json

@@ -1242,10 +1242,6 @@
                 "name": "Obchodní budova",
                 "terms": "obchody,firmy,firma,prodej,podnik,podniky,kanceláře"
             },
-            "building/entrance": {
-                "name": "Vchod",
-                "terms": "vchod"
-            },
             "building/garage": {
                 "name": "Garáž",
                 "terms": "garáž,garáže,parkování,kryté parkování"
@@ -1458,10 +1454,6 @@
                 "name": "Tísňový telefon",
                 "terms": "nouzový telefon,SOS,tísňová linka"
             },
-            "entrance": {
-                "name": "Vchod",
-                "terms": "vchod,východ,únikový východ,brána,dveře,vrata"
-            },
             "footway/crossing": {
                 "name": "Přechod pro chodce",
                 "terms": "přechod pro chodce,zebra,přechod,přechod pro pěší"

vendor/assets/iD/iD/locales/da.json

@@ -610,6 +610,33 @@
             "fuel": {
                 "label": "Brændstof"
             },
+            "fuel/biodiesel": {
+                "label": "Sælger biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Sælger diesel"
+            },
+            "fuel/e10": {
+                "label": "Sælger E10"
+            },
+            "fuel/e85": {
+                "label": "Sælger E85"
+            },
+            "fuel/lpg": {
+                "label": "Sælger gas"
+            },
+            "fuel/octane_100": {
+                "label": "Sælger høj oktan benzin"
+            },
+            "fuel/octane_91": {
+                "label": "Sælger almindelig benzin"
+            },
+            "fuel/octane_95": {
+                "label": "Sælger medium benzin"
+            },
+            "fuel/octane_98": {
+                "label": "Sælger premium benzin"
+            },
             "gauge": {
                 "label": "Sporvidde"
             },
@@ -673,6 +700,9 @@
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Længde(Meter)"
+            },
             "levels": {
                 "label": "Etager",
                 "placeholder": "2, 4, 6..."
@@ -744,6 +774,9 @@
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Befolkning"
+            },
             "power": {
                 "label": "Type"
             },
@@ -807,6 +840,9 @@
             "shop": {
                 "label": "Type"
             },
+            "sloped_curb": {
+                "label": "Sløfekurve"
+            },
             "smoking": {
                 "label": "Rygning"
             },
@@ -830,7 +866,8 @@
                     "bridge": "Bro",
                     "tunnel": "Tunnel",
                     "embankment": "Forhøjning til tog, vej",
-                    "cutting": "Forsænkning"
+                    "cutting": "Forsænkning",
+                    "ford": "Vadested"
                 }
             },
             "studio_type": {
@@ -842,6 +879,9 @@
             "surface": {
                 "label": "Overflade"
             },
+            "tactile_paving": {
+                "label": "Tactile Paving"
+            },
             "toilets/disposal": {
                 "label": "Bortskaffelse affald"
             },
@@ -885,6 +925,9 @@
             "wheelchair": {
                 "label": "Kørestolsadgang"
             },
+            "width": {
+                "label": "Bredde(Meter)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1029,6 +1072,10 @@
                 "name": "Bilvask",
                 "terms": "Bilvask, Automobilvask"
             },
+            "amenity/charging_station": {
+                "name": "Opladerstation",
+                "terms": "Opladerstation, elbilopladerstation"
+            },
             "amenity/childcare": {
                 "name": "Børnepasning",
                 "terms": "Børnehave, Børnepasning, Vuggestue, Dagpleje, Fritidshjem"
@@ -1049,6 +1096,10 @@
                 "name": "Gymnasie",
                 "terms": "Gymnasie, Handelsgymnasie"
             },
+            "amenity/compressed_air": {
+                "name": "Luftpumpe",
+                "terms": "Luftpumpe, Billuftpumpe"
+            },
             "amenity/courthouse": {
                 "name": "Domstolsbygning",
                 "terms": "Domstolsbygning, Domstol"
@@ -1113,6 +1164,10 @@
                 "name": "Bilparkering",
                 "terms": "Bilparkering"
             },
+            "amenity/parking_entrance": {
+                "name": "Parkeringsgarage Indgang/Udgang",
+                "terms": "Parkeringsgarage Indgang/Udgang, Parkeringskælder Indgang/Udgang"
+            },
             "amenity/pharmacy": {
                 "name": "Apotek",
                 "terms": "Apotek"
@@ -1358,8 +1413,8 @@
                 "terms": " Kollegie, Klubværelse, Kollegium"
             },
             "building/entrance": {
-                "name": "Indgang",
+                "name": "Indgang/Udgang",
-                "terms": "Indgang"
+                "terms": "Indgang/Udgang"
             },
             "building/garage": {
                 "name": "Garage",
@@ -1541,6 +1596,10 @@
                 "name": "Fotograf",
                 "terms": "Fotograf"
             },
+            "craft/photographic_laboratory": {
+                "name": "Fotolaboratorium",
+                "terms": "Fotolaboratorium, Fotoforhandler"
+            },
             "craft/plasterer": {
                 "name": "Oppudser",
                 "terms": "Oppudser"
@@ -1634,8 +1693,8 @@
                 "terms": "Nødtelefon, Nødopkaldstelefon"
             },
             "entrance": {
-                "name": "Indgang",
+                "name": "Indgang/Udgang",
-                "terms": "Indgang, Indgangsparti"
+                "terms": "Indgang/Udgang"
             },
             "footway/crossing": {
                 "name": "Kryds",
@@ -1645,6 +1704,10 @@
                 "name": "Fortov",
                 "terms": "Fortov"
             },
+            "ford": {
+                "name": "Vadested",
+                "terms": "Vadested"
+            },
             "golf/bunker": {
                 "name": "Sandbunker",
                 "terms": "Sandbunker"
@@ -1877,6 +1940,10 @@
                 "name": "Gravplads ",
                 "terms": "Gravplads "
             },
+            "landuse/churchyard": {
+                "name": "Kirkegård",
+                "terms": "Kirkegårde"
+            },
             "landuse/commercial": {
                 "name": "Kommercielt område",
                 "terms": "Kommercielt område"
@@ -1917,6 +1984,10 @@
                 "name": "Eng",
                 "terms": "Eng"
             },
+            "landuse/military": {
+                "name": "Militær",
+                "terms": "Militær"
+            },
             "landuse/orchard": {
                 "name": "Frugtplantage",
                 "terms": "Frugtplantage, Æbleplantage"
@@ -2625,6 +2696,10 @@
                 "name": "Fotoforretning",
                 "terms": "<Oversæt med synonymer eller relaterede termer for \"Fotoforretning\", adskilt af kommaer>"
             },
+            "shop/seafood": {
+                "name": "Fiskehandler",
+                "terms": "Fiskehandler, Fiskebutik"
+            },
             "shop/shoes": {
                 "name": "Skobutik",
                 "terms": "Skobutik, Skoforretning"
@@ -2665,6 +2740,10 @@
                 "name": "Videobutik",
                 "terms": "Videobutik, Videoforretning, Videoudlejning"
             },
+            "shop/wine": {
+                "name": "Vinforretning",
+                "terms": "Vinforretning, Vinbutik"
+            },
             "tourism": {
                 "name": "Turisme",
                 "terms": "Turisme"

vendor/assets/iD/iD/locales/de.json

@@ -267,6 +267,8 @@
         "percent_brightness": "{opacity}% Helligkeit",
         "none": "Kein Hintergrund",
         "custom": "Benutzerdefiniert",
+        "custom_button": "Benutzerdefinierten Hintergrund editieren",
+        "custom_prompt": "Gib ein tile URL template ein. Gültige Platzhalter sind {z}, {x}, {y} für das Z/X/Y Schema und {u} für das quadtile Schema.",
         "fix_misalignment": "Ausrichtung korrigieren",
         "reset": "Zurücksetzen"
     },
@@ -425,7 +427,7 @@
         },
         "fields": {
             "access": {
-                "label": "Zugangsbeschränkung",
+                "label": "Zugangsberechtigung",
                 "placeholder": "Unbekannt",
                 "types": {
                     "access": "Allgemein",
@@ -608,6 +610,33 @@
             "fuel": {
                 "label": "Treibstogg"
             },
+            "fuel/biodiesel": {
+                "label": "Verkauft Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Verkauft Diesel"
+            },
+            "fuel/e10": {
+                "label": "Verkauft E10"
+            },
+            "fuel/e85": {
+                "label": "Verkauft E85"
+            },
+            "fuel/lpg": {
+                "label": "Verkauft Propan"
+            },
+            "fuel/octane_100": {
+                "label": "Verkauft Rennkraftstoffe"
+            },
+            "fuel/octane_91": {
+                "label": "Verkauft Kraftstoffe"
+            },
+            "fuel/octane_95": {
+                "label": "Verkauft Mittelklassekraftstoffe"
+            },
+            "fuel/octane_98": {
+                "label": "Verkauft Premiumkraftstoffe"
+            },
             "gauge": {
                 "label": "Spurbreite"
             },
@@ -671,6 +700,9 @@
             "leisure": {
                 "label": "Art"
             },
+            "length": {
+                "label": "Länge (Meter)"
+            },
             "levels": {
                 "label": "Etagen",
                 "placeholder": "2, 4, 6..."
@@ -742,6 +774,9 @@
             "place": {
                 "label": "Art"
             },
+            "population": {
+                "label": "Bevölkerung"
+            },
             "power": {
                 "label": "Typ"
             },
@@ -805,6 +840,9 @@
             "shop": {
                 "label": "Typ"
             },
+            "sloped_curb": {
+                "label": "abgeschrägter Bordstein"
+            },
             "smoking": {
                 "label": "Rauchen"
             },
@@ -828,7 +866,8 @@
                     "bridge": "Brücke",
                     "tunnel": "Tunnel",
                     "embankment": "Fahrdamm",
-                    "cutting": "Senke"
+                    "cutting": "Senke",
+                    "ford": "Furt"
                 }
             },
             "studio_type": {
@@ -840,8 +879,11 @@
             "surface": {
                 "label": "Oberfläche"
             },
+            "tactile_paving": {
+                "label": "taktile Oberfläche"
+            },
             "toilets/disposal": {
-                "label": "Abfallkübel, Mistkübel"
+                "label": "Toiletten-Bauart"
             },
             "tourism": {
                 "label": "Typ"
@@ -883,6 +925,9 @@
             "wheelchair": {
                 "label": "Rollstuhlzugang"
             },
+            "width": {
+                "label": "Breite (Meter)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1027,6 +1072,10 @@
                 "name": "Autowäsche",
                 "terms": "Auto-Waschanlage, Waschanlage"
             },
+            "amenity/charging_station": {
+                "name": "Ladestation",
+                "terms": "Ladestation"
+            },
             "amenity/childcare": {
                 "name": "Kindertagesbetreuung",
                 "terms": "Hort"
@@ -1047,6 +1096,10 @@
                 "name": "Hochschule",
                 "terms": "Hochschule, Kolleg"
             },
+            "amenity/compressed_air": {
+                "name": "Druckluft",
+                "terms": "Druckluft, Pressluft"
+            },
             "amenity/courthouse": {
                 "name": "Gericht",
                 "terms": "Gericht, Amtsgericht"
@@ -1111,6 +1164,10 @@
                 "name": "Autoparkplatz",
                 "terms": "Autoparkplatz, Parkplatz, Parkhaus, Garage, Parkgarage"
             },
+            "amenity/parking_entrance": {
+                "name": "Garageneinfahrt/-ausfahrt",
+                "terms": "Parkgaragen-Einfahrt/Ausfahrt, Garageneinfahrt/-ausfahrt, Garagenzufahrt/-abfahrt"
+            },
             "amenity/pharmacy": {
                 "name": "Apotheke",
                 "terms": "Apotheke"
@@ -1356,8 +1413,8 @@
                 "terms": "Schlafsaal, Dormitorium"
             },
             "building/entrance": {
-                "name": "Eingang",
+                "name": "Eingang/Ausgang",
-                "terms": "Eingang"
+                "terms": "Eingang/Ausgang, Zugang/Abgang, Einfahrt/Ausfahrt, Eintritt/Austritt"
             },
             "building/garage": {
                 "name": "Garage",
@@ -1539,6 +1596,10 @@
                 "name": "Fotograf",
                 "terms": "Fotograf, Fotostudio, Fotoatelier"
             },
+            "craft/photographic_laboratory": {
+                "name": "Fotolabor",
+                "terms": "Fotolabor, fotografisches Labor"
+            },
             "craft/plasterer": {
                 "name": "Stuckateur",
                 "terms": "Stuckateur, Kaschierer, Gipser, Verputzer"
@@ -1632,8 +1693,8 @@
                 "terms": "Notruf-Telefon, Notrufsäule, Notfallsäule"
             },
             "entrance": {
-                "name": "Eingang",
+                "name": "Eingang/Ausgang",
-                "terms": "Eingang"
+                "terms": "Eingang/Ausgang, Zugang/Abgang, Einfahrt/Ausfahrt, Eintritt/Austritt"
             },
             "footway/crossing": {
                 "name": "Fussgängerüberweg",
@@ -1643,6 +1704,10 @@
                 "name": "Bürgersteig",
                 "terms": "Gehsteig, Fußgängerweg, Gehweg, Fußweg, Gangsteig, Trottoir"
             },
+            "ford": {
+                "name": "Furt",
+                "terms": "Furt"
+            },
             "golf/bunker": {
                 "name": "Bunker (Golf)",
                 "terms": "Bunker, Sandbunker, Sand-Hindernis, Golfbunker"
@@ -1801,7 +1866,7 @@
             },
             "highway/track": {
                 "name": "Feld-/Waldweg",
-                "terms": "Spur, Fährte, Strecke, Weg"
+                "terms": "Forstweg,Wirtschaftsweg,Wiesenweg,Feldweg,Waldweg"
             },
             "highway/traffic_signals": {
                 "name": "Ampeln",
@@ -1853,7 +1918,7 @@
             },
             "historic/wayside_cross": {
                 "name": "Wegkreuz",
-                "terms": "Wegkreuz"
+                "terms": "Wegkreuz,Wegekreuz,Flurkreuz"
             },
             "historic/wayside_shrine": {
                 "name": "Bildstock",
@@ -1875,6 +1940,10 @@
                 "name": "Friedhof",
                 "terms": "Friedhof, Friedwald"
             },
+            "landuse/churchyard": {
+                "name": "Kirchhof",
+                "terms": "Kirchhof, Friedhof, Gottesacker, Leichenhof"
+            },
             "landuse/commercial": {
                 "name": "Gewerbegebiet",
                 "terms": "Gewerbezone,Gewerbegebiet,gewerblich genutzte Gebäude,Business Park,Büros"
@@ -1915,6 +1984,10 @@
                 "name": "Weide",
                 "terms": "Wiese, Weide"
             },
+            "landuse/military": {
+                "name": "Militär",
+                "terms": "Militär, Armee, Landesverteidigung"
+            },
             "landuse/orchard": {
                 "name": "Obstplantage",
                 "terms": "Obstplantage, Streuobstwiese"
@@ -2623,6 +2696,10 @@
                 "name": "Fotofachgeschäft",
                 "terms": "Fotoladen, Fotograf, Fotogeschäft"
             },
+            "shop/seafood": {
+                "name": "Fischgeschäft",
+                "terms": "Fischgeschäft, Meeresfrüchtegeschäft"
+            },
             "shop/shoes": {
                 "name": "Schuhgeschäft",
                 "terms": "Schuhgeschäft"
@@ -2663,6 +2740,10 @@
                 "name": "Videothek",
                 "terms": "Video-Geschäft, DVD-Geschäft"
             },
+            "shop/wine": {
+                "name": "Vinothek",
+                "terms": "Weinladen, Weinhandlung, Weinhaus, Enothek"
+            },
             "tourism": {
                 "name": "Tourismus",
                 "terms": "Fremdenverkehr, Tourimus"

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

@@ -1028,10 +1028,6 @@
                 "name": "Εμπορικό Κτίριο",
                 "terms": "Εμπορικό Κτήριο, Επαγγελματικό κτήριο"
             },
-            "building/entrance": {
-                "name": "Είσοδος",
-                "terms": "Είσοδος"
-            },
             "building/garage": {
                 "name": "Εργαστήριο",
                 "terms": "Γκαράζ"
@@ -1099,10 +1095,6 @@
                 "name": "Τηλέφωνο Ανάγκης",
                 "terms": "Τηλέφωνο επειγόντων, Τηλέφωνο ανάγκης"
             },
-            "entrance": {
-                "name": "Είσοδος",
-                "terms": "Είσοδος"
-            },
             "highway": {
                 "name": "Αυτοκινητόδρομος",
                 "terms": "Οδική αρτηρία, Αυτοκινητόδρομος"

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

@@ -614,6 +614,33 @@
             "fuel": {
                 "label": "Fuel"
             },
+            "fuel/biodiesel": {
+                "label": "Sells Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Sells Diesel"
+            },
+            "fuel/e10": {
+                "label": "Sells E10"
+            },
+            "fuel/e85": {
+                "label": "Sells E85"
+            },
+            "fuel/lpg": {
+                "label": "Sells Propane"
+            },
+            "fuel/octane_100": {
+                "label": "Sells Racing Gasoline"
+            },
+            "fuel/octane_91": {
+                "label": "Sells Regular Gasoline"
+            },
+            "fuel/octane_95": {
+                "label": "Sells Midgrade Gasoline"
+            },
+            "fuel/octane_98": {
+                "label": "Sells Premium Gasoline"
+            },
             "gauge": {
                 "label": "Gauge"
             },
@@ -679,6 +706,9 @@
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Length (Meters)"
+            },
             "levels": {
                 "label": "Levels",
                 "placeholder": "2, 4, 6..."
@@ -750,6 +780,9 @@
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Population"
+            },
             "power": {
                 "label": "Type"
             },
@@ -813,6 +846,9 @@
             "shop": {
                 "label": "Type"
             },
+            "sloped_curb": {
+                "label": "Sloped Curb"
+            },
             "smoking": {
                 "label": "Smoking"
             },
@@ -836,7 +872,8 @@
                     "bridge": "Bridge",
                     "tunnel": "Tunnel",
                     "embankment": "Embankment",
-                    "cutting": "Cutting"
+                    "cutting": "Cutting",
+                    "ford": "Ford"
                 }
             },
             "studio_type": {
@@ -848,6 +885,9 @@
             "surface": {
                 "label": "Surface"
             },
+            "tactile_paving": {
+                "label": "Tactile Paving"
+            },
             "toilets/disposal": {
                 "label": "Disposal"
             },
@@ -891,6 +931,9 @@
             "wheelchair": {
                 "label": "Wheelchair Access"
             },
+            "width": {
+                "label": "Width (Meters)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1035,6 +1078,10 @@
                 "name": "Car Wash",
                 "terms": ""
             },
+            "amenity/charging_station": {
+                "name": "Charging Station",
+                "terms": "EV,Electric Vehicle,Supercharger"
+            },
             "amenity/childcare": {
                 "name": "Childcare",
                 "terms": "nursery,orphanage,playgroup"
@@ -1055,6 +1102,10 @@
                 "name": "College",
                 "terms": ""
             },
+            "amenity/compressed_air": {
+                "name": "Compressed Air",
+                "terms": ""
+            },
             "amenity/courthouse": {
                 "name": "Courthouse",
                 "terms": ""
@@ -1119,6 +1170,10 @@
                 "name": "Car Parking",
                 "terms": ""
             },
+            "amenity/parking_entrance": {
+                "name": "Parking Garage Entrance/Exit",
+                "terms": ""
+            },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
                 "terms": ""
@@ -1364,7 +1419,7 @@
                 "terms": ""
             },
             "building/entrance": {
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "terms": ""
             },
             "building/garage": {
@@ -1644,7 +1699,7 @@
                 "terms": ""
             },
             "entrance": {
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "terms": ""
             },
             "footway/crossing": {
@@ -1655,6 +1710,10 @@
                 "name": "Sidewalk",
                 "terms": ""
             },
+            "ford": {
+                "name": "Ford",
+                "terms": ""
+            },
             "golf/bunker": {
                 "name": "Sand Trap",
                 "terms": "hazard,bunker"
@@ -1887,6 +1946,10 @@
                 "name": "Cemetery",
                 "terms": ""
             },
+            "landuse/churchyard": {
+                "name": "Churchyard",
+                "terms": ""
+            },
             "landuse/commercial": {
                 "name": "Commercial",
                 "terms": ""
@@ -1927,6 +1990,10 @@
                 "name": "Meadow",
                 "terms": ""
             },
+            "landuse/military": {
+                "name": "Military",
+                "terms": ""
+            },
             "landuse/orchard": {
                 "name": "Orchard",
                 "terms": ""
@@ -2679,6 +2746,10 @@
                 "name": "Video Store",
                 "terms": ""
             },
+            "shop/wine": {
+                "name": "Wine Shop",
+                "terms": "winery"
+            },
             "tourism": {
                 "name": "Tourism",
                 "terms": ""

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

@@ -71,7 +71,8 @@
                 "line": "Redondear línea.",
                 "area": "Redondear área."
             },
-            "not_closed": "Esto no se puede redondear porque no es un bucle."
+            "not_closed": "Esto no se puede redondear porque no es un bucle.",
+            "too_large": "Esto no se puede redondear porque no está completamente visible."
         },
         "orthogonalize": {
             "title": "Escuadrar",
@@ -84,13 +85,14 @@
                 "line": "Escuadra las esquinas de una línea.",
                 "area": "Escuadra las esquinas de un área."
             },
-            "not_squarish": "Esto no puede escuadrarse porque no es cuadrado."
+            "not_squarish": "Esto no puede escuadrarse porque no es cuadrado.",
+            "too_large": "Esto no puede escuadrarse porque no está completamente visible."
         },
         "straighten": {
             "title": "Enderezado",
             "description": "Enderezar esta línea",
             "key": "S",
-            "annotation": "Enderezar una línea.",
+            "annotation": "Línea enderezada.",
             "too_bendy": "Esto no puede ser enderezado porque es demasiado sinuoso."
         },
         "delete": {
@@ -222,7 +224,7 @@
     },
     "contributors": {
         "list": "Ediciones de {users}",
-        "truncated_list": "Ediciones de {users} y {count} otros"
+        "truncated_list": "Ediciones de {users} y {count} más"
     },
     "geocoder": {
         "search": "Buscar mundialmente…",
@@ -265,6 +267,8 @@
         "percent_brightness": "{opacity}% brillo",
         "none": "Ninguno",
         "custom": "Personalizado",
+        "custom_button": "Editar fondo personalizado",
+        "custom_prompt": "Introduzca la URL de una plantilla de teselas. Los símbolos válidos son {z}, {x}, {y} para el esquema Z/X/Y y {u} para el esquema quadtile.",
         "fix_misalignment": "Corregir la alineación",
         "reset": "reiniciar"
     },
@@ -582,7 +586,7 @@
                 "label": "Electrificación"
             },
             "elevation": {
-                "label": "Altura"
+                "label": "Altitud"
             },
             "emergency": {
                 "label": "Emergencia"
@@ -606,6 +610,21 @@
             "fuel": {
                 "label": "Combustible"
             },
+            "fuel/biodiesel": {
+                "label": "Venta de biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Venta de diesel"
+            },
+            "fuel/e10": {
+                "label": "Venta de E10"
+            },
+            "fuel/e85": {
+                "label": "Venta de E85"
+            },
+            "fuel/lpg": {
+                "label": "Venta de propano"
+            },
             "gauge": {
                 "label": "Gálibo"
             },
@@ -633,6 +652,7 @@
                 "label": "Tipo"
             },
             "hoops": {
+                "label": "Aros",
                 "placeholder": "1, 2, 4..."
             },
             "iata": {
@@ -668,6 +688,9 @@
             "leisure": {
                 "label": "Tipo"
             },
+            "length": {
+                "label": "Longitud (Metros)"
+            },
             "levels": {
                 "label": "Niveles",
                 "placeholder": "2, 4, 6..."
@@ -739,6 +762,9 @@
             "place": {
                 "label": "Tipo"
             },
+            "population": {
+                "label": "Población"
+            },
             "power": {
                 "label": "Tipo"
             },
@@ -802,6 +828,9 @@
             "shop": {
                 "label": "Tipo"
             },
+            "smoking": {
+                "label": "Fumar"
+            },
             "social_facility_for": {
                 "label": "Personas atendidas",
                 "placeholder": "Personas sin hogar, discapacitados, niños, etc"
@@ -834,6 +863,9 @@
             "surface": {
                 "label": "Superficie"
             },
+            "tactile_paving": {
+                "label": "Pavimento táctil"
+            },
             "toilets/disposal": {
                 "label": "Disponible"
             },
@@ -877,6 +909,9 @@
             "wheelchair": {
                 "label": "Acceso en silla de ruedas"
             },
+            "width": {
+                "label": "Anchura (Metros)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -906,7 +941,8 @@
                 "terms": "Telecabina"
             },
             "aerialway/magic_carpet": {
-                "name": "Ascensor de alfombra mágica"
+                "name": "Ascensor de alfombra mágica",
+                "terms": "Cinta transportadora de esquí"
             },
             "aerialway/platter": {
                 "name": "Ascensor de plato"
@@ -989,7 +1025,7 @@
                 "terms": "asiento público,banco,banquillo,banqueta"
             },
             "amenity/bicycle_parking": {
-                "name": "Aparcamiento de bibicletas",
+                "name": "Aparcamiento de bicicletas",
                 "terms": "bicicleta, bici, aparcamiento, parking, estacionamiento"
             },
             "amenity/bicycle_rental": {
@@ -1015,6 +1051,9 @@
                 "name": "Lavado de automóviles",
                 "terms": "lavadero,lavado de coches"
             },
+            "amenity/charging_station": {
+                "name": "Estación de carga"
+            },
             "amenity/childcare": {
                 "name": "Cuidado de niños",
                 "terms": "canguro,cuidadora"
@@ -1034,6 +1073,9 @@
                 "name": "Instituto",
                 "terms": "facultad,universidad,escuela profesional, instituto"
             },
+            "amenity/compressed_air": {
+                "name": "Aire comprimido"
+            },
             "amenity/courthouse": {
                 "name": "Palacio de justicia",
                 "terms": "tribunal, magistratura, judicatura, audiencia,justicia"
@@ -1075,7 +1117,8 @@
                 "terms": "cementerio,camposanto, necrópolis, sacramental"
             },
             "amenity/hospital": {
-                "name": "Terrenos de hospital"
+                "name": "Hospital",
+                "terms": "Recinto hospitalario"
             },
             "amenity/kindergarten": {
                 "name": "Jardín de infancia",
@@ -1141,24 +1184,28 @@
                 "name": "Puesto de guardaparques"
             },
             "amenity/recycling": {
-                "name": "Reciclaje"
+                "name": "Reciclaje",
+                "terms": "Reciclaje"
             },
             "amenity/restaurant": {
                 "name": "Restaurante",
                 "terms": "restaurante,restorán, comedor, ambigú, bufé, mesón, taberna"
             },
             "amenity/school": {
-                "name": "Terrenos de escuelas"
+                "name": "Escuela",
+                "terms": "Recinto escolar"
             },
             "amenity/shelter": {
                 "name": "Refugio",
                 "terms": "albergue, abrigo, amparo, asilo, cobertizo, garita, refugio"
             },
             "amenity/social_facility": {
-                "name": "Instalación social"
+                "name": "Instalación social",
+                "terms": "Servicios sociales, Asistencia social, "
             },
             "amenity/social_facility/food_bank": {
-                "name": "Banco de alimentos"
+                "name": "Banco de alimentos",
+                "terms": "Banco de alimentos"
             },
             "amenity/social_facility/group_home": {
                 "name": "Grupo residencial"
@@ -1199,7 +1246,8 @@
                 "terms": "universidad,facultad, escuela, seminario, colegio, cátedra, claustro, paraninfo,"
             },
             "amenity/vending_machine": {
-                "name": "Máquina expendedora"
+                "name": "Máquina expendedora",
+                "terms": "máquina expendedora, máquina autoventa, vending"
             },
             "amenity/veterinary": {
                 "name": "Veterinario",
@@ -1227,7 +1275,7 @@
             },
             "barrier/cattle_grid": {
                 "name": "Rejilla de retención",
-                "terms": "Paso con rejas para animales"
+                "terms": "Paso con rejas para animales, paso canadiense, barrera canadiense, guardaganados"
             },
             "barrier/city_wall": {
                 "name": "Muralla de ciudad",
@@ -1262,7 +1310,7 @@
                 "terms": "Puerta de seguridad para ganado"
             },
             "barrier/lift_gate": {
-                "name": "Puerta levadiza",
+                "name": "Barrera levadiza",
                 "terms": "Barrera elevada"
             },
             "barrier/retaining_wall": {
@@ -1294,7 +1342,7 @@
                 "terms": "apartamento, piso, vivienda, alojamiento, buhardilla, estudio, edificio"
             },
             "building/barn": {
-                "name": "Granero, hórreo, silo, depósito de cereal, troj",
+                "name": "Granero",
                 "terms": "Granero, hórreo, silo, depósito de cereal, troj"
             },
             "building/bunker": {
@@ -1302,14 +1350,16 @@
                 "terms": "Fortaleza"
             },
             "building/cabin": {
-                "name": "Cabina"
+                "name": "Cabina",
+                "terms": "Cabina"
             },
             "building/cathedral": {
                 "name": "Catedral",
                 "terms": "Iglesia, Lugar de culto, templo, basílica, parroquia, santuario, oratorio, iglesia, basílica"
             },
             "building/chapel": {
-                "name": "Capilla"
+                "name": "Capilla",
+                "terms": "Capilla"
             },
             "building/church": {
                 "name": "Iglesia",
@@ -1321,7 +1371,7 @@
             },
             "building/construction": {
                 "name": "Edificio en construcción",
-                "terms": "Edificio en construcción"
+                "terms": "Edificio en construcción, edificio en obras"
             },
             "building/detached": {
                 "name": "Casa unifamiliar",
@@ -1330,10 +1380,6 @@
             "building/dormitory": {
                 "name": "Dormitorio"
             },
-            "building/entrance": {
-                "name": "Entrada",
-                "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, embocadura, agujero, hueco"
-            },
             "building/garage": {
                 "name": "Garaje",
                 "terms": "garaje,cochera"
@@ -1343,14 +1389,16 @@
                 "terms": "garajes, cocheras"
             },
             "building/greenhouse": {
-                "name": "Invernadero"
+                "name": "Invernadero",
+                "terms": "Invernadero, Invernáculo"
             },
             "building/hospital": {
                 "name": "Edificio de hospital",
                 "terms": "Hospital, sanatorio, Centro de primeros auxilios"
             },
             "building/hotel": {
-                "name": "Edificio de hotel"
+                "name": "Edificio de hotel",
+                "terms": "Edificio hotelero"
             },
             "building/house": {
                 "name": "Casa",
@@ -1365,7 +1413,8 @@
                 "terms": "fábrica,factoría, industria, manufactura, taller, empresa, explotación"
             },
             "building/public": {
-                "name": "Edificio público"
+                "name": "Edificio público",
+                "terms": "Edificio público"
             },
             "building/residential": {
                 "name": "Edificio residencial",
@@ -1375,14 +1424,16 @@
                 "name": "Edificio de ventas al por menor"
             },
             "building/roof": {
-                "name": "Tejado"
+                "name": "Tejado",
+                "terms": "Tejado, Techumbre"
             },
             "building/school": {
                 "name": "Edificio escolar",
                 "terms": "Edificio colegio"
             },
             "building/shed": {
-                "name": "Cobertizo"
+                "name": "Cobertizo",
+                "terms": "cobertizo, establo, tinglado, barraca"
             },
             "building/stable": {
                 "name": "Establo de caballos",
@@ -1399,20 +1450,23 @@
                 "terms": "parada, alto, detención, apeadero, terminal, tren, ferrocarril"
             },
             "building/university": {
-                "name": "Edificio universitario"
+                "name": "Edificio universitario",
+                "terms": "Universidad, Facultad, Escuela universitaria"
             },
             "building/warehouse": {
                 "name": "Almacén",
                 "terms": "almacén, depósito, bodega, lonja, nave"
             },
             "craft/basket_maker": {
-                "name": "Fabricante de cestas"
+                "name": "Fabricante de cestas",
+                "terms": "cestero, cesta, cestería, canastero, canasto, mimbrero, mimbre"
             },
             "craft/beekeeper": {
                 "name": "Apicultor"
             },
             "craft/blacksmith": {
-                "name": "Herrero"
+                "name": "Herrero",
+                "terms": "herrero, herrería, herrajes, hierro, forja"
             },
             "craft/boatbuilder": {
                 "name": "Constructor de barco"
@@ -1434,7 +1488,8 @@
                 "name": "Proveedor"
             },
             "craft/clockmaker": {
-                "name": "Relojero"
+                "name": "Relojero",
+                "terms": "relojero, joyero, reloj"
             },
             "craft/confectionary": {
                 "name": "Golosinas",
@@ -1448,7 +1503,8 @@
                 "terms": "electricista, iluminista, trabajo de electricista"
             },
             "craft/gardener": {
-                "name": "Jardinero"
+                "name": "Jardinero",
+                "terms": "Jardinero,  Jardinería"
             },
             "craft/glaziery": {
                 "name": "Vidriería"
@@ -1474,25 +1530,32 @@
                 "terms": "Cerrajero, cerraduras"
             },
             "craft/metal_construction": {
-                "name": "Construcción metálica"
+                "name": "Construcción metálica",
+                "terms": "Metalúrgica, Taller metálico, Construcciones de metal, Calderería"
             },
             "craft/optician": {
                 "name": "Óptico",
                 "terms": "óptico, óptica, gafas"
             },
             "craft/painter": {
-                "name": "Pintor"
+                "name": "Pintor",
+                "terms": "Pintor"
             },
             "craft/photographer": {
                 "name": "Fotógrafo",
                 "terms": "fotógrafo, retratista"
             },
+            "craft/photographic_laboratory": {
+                "name": "Laboratorio Fotográfico",
+                "terms": "Laboratorio fotográfico"
+            },
             "craft/plasterer": {
                 "name": "Yesero",
                 "terms": "yeso, albañil, obra"
             },
             "craft/plumber": {
-                "name": "Fontanero"
+                "name": "Fontanero",
+                "terms": "Fontanero, Fontanería"
             },
             "craft/pottery": {
                 "name": "Cerámica",
@@ -1513,7 +1576,8 @@
                 "terms": "Fabricante de velas"
             },
             "craft/sawmill": {
-                "name": "Aserradero"
+                "name": "Aserradero",
+                "terms": "Aserradero"
             },
             "craft/scaffolder": {
                 "name": "Andamista"
@@ -1527,25 +1591,31 @@
                 "terms": "zapatero, remendón"
             },
             "craft/stonemason": {
-                "name": "Albañil"
+                "name": "Albañil",
+                "terms": "Albañil, Cantero, Enconfrador"
             },
             "craft/sweep": {
-                "name": "Deshollinador"
+                "name": "Deshollinador",
+                "terms": "Deshollinador, Limpiachimeneas"
             },
             "craft/tailor": {
-                "name": "Sastre"
+                "name": "Sastre",
+                "terms": "Sastre, Satrería"
             },
             "craft/tiler": {
                 "name": "Solador"
             },
             "craft/tinsmith": {
-                "name": "Hojalatero"
+                "name": "Hojalatero",
+                "terms": "Hojalatero, Soldador"
             },
             "craft/upholsterer": {
-                "name": "Tapicero"
+                "name": "Tapicero",
+                "terms": "Tapicero"
             },
             "craft/watchmaker": {
-                "name": "Relojero"
+                "name": "Relojero",
+                "terms": "Relojero"
             },
             "craft/window_construction": {
                 "name": "Construcción de ventanas"
@@ -1554,7 +1624,8 @@
                 "name": "Terraplén"
             },
             "emergency/ambulance_station": {
-                "name": "Estación de ambulancias"
+                "name": "Estación de ambulancias",
+                "terms": "Estación de ambulancia"
             },
             "emergency/fire_hydrant": {
                 "name": "Boca de incendio",
@@ -1562,15 +1633,11 @@
             },
             "emergency/phone": {
                 "name": "Teléfono de emergencias",
-                "terms": "Teléfono de emergencia"
+                "terms": "Teléfono de emergencia, SOS"
-            },
-            "entrance": {
-                "name": "Entrada",
-                "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, entrada, portilla"
             },
             "footway/crossing": {
                 "name": "Cruce peatonal",
-                "terms": "cruce, travesía, paso, cruzamiento, pasaje, vado, paseo, traviesa, paso de peatones"
+                "terms": "cruce, travesía, paso, cruzamiento, pasaje, vado, paseo, traviesa, paso de peatones, paso de cebra"
             },
             "footway/sidewalk": {
                 "name": "Acera",
@@ -1586,7 +1653,8 @@
                 "name": "Putting Green"
             },
             "golf/hole": {
-                "name": "Hoyo de golf"
+                "name": "Hoyo de golf",
+                "terms": "Hoyo de golf"
             },
             "golf/lateral_water_hazard": {
                 "name": "Obstáculo de agua lateral"
@@ -1618,10 +1686,10 @@
             },
             "highway/cycleway": {
                 "name": "Sendero ciclista",
-                "terms": "Camino para bicicletas"
+                "terms": "Camino para bicicletas, senda ciclable, sendero ciclista, carril bici"
             },
             "highway/footway": {
-                "name": "Sendero peatonal",
+                "name": "Vía urbana peatonal",
                 "terms": "Camino peatonal"
             },
             "highway/living_street": {
@@ -1649,7 +1717,7 @@
                 "terms": "vereda, sendero, camino, vía, calzada, ramal, trocha, atajo, travesía, huella, rastro"
             },
             "highway/pedestrian": {
-                "name": "Vía peatonal",
+                "name": "Calle peatonal",
                 "terms": "Peatonal, plaza, calle"
             },
             "highway/primary": {
@@ -1702,7 +1770,7 @@
             },
             "highway/service/parking_aisle": {
                 "name": "Pasillo de aparcamiento",
-                "terms": "aparcamiento, parking"
+                "terms": "aparcamiento, parking, pasillo, estacionamiento"
             },
             "highway/services": {
                 "name": "Área de servicio",
@@ -1717,11 +1785,11 @@
                 "terms": "señal de detención, señal de parada, señal, stop, detención, parada"
             },
             "highway/tertiary": {
-                "name": "Carretera ternaria",
+                "name": "Carretera terciaria",
                 "terms": "calle, ronda, carril, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, vía, local, terciaria"
             },
             "highway/tertiary_link": {
-                "name": "Enlace a carretera ternaria",
+                "name": "Enlace a carretera terciaria",
                 "terms": "enlace, unión, cruce, calle, ronda, carril, ruta, arteria, rúa, trayecto, avenida, carretera, paseo, camino, vía, local, terciaria"
             },
             "highway/track": {
@@ -1734,7 +1802,7 @@
             },
             "highway/trunk": {
                 "name": "Carretera troncal",
-                "terms": "Carretera principal"
+                "terms": "Carretera principal, nacional"
             },
             "highway/trunk_link": {
                 "name": "Enlace a carretera troncal",
@@ -1766,7 +1834,7 @@
             },
             "historic/memorial": {
                 "name": "Monumento",
-                "terms": "memorial, monolito, obelisco, pirámide, estatua, túmulo, panteón, mausoleo, menhir, dolmen"
+                "terms": "memorial, monolito, obelisco, pirámide, estatua, túmulo, panteón, mausoleo, menhir, dolmen, escultura, busto"
             },
             "historic/monument": {
                 "name": "Monumento",
@@ -1800,24 +1868,27 @@
                 "name": "Cementerio",
                 "terms": "cementerio, camposanto, necrópolis, sacramental"
             },
+            "landuse/churchyard": {
+                "name": "Camposanto"
+            },
             "landuse/commercial": {
                 "name": "Comercial",
-                "terms": "Comercial"
+                "terms": "Comercial, tiendas, compras"
             },
             "landuse/construction": {
                 "name": "Construcción",
-                "terms": "Construcción"
+                "terms": "Construcción, obras"
             },
             "landuse/farm": {
-                "name": "Granja",
+                "name": "Tierras de cultivo",
-                "terms": "Granja"
+                "terms": "Granja, cultivo, finca, campo"
             },
             "landuse/farmland": {
                 "name": "Tierra de labranza",
                 "terms": "granja, tierra de cultivo"
             },
             "landuse/farmyard": {
-                "name": "Tierras de cultivo",
+                "name": "Granja",
                 "terms": "Edificios de la granja"
             },
             "landuse/forest": {
@@ -1830,12 +1901,19 @@
             },
             "landuse/industrial": {
                 "name": "Industrial",
-                "terms": "Industrial"
+                "terms": "Industrial, polígono"
+            },
+            "landuse/landfill": {
+                "name": "Vertedero"
             },
             "landuse/meadow": {
                 "name": "Prado",
                 "terms": "prado, pradera, campo, mies, braniza, braña"
             },
+            "landuse/military": {
+                "name": "Militar",
+                "terms": "militar, ejercito, fuerzas armadas, defensa, cuartel, milicia"
+            },
             "landuse/orchard": {
                 "name": "Huerta",
                 "terms": "herbazal, pradera, pradería, prado, pasto, majada, monte, dehesa, huerta, riego, sembrado"
@@ -1845,8 +1923,8 @@
                 "terms": "cantera"
             },
             "landuse/residential": {
-                "name": "Urbano",
+                "name": "Suelo Urbano residencial",
-                "terms": "zona, residencial, urbano"
+                "terms": "zona, residencial, urbano, suelo"
             },
             "landuse/retail": {
                 "name": "Venta al por menor",
@@ -1867,6 +1945,9 @@
                 "name": "Parque canino",
                 "terms": "perro,can,parque"
             },
+            "leisure/firepit": {
+                "name": "Hoguera"
+            },
             "leisure/garden": {
                 "name": "Jardín",
                 "terms": "parque, parterre, vergel, floresta, huerto, rosaleda, jardín"
@@ -1875,16 +1956,20 @@
                 "name": "Campo de golf",
                 "terms": "Campo de golf"
             },
+            "leisure/ice_rink": {
+                "name": "Pista de Hielo"
+            },
             "leisure/marina": {
-                "name": "Marina",
+                "name": "Muelle",
-                "terms": "marina"
+                "terms": "marina, muelle, puerto, embarcadero"
             },
             "leisure/park": {
                 "name": "Parque",
                 "terms": "parque, jardín"
             },
             "leisure/picnic_table": {
-                "name": "Mesa de picnic"
+                "name": "Mesa de picnic",
+                "terms": "Mesa de picnic, Mesa de parque"
             },
             "leisure/pitch": {
                 "name": "Cancha deportiva",
@@ -1946,7 +2031,7 @@
                 "terms": "Línea"
             },
             "man_made": {
-                "name": "Hecho por el hombre",
+                "name": "Estructura artificial",
                 "terms": "manufactura, industrial, fabricado, manufacturado, fábrica, industria, hecho por el hombre"
             },
             "man_made/breakwater": {
@@ -1968,7 +2053,8 @@
                 "terms": "faro"
             },
             "man_made/observation": {
-                "name": "Torre de Observación"
+                "name": "Torre de Observación",
+                "terms": "Torre de observación"
             },
             "man_made/pier": {
                 "name": "Embarcadero",
@@ -2066,7 +2152,7 @@
             },
             "natural/spring": {
                 "name": "Manantial",
-                "terms": "Manantial"
+                "terms": "Manantial, fuente, agua"
             },
             "natural/tree": {
                 "name": "Árbol",
@@ -2130,7 +2216,8 @@
                 "name": "Oficina financiera"
             },
             "office/government": {
-                "name": "Oficina de gobierno"
+                "name": "Oficina de gobierno",
+                "terms": "Oficina gubernamental"
             },
             "office/insurance": {
                 "name": "Aseguradora",
@@ -2144,7 +2231,8 @@
                 "terms": "despacho, bufete, abogado, procurador, letrado, jurisconsulto, jurisperito, jurista, legista"
             },
             "office/newspaper": {
-                "name": "Periódico"
+                "name": "Periódico",
+                "terms": "Periódico"
             },
             "office/ngo": {
                 "name": "ONG",
@@ -2154,10 +2242,12 @@
                 "name": "Doctor"
             },
             "office/political_party": {
-                "name": "Partido político"
+                "name": "Partido político",
+                "terms": "Partido político"
             },
             "office/research": {
-                "name": "Oficina de investigación"
+                "name": "Oficina de investigación",
+                "terms": "Oficina de investigación, Laboratorio de investigación, Departamento de investigación, Centro de investigación"
             },
             "office/telecommunication": {
                 "name": "Oficina de telecomunicaciones"
@@ -2170,7 +2260,8 @@
                 "terms": "agencia, viaje, vacaciones, turismo, excursión"
             },
             "piste": {
-                "name": "Pista/Sendero de ski"
+                "name": "Pista/Sendero de ski",
+                "terms": "Pista de esquí"
             },
             "place": {
                 "name": "Lugar",
@@ -2197,7 +2288,8 @@
                 "terms": "paraje, lugar, sitio, rincón"
             },
             "place/neighbourhood": {
-                "name": "Barrio"
+                "name": "Barrio",
+                "terms": "barrio, vecindario, vecindad"
             },
             "place/town": {
                 "name": "Ciudad",
@@ -2243,7 +2335,8 @@
                 "terms": "Transformador"
             },
             "public_transport/platform": {
-                "name": "Plataforma"
+                "name": "Plataforma",
+                "terms": "Plataforma, Andén"
             },
             "public_transport/stop_position": {
                 "name": "Punto de parada",
@@ -2262,22 +2355,24 @@
                 "terms": "Ferrocarril en deshuso"
             },
             "railway/funicular": {
-                "name": "Funicular"
+                "name": "Funicular",
+                "terms": "Funicular, Teleférico, Telecabina"
             },
             "railway/halt": {
                 "name": "Apeadero",
                 "terms": "apeadero,estación,ferrocarril,tren,andén"
             },
             "railway/level_crossing": {
-                "name": "Cruce a nivel",
+                "name": "Paso a nivel",
-                "terms": "Paso a nivel"
+                "terms": "paso a nivel, cruce a nivel, ferrocarril, tren"
             },
             "railway/monorail": {
                 "name": "Monorraíl",
                 "terms": "Monorail"
             },
             "railway/narrow_gauge": {
-                "name": "Carril de vía estrecha"
+                "name": "Carril de vía estrecha",
+                "terms": "Ferrocarril de vía estrecha"
             },
             "railway/platform": {
                 "name": "Andén",
@@ -2337,7 +2432,7 @@
             },
             "shop/bicycle": {
                 "name": "Tienda de bicicletas",
-                "terms": "tienda de bicicletas, bici"
+                "terms": "tienda de bicicletas, bici, bicicleta, taller de bicicletas"
             },
             "shop/bookmaker": {
                 "name": "Librero"
@@ -2359,7 +2454,7 @@
                 "terms": "concesionario, coches, automóviles, carros, vehículos, venta"
             },
             "shop/car_parts": {
-                "name": "Tienda de partes de automóviles",
+                "name": "Tienda de recambios de automóviles",
                 "terms": "repuestos, tienda, automóvil, vehículo, carro, coche, piezas, almacén"
             },
             "shop/car_repair": {
@@ -2367,7 +2462,7 @@
                 "terms": "reparación, automóvil, vehículo, carro, coche, taller"
             },
             "shop/chemist": {
-                "name": "Farmacia",
+                "name": "Droguería",
                 "terms": "farmacéutico, botica, farmacia, boticario, apoteca"
             },
             "shop/clothes": {
@@ -2417,12 +2512,17 @@
                 "name": "Floristería",
                 "terms": "floristería, florista, flores, ramos, plantas, tienda, comercio"
             },
+            "shop/funeral_directors": {
+                "name": "Funeraria",
+                "terms": "Funeraria"
+            },
             "shop/furniture": {
                 "name": "Mueblería",
                 "terms": "mueble, mobiliario, utensilio, armario, mesa, silla, tienda, decoración, cocina"
             },
             "shop/garden_centre": {
-                "name": "Centro de jardinería"
+                "name": "Centro de jardinería",
+                "terms": "Centro de jardinería, Tienda de jardinería"
             },
             "shop/gift": {
                 "name": "Tienda de regalos",
@@ -2441,7 +2541,8 @@
                 "terms": "Ferreteria"
             },
             "shop/hifi": {
-                "name": "Tienda de equipos de sonido"
+                "name": "Tienda de equipos de sonido",
+                "terms": "sonido, hifi, alta fidelidad, electrónica, altavoces, amplificadores"
             },
             "shop/jewelry": {
                 "name": "Joyería",
@@ -2456,10 +2557,12 @@
                 "terms": "lavandería, lavadero, colada, ropa, tintorería, limpieza"
             },
             "shop/locksmith": {
-                "name": "Cerrajero"
+                "name": "Cerrajero",
+                "terms": "cerrajero, cerradura, candado"
             },
             "shop/lottery": {
-                "name": "Lotería"
+                "name": "Administración de Lotería",
+                "terms": "Administración de loterías, Venta de lotería"
             },
             "shop/mall": {
                 "name": "Centro comercial",
@@ -2496,6 +2599,9 @@
                 "name": "Tienda de fotografía",
                 "terms": "fotografía, tienda , establecimiento, fotógrafo, cámara, retratista, revelado"
             },
+            "shop/seafood": {
+                "name": "Tienda de Mariscos"
+            },
             "shop/shoes": {
                 "name": "Zapatería",
                 "terms": "zapatería, calzado, tienda, zapato, zapatilla, escarpín, bota, sandalia, alpargata, pantufla, babucha, borceguí, almadreña, zueco, chancla, chanclo, madreña, chinela, coturno, alborga"
@@ -2519,7 +2625,8 @@
                 "terms": "agencia de viajes, agencia de turismo"
             },
             "shop/tyres": {
-                "name": "Tienda de neumáticos"
+                "name": "Tienda de neumáticos",
+                "terms": "Taller de neumáticos, Recambio de ruedas"
             },
             "shop/vacant": {
                 "name": "Local vacío"
@@ -2532,19 +2639,24 @@
                 "name": "Videoclub",
                 "terms": "tienda, alquiler, renta, tienda de vídeos, videoclub, alquiler de vídeos, renta de vídeos"
             },
+            "shop/wine": {
+                "name": "Vinoteca, Tienda de vinos"
+            },
             "tourism": {
                 "name": "Turismo",
                 "terms": "turismo"
             },
             "tourism/alpine_hut": {
-                "name": "Cabaña alpina"
+                "name": "Cabaña alpina",
+                "terms": "Refugio de montaña, refugio alpino"
             },
             "tourism/artwork": {
-                "name": "Obra de arte"
+                "name": "Obra de arte",
+                "terms": "obra de arte, pieza de arte, pintura, escultura, mural, pintada, estatua"
             },
             "tourism/attraction": {
                 "name": "Atracción turística",
-                "terms": "punto de interés,interesante"
+                "terms": "punto de interés, interesante, interés turístico, atracción turística"
             },
             "tourism/camp_site": {
                 "name": "Lugar de acampada",
@@ -2571,7 +2683,7 @@
             },
             "tourism/information": {
                 "name": "Información",
-                "terms": "información,aviso,señal"
+                "terms": "información, aviso, señal, información turística"
             },
             "tourism/motel": {
                 "name": "Motel",
@@ -2583,15 +2695,15 @@
             },
             "tourism/picnic_site": {
                 "name": "Zona de picnic",
-                "terms": "picnic,barbacoa,espercimiento"
+                "terms": "picnic, barbacoa, espercimiento, merendero"
             },
             "tourism/theme_park": {
-                "name": "Parque temático",
+                "name": "Parque de atracciones",
                 "terms": "parque temático, parque de atracciones, atracciones"
             },
             "tourism/viewpoint": {
-                "name": "Vista panorámica",
+                "name": "Mirador",
-                "terms": "oteadero, punto de vista, mirador, vistas"
+                "terms": "oteadero, punto de vista, mirador, vistas, vista panorámica"
             },
             "tourism/zoo": {
                 "name": "Zoológico",
@@ -2618,7 +2730,8 @@
                 "terms": "ruta,recorrido,línea"
             },
             "type/route/bicycle": {
-                "name": "Ruta de bicicleta"
+                "name": "Ruta de bicicleta",
+                "terms": "ruta ciclista, ciclovía, carril bici, ciclosenda, bicicleta"
             },
             "type/route/bus": {
                 "name": "Ruta de bus",
@@ -2637,7 +2750,8 @@
                 "terms": "ruta, itinerario, rumbo, dirección, trayecto, peatonal, pie, senderismo , camino, derrotero, vía"
             },
             "type/route/hiking": {
-                "name": "Ruta de senderismo"
+                "name": "Ruta de senderismo",
+                "terms": "Ruta de senderismo"
             },
             "type/route/pipeline": {
                 "name": "Ruta de tubería",
@@ -2650,10 +2764,12 @@
                 "name": "Ruta de carretera"
             },
             "type/route/train": {
-                "name": "Ruta del tren"
+                "name": "Ruta del tren",
+                "terms": "Ruta de tren, Línea de tren"
             },
             "type/route/tram": {
-                "name": "Ruta del tranvía"
+                "name": "Ruta del tranvía",
+                "terms": "Ruta de tranvía, Línea de tranvía"
             },
             "type/route_master": {
                 "name": "Ruta maestra"
@@ -2664,20 +2780,23 @@
             },
             "waterway": {
                 "name": "Vía fluvial",
-                "terms": "canal, cauce, acueducto, fluvial"
+                "terms": "canal, cauce, acueducto, fluvial, agua, río"
             },
             "waterway/canal": {
                 "name": "Canal",
                 "terms": "canaleta, canaleja, canalón, canalizo, caño, cañería, reguero, reguera, tubería, conducto, caz, cacera, zanja, acequia, cauce, cloaca, acueducto, canal"
             },
             "waterway/dam": {
-                "name": "Presa"
+                "name": "Presa",
+                "terms": "Presa, Dique"
             },
             "waterway/ditch": {
-                "name": "Acequia"
+                "name": "Acequia",
+                "terms": "Foso, Zanja, Hoyo, Cuneta"
             },
             "waterway/drain": {
-                "name": "Desagüe"
+                "name": "Desagüe",
+                "terms": "Desagüe, Sumidero"
             },
             "waterway/river": {
                 "name": "Río",

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

@@ -139,6 +139,7 @@
         },
         "rotate": {
             "title": "Pööra",
+            "description": "Pööra objekti ümber tema keskpunkti.",
             "key": "R",
             "annotation": {
                 "line": "Pööratud joont.",
@@ -657,9 +658,6 @@
             "building/commercial": {
                 "name": "Ärihoone"
             },
-            "building/entrance": {
-                "name": "Sissepääs"
-            },
             "building/house": {
                 "name": "Maja"
             },
@@ -672,9 +670,6 @@
             "emergency/phone": {
                 "name": "Hädaabi telefon"
             },
-            "entrance": {
-                "name": "Sissepääs"
-            },
             "highway": {
                 "name": "Tee"
             },

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

@@ -1213,10 +1213,6 @@
                 "name": "ساختمان ارتباطی",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'ساختمان ارتباطی'، با کاما جدا میشوند>"
             },
-            "building/entrance": {
-                "name": "ورودی",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
-            },
             "building/garage": {
                 "name": "گاراژ",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'گاراژ'، با کاما جدا میشوند>"
@@ -1379,10 +1375,6 @@
                 "name": "تلفن اورژانسی",
                 "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای 'تلفن اورژانسی'، با کاما جدا میشوند>"
             },
-            "entrance": {
-                "name": "درب ورودی",
-                "terms": "<ترجمه با مترادف یا اصطلاحات مشابه برای  'Entrance'، با کاما جدا میشوند>"
-            },
             "footway/crossing": {
                 "name": "خط عابر پیاده"
             },

vendor/assets/iD/iD/locales/fi.json

@@ -71,7 +71,8 @@
                 "line": "Viiva pyöristettiin.",
                 "area": "Alue pyöristettiin."
             },
-            "not_closed": "Tätä ei voi tehdä ympyränmuotoiseksi, sillä sitä ei ole suljettu."
+            "not_closed": "Tätä ei voi tehdä ympyränmuotoiseksi, sillä sitä ei ole suljettu.",
+            "too_large": "Tätä ei voi pyöristää koska se ei ole tarpeeksi näkyvissä."
         },
         "orthogonalize": {
             "title": "Muuta suorakulmaiseksi",
@@ -84,7 +85,8 @@
                 "line": "Viiva muutettu suorakulmaiseksi.",
                 "area": "Alue muutettu suorakulmaiseksi."
             },
-            "not_squarish": "Nelikulmion tekeminen epäonnistui, koska se ei ole neliömäinen."
+            "not_squarish": "Nelikulmion tekeminen epäonnistui, koska se ei ole neliömäinen.",
+            "too_large": "Tätä ei voi tehdä suorakulmaiseksi, koska se ei ole tarpeeksi näkyvissä."
         },
         "straighten": {
             "title": "Suorista",
@@ -483,7 +485,7 @@
                 "placeholder": "500, 2500, 5000..."
             },
             "aerialway/duration": {
-                "label": "Kesto (minuuttia)",
+                "label": "Matka-aika (minuutteina)",
                 "placeholder": "1, 2, 3..."
             },
             "aerialway/heating": {
@@ -592,6 +594,21 @@
             "fixme": {
                 "label": "Korjaa minut"
             },
+            "fuel/biodiesel": {
+                "label": "Biodiesel-myynti"
+            },
+            "fuel/diesel": {
+                "label": "Diesel-myynti"
+            },
+            "fuel/e10": {
+                "label": "E10-myynti"
+            },
+            "fuel/e85": {
+                "label": "E85-myynti"
+            },
+            "fuel/lpg": {
+                "label": "Propaanin myynti"
+            },
             "gauge": {
                 "label": "Raideväli"
             },
@@ -604,6 +621,14 @@
             "generator/type": {
                 "label": "Tyyppi"
             },
+            "golf_hole": {
+                "label": "Väylänumero",
+                "placeholder": "Väylänumero (1-18)"
+            },
+            "handicap": {
+                "label": "Tasoitussuositus (HCP)",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Tyyppi"
             },
@@ -619,6 +644,9 @@
             "incline": {
                 "label": "Kaltevuus"
             },
+            "information": {
+                "label": "Tyyppi"
+            },
             "internet_access": {
                 "label": "Internet-yhteys",
                 "options": {
@@ -640,6 +668,9 @@
             "leisure": {
                 "label": "Tyyppi"
             },
+            "length": {
+                "label": "Pituus (metreinä)"
+            },
             "levels": {
                 "label": "Kerrokset",
                 "placeholder": "2, 4, 6..."
@@ -665,7 +696,7 @@
                 "label": "Luonto"
             },
             "network": {
-                "label": "Verkko"
+                "label": "Verkosto"
             },
             "note": {
                 "label": "Huomautus"
@@ -685,6 +716,10 @@
             "operator": {
                 "label": "Toimija"
             },
+            "par": {
+                "label": "Lyöntimääräsuositus",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Autoparkki"
             },
@@ -713,6 +748,18 @@
             "railway": {
                 "label": "Tyyppi"
             },
+            "recycling/cans": {
+                "label": "Tölkinkeräys"
+            },
+            "recycling/clothes": {
+                "label": "Vaatekeräys"
+            },
+            "recycling/glass": {
+                "label": "Lasinkeräys"
+            },
+            "recycling/paper": {
+                "label": "Paperinkeräys"
+            },
             "ref": {
                 "label": "Tie- tai linjanumero"
             },
@@ -752,11 +799,14 @@
             "shop": {
                 "label": "Tyyppi"
             },
+            "smoking": {
+                "label": "Tupakointi"
+            },
             "source": {
                 "label": "Lähde"
             },
             "sport": {
-                "label": "Urheilu"
+                "label": "Urheilulaji"
             },
             "structure": {
                 "label": "Rakenne",
@@ -808,6 +858,9 @@
             "wheelchair": {
                 "label": "Esteettömyys"
             },
+            "width": {
+                "label": "Leveys (metreinä)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -904,6 +957,10 @@
             "amenity/bar": {
                 "name": "Baari"
             },
+            "amenity/bbq": {
+                "name": "Grilli",
+                "terms": "grilli, grillaus, grillauspiste, grillauspaikka, grillipiste, grillauspaikka"
+            },
             "amenity/bench": {
                 "name": "Penkki",
                 "terms": "penkki, tuoli, istuin"
@@ -921,7 +978,8 @@
                 "terms": "vene, laiva, paatti, jolla, veneenvuokraus, venevuokra, vuokra, venevuokraus, venevuokraamo, veneenvuokraamo"
             },
             "amenity/cafe": {
-                "name": "Kahvila"
+                "name": "Kahvila",
+                "terms": "Kahvila, Kahvitupa, Teehuone"
             },
             "amenity/car_rental": {
                 "name": "Auton vuokraus",
@@ -934,6 +992,10 @@
                 "name": "Autopesula",
                 "terms": "autopesu, automaattipesu, pesula, pesukone, pesuhalli, auto, autot"
             },
+            "amenity/charging_station": {
+                "name": "Latauspiste",
+                "terms": "sähköauto, sähkönlataus, sähköpiste, latauspiste, lataaminen, lataus"
+            },
             "amenity/childcare": {
                 "name": "Esikoulu",
                 "terms": "esikoulu, eskari, leikkikoulu"
@@ -988,7 +1050,12 @@
                 "terms": "hautausmaa, kalmisto, luutarha"
             },
             "amenity/hospital": {
-                "name": "Sairaala-alue"
+                "name": "Sairaala-alue",
+                "terms": "Sairaala-alue"
+            },
+            "amenity/kindergarten": {
+                "name": "Päiväkodin piha",
+                "terms": "päiväkoti, piha, ulkoilualue, lastentarha"
             },
             "amenity/library": {
                 "name": "Kirjasto",
@@ -997,6 +1064,9 @@
             "amenity/marketplace": {
                 "name": "Tori"
             },
+            "amenity/nightclub": {
+                "name": "Yökerho"
+            },
             "amenity/parking": {
                 "name": "Autopysäköinti",
                 "terms": "auto, parkki, parkkihalli, pysäköintialue, pysäköinti, parkki, parkkipaikka, pysäköintialue, parkkialue"
@@ -1006,22 +1076,27 @@
                 "terms": "apteekki, lääke, lääkkeet, lääkemyymälä, lääkkeenmyynti, farmasia, farmaseutti"
             },
             "amenity/place_of_worship": {
-                "name": "Rukoilupaikka"
+                "name": "Rukoilupaikka",
+                "terms": "Uskonnollinen rakennus, Kirkkorakennus"
             },
             "amenity/place_of_worship/buddhist": {
                 "name": "Buddhalaistemppeli"
             },
             "amenity/place_of_worship/christian": {
-                "name": "Kirkko"
+                "name": "Kirkko",
+                "terms": "Kirkko, Pyhäkkö, Rukoushuone, Stupa, Tsasouna, Moskeija, Temppeli"
             },
             "amenity/place_of_worship/jewish": {
-                "name": "Synagoga"
+                "name": "Synagoga",
+                "terms": "Synagooga"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Moskeija"
+                "name": "Moskeija",
+                "terms": "Moskeija"
             },
             "amenity/police": {
-                "name": "Poliisiasema"
+                "name": "Poliisiasema",
+                "terms": "Poliisi, Poliisiasema"
             },
             "amenity/post_box": {
                 "name": "Postilaatikko",
@@ -1039,16 +1114,26 @@
                 "terms": "kierrättäminen, kierrätys, lajittelu, uudelleenkäyttö, uudelleenkäyttäminen, ympäristö, lajittelupiste, lajitteluasema, jäte, jätteet, roskat, roska, roskikset, roskis, säiliö, roskasäiliö"
             },
             "amenity/restaurant": {
-                "name": "Ravintola"
+                "name": "Ravintola",
+                "terms": "Ravintola, Ruokaravintola, Bistro, Krouvi, Pizzeria, Ruokala"
+            },
+            "amenity/school": {
+                "name": "Koulun piha",
+                "terms": "Koulun piha, Koulualue"
             },
             "amenity/shelter": {
                 "name": "Katos"
             },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Kodittomien turvakoti",
+                "terms": "koditon, kodittomia, turvatalo, kodittomien"
+            },
             "amenity/studio": {
                 "name": "Studio"
             },
             "amenity/swimming_pool": {
-                "name": "Uima-allas"
+                "name": "Uima-allas",
+                "terms": "uimahalli, uintikeskus, uimastadion, uima-allas, uinti, uiminen"
             },
             "amenity/taxi": {
                 "name": "Taksitolppa",
@@ -1056,10 +1141,11 @@
             },
             "amenity/telephone": {
                 "name": "Yleinen puhelin",
-                "terms": "puhelinkoppi, puhelin, puhelinkioski, yleinen puhelin, julkinen puhelin"
+                "terms": "puhelinkoppi, puhelin, puhelinkioski, julkinen puhelin"
             },
             "amenity/theatre": {
-                "name": "Teatteri"
+                "name": "Teatteri",
+                "terms": "Teatteri, Kaupunginteatteri, Kansallisteatteri"
             },
             "amenity/toilets": {
                 "name": "WC"
@@ -1072,6 +1158,10 @@
                 "name": "Korkeakoulu",
                 "terms": "yliopisto, korkeakoulu, college, ammattikorkeakoulu, amk"
             },
+            "amenity/vending_machine": {
+                "name": "Myyntiautomaatti",
+                "terms": "välipalamaatti, välipala-automaatti, välipala, ruokamaatti, ruoka-automaatti, juoma, juomia, juomamaatti, kahvikone, kahviautomaatti, kahvi, automaatti, myyntilaite, myyntipiste"
+            },
             "amenity/veterinary": {
                 "name": "Eläinlääkäri"
             },
@@ -1142,16 +1232,33 @@
             "building/apartments": {
                 "name": "Kerrostalo"
             },
+            "building/church": {
+                "name": "Kirkko"
+            },
             "building/commercial": {
                 "name": "Kaupallinen rakennus"
             },
+            "building/construction": {
+                "name": "Keskeneräinen rakennus",
+                "terms": "rakennus, rakennustyömaa, rakenteilla"
+            },
             "building/entrance": {
-                "name": "Sisäänkäynti"
+                "name": "Sisään- tai uloskäynti"
             },
             "building/garage": {
                 "name": "Autotalli",
                 "terms": "autotalli, autonsäilytys, autohalli, autovarasto, auto"
             },
+            "building/garages": {
+                "name": "Suuri autotalli",
+                "terms": "ryhmäautotalli, joukkoautotalli, joukkotalli, ryhmätalli, autotalli"
+            },
+            "building/hospital": {
+                "name": "Sairaalarakennus"
+            },
+            "building/hotel": {
+                "name": "Hotellirakennus"
+            },
             "building/house": {
                 "name": "Omakotitalo",
                 "terms": "omakotitalo, omakoti, yksityisasunto, yksityistalo, talo, asunto"
@@ -1163,12 +1270,40 @@
             "building/industrial": {
                 "name": "Teollisuusrakennus"
             },
+            "building/public": {
+                "name": "Julkinen rakennus"
+            },
             "building/residential": {
                 "name": "Asuinrakennus"
             },
+            "building/retail": {
+                "name": "Liikerakennus"
+            },
+            "building/roof": {
+                "name": "Seinätön rakennus",
+                "terms": "katos, katettu, seinätön, rakennus"
+            },
+            "building/school": {
+                "name": "Koulurakennus"
+            },
+            "building/shed": {
+                "name": "Vaja",
+                "terms": "vaja, mökki, liiteri"
+            },
             "building/terrace": {
                 "name": "Rivitalo"
             },
+            "building/train_station": {
+                "name": "Rautatieasema",
+                "terms": "junasema, juna, VR, rautatie, rautatieasema"
+            },
+            "building/university": {
+                "name": "Yliopistorakennus",
+                "terms": "yliopisto, yliopiston, rakennus, korkeakoulu"
+            },
+            "building/warehouse": {
+                "name": "Varasto"
+            },
             "craft/basket_maker": {
                 "name": "Koripaja",
                 "terms": "kori, paju, pajukori, korivalmistaja, koripaja"
@@ -1242,11 +1377,14 @@
             "craft/optician": {
                 "name": "optikko"
             },
+            "craft/painter": {
+                "name": "Maalari"
+            },
             "craft/photographer": {
                 "name": "valokuvaaja"
             },
             "craft/plasterer": {
-                "name": "rappaaja"
+                "name": "Rappaaja"
             },
             "craft/plumber": {
                 "name": "putkiasentaja"
@@ -1286,7 +1424,7 @@
                 "name": "Nuohooja"
             },
             "craft/tailor": {
-                "name": "räätäli"
+                "name": "Räätäli"
             },
             "craft/tiler": {
                 "name": "laatoittaja"
@@ -1301,6 +1439,9 @@
             "craft/watchmaker": {
                 "name": "Rannekelloseppä"
             },
+            "craft/window_construction": {
+                "name": "Ikkunankorjaus"
+            },
             "emergency/ambulance_station": {
                 "name": "Ambulanssiasema",
                 "terms": "ambulanssi, ambulanssit, hälytysajoneuvo, ambulanssihalli, ambulanssivarasto, ambulanssitalli, hälytysajoneuvohalli, hälytysajoneuvotalli, hälytysajoneuvovarasto"
@@ -1314,7 +1455,7 @@
                 "terms": "hätänumero, hätäpuhelin, hätätilanne, poikkeuspuhelin, hätäkeskus, hätäilmoitus"
             },
             "entrance": {
-                "name": "Sisäänkäynti"
+                "name": "Sisään- tai uloskäynti"
             },
             "footway/crossing": {
                 "name": "Suojatieväylä"
@@ -1336,7 +1477,7 @@
                 "terms": "puttigreeni, puttigriini, viheriöalue, golf, maali, maalipaikka, golf-reikä, puttausalue, putti"
             },
             "golf/hole": {
-                "name": "golf-reikä"
+                "name": "Golf-reikä"
             },
             "golf/lateral_water_hazard": {
                 "name": "Sivuvesieste"
@@ -1369,7 +1510,8 @@
                 "name": "Pyörätie"
             },
             "highway/footway": {
-                "name": "Jalkakäytävä"
+                "name": "Jalkakäytävä",
+                "terms": "Polku"
             },
             "highway/living_street": {
                 "name": "Pihakatu"
@@ -1436,7 +1578,12 @@
                 "name": "Huoltoalue"
             },
             "highway/steps": {
-                "name": "Portaat"
+                "name": "Portaat",
+                "terms": "Portaat, Rappuset, Portaikko, Kierreportaat, Tikapuut"
+            },
+            "highway/stop": {
+                "name": "Pakollinen pysähtyminen",
+                "terms": "stop, stop-merkki, stop merkki, liikennemerkki, kieltomerkki, kieltomerkit, pysähtyminen, pysähdys, liikennesääntö, liikennesäännöt, pakollisuus, pakollinen"
             },
             "highway/tertiary": {
                 "name": "Yhdystie"
@@ -1554,11 +1701,16 @@
             "leisure/golf_course": {
                 "name": "Golfkenttä"
             },
+            "leisure/ice_rink": {
+                "name": "Luistelukenttä",
+                "terms": "jää, jääkenttä, jääalue, kaukalo, jääkiekko, luistelu, jääkiekkokaukalo, luistimet, luistinrata, luistelurata"
+            },
             "leisure/marina": {
                 "name": "Venesatama"
             },
             "leisure/park": {
-                "name": "Puisto"
+                "name": "Puisto",
+                "terms": "Puisto, Viheralue, Puistikko"
             },
             "leisure/pitch": {
                 "name": "Urheilukenttä"
@@ -1586,12 +1738,16 @@
                 "name": "Lentopallokenttä"
             },
             "leisure/playground": {
-                "name": "Leikkipuisto"
+                "name": "Leikkipuisto",
+                "terms": "leikkipuisto, leikkipaikka, leikki, leikkiä, lapsipuisto, leikkipiste"
             },
             "leisure/slipway": {
                 "name": "Veneramppi",
                 "terms": "veneramppi, vesillelaskupaikka, veneenlaskupaikka, vene, järveenlaskupaikka, järviramppi"
             },
+            "leisure/sports_center": {
+                "name": "Urheilukeskus"
+            },
             "leisure/stadium": {
                 "name": "Stadion"
             },
@@ -1613,6 +1769,14 @@
             "man_made/cutline": {
                 "name": "Leikkaa viiva"
             },
+            "man_made/embankment": {
+                "name": "Penkere",
+                "terms": "pengerrys, tienreuna, meluvalli, äänivalli, äänimuuri, melumuuri"
+            },
+            "man_made/flagpole": {
+                "name": "Lipputank",
+                "terms": "lippu, liputus, salko, lippusalko, tanko, tolppa, lipputolppa, liputuspäivä, liputtaa"
+            },
             "man_made/lighthouse": {
                 "name": "Majakka"
             },
@@ -1650,6 +1814,10 @@
             "military/bunker": {
                 "name": "Bunkkeri"
             },
+            "military/range": {
+                "name": "Sotilasalue",
+                "terms": "varuskunta, sotilas, armeija, sota, sodankäynti"
+            },
             "natural": {
                 "name": "Luonto"
             },
@@ -1663,7 +1831,8 @@
                 "name": "Kallionjyrkänne"
             },
             "natural/coastline": {
-                "name": "Rannikko"
+                "name": "Rannikko",
+                "terms": "Rantaviiva"
             },
             "natural/glacier": {
                 "name": "Jäätikkö"
@@ -1675,7 +1844,8 @@
                 "name": "Nummi"
             },
             "natural/peak": {
-                "name": "Vuorenhuippu"
+                "name": "Vuorenhuippu",
+                "terms": "Huippu, Vuorenhuippu, Korkein kohta, Vuoren huippu"
             },
             "natural/scrub": {
                 "name": "Pensaikko"
@@ -1690,10 +1860,12 @@
                 "name": "Vesi"
             },
             "natural/water/lake": {
-                "name": "Järvi"
+                "name": "Järvi",
+                "terms": "Järvi, Vesistö"
             },
             "natural/water/pond": {
-                "name": "Lampi"
+                "name": "Lampi",
+                "terms": "Lampi, Lammikko, Lampare, Luoma"
             },
             "natural/water/reservoir": {
                 "name": "Tekojärvi"
@@ -1707,10 +1879,31 @@
             "office": {
                 "name": "Toimisto"
             },
+            "office/accountant": {
+                "name": "Tilintarkastustoimisto",
+                "terms": "tilintarkastus, tilintarkastaja, kirjanpito, kirjanpitäjä, kirjanpitotoimisto"
+            },
+            "office/company": {
+                "name": "Yritystoimisto"
+            },
             "office/educational_institution": {
                 "name": "Oppilatos",
                 "terms": "koulu, alakoulu, ala-aste, yläaste, yläkoulu, lukio, yhteislukio, keskikoulu, koulutus, opiskelu, oppilaitos, yliopisto"
             },
+            "office/employment_agency": {
+                "name": "Työnvälitystoimisto",
+                "terms": "työ, työvoimatoimisto, työnvälitys, työnvälittäjä, työpaikka, työpaikat"
+            },
+            "office/financial": {
+                "name": "Taloustoimisto"
+            },
+            "office/government": {
+                "name": "Hallinnon toimisto"
+            },
+            "office/insurance": {
+                "name": "Vakuutustoimisto",
+                "terms": "vakuutus, vakuutusyhtiö, vakuutukset, vakuutuksia"
+            },
             "office/it": {
                 "name": "Tietotekniikkatoimisto",
                 "terms": "tietotalo, tietotekniikka, teknologia, tietoteknologia, IT-talo, IT-teknologia, IT-tekniikka, teknologiatalo"
@@ -1747,7 +1940,8 @@
                 "name": "Pikkukylä"
             },
             "place/island": {
-                "name": "Saari"
+                "name": "Saari",
+                "terms": "Saari, Saareke, Luoto"
             },
             "place/isolated_dwelling": {
                 "name": "Yksittäinen asunto"
@@ -1755,6 +1949,12 @@
             "place/locality": {
                 "name": "Paikkakunta"
             },
+            "place/neighbourhood": {
+                "name": "Asuinalue"
+            },
+            "place/suburb": {
+                "name": "Kaupunginosa"
+            },
             "place/town": {
                 "name": "Pieni kaupunki",
                 "terms": "kunta, pienkaupunki, pieni kaupunki, keskikokoinen kaupunki"
@@ -1768,6 +1968,9 @@
             "power": {
                 "name": "Sähkö"
             },
+            "power/generator": {
+                "name": "Generaattori"
+            },
             "power/line": {
                 "name": "Voimalinja"
             },
@@ -1787,6 +1990,10 @@
             "power/transformer": {
                 "name": "Muuntaja"
             },
+            "public_transport/platform": {
+                "name": "Laiturialue",
+                "terms": "pysäkki, asema, pysäkkilaituri, laituri, odotus, odotusalue, odotuslaituri, odottaminen, katos, asemalaituri, asema"
+            },
             "railway": {
                 "name": "Rautatie"
             },
@@ -1799,6 +2006,10 @@
             "railway/funicular": {
                 "name": "funikulaari"
             },
+            "railway/halt": {
+                "name": "Seisake",
+                "terms": "rautatie, juna, junarata, pysäkki, asema, rautatieasema, VR"
+            },
             "railway/level_crossing": {
                 "name": "Tasoristeys"
             },
@@ -1809,7 +2020,8 @@
                 "name": "Kapearaiteinen rautatie"
             },
             "railway/platform": {
-                "name": "Rautatielaituri"
+                "name": "Rautatielaituri",
+                "terms": "junalaituri, juna, rautatie, VR, asemalaituri, odotusalue, odotuslaituri"
             },
             "railway/rail": {
                 "name": "Rata"
@@ -1910,6 +2122,10 @@
             "shop/florist": {
                 "name": "Kukkakauppa"
             },
+            "shop/funeral_directors": {
+                "name": "Hautaustoimisto",
+                "terms": "hautajaiset, hautajaistoimisto, toimisto, vainaja"
+            },
             "shop/furniture": {
                 "name": "Huonekaluliike"
             },
@@ -1942,6 +2158,10 @@
             "shop/laundry": {
                 "name": "Pesula"
             },
+            "shop/lottery": {
+                "name": "Veikkauspiste",
+                "terms": "lotto, veikkaus, vedonlyönti, lyödä vetoa, jokeri"
+            },
             "shop/mall": {
                 "name": "Kauppakeskus",
                 "terms": "kauppakeskus, ostoskeskus, kauppakeskittymä"
@@ -2001,6 +2221,9 @@
             "shop/video": {
                 "name": "Videovuokraamo"
             },
+            "shop/wine": {
+                "name": "Viinikauppa"
+            },
             "tourism": {
                 "name": "Turismi"
             },

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

@@ -71,7 +71,8 @@
                 "line": "Ligne rendue circulaire.",
                 "area": "Polygone rendu circulaire."
             },
-            "not_closed": "Cet élément ne peut pas être rendu circulaire car il ne boucle pas."
+            "not_closed": "Cet élément ne peut pas être rendu circulaire car il ne boucle pas.",
+            "too_large": "Ceci ne peut pas être transformé en cercle parce qu'une partie n'est pas visible."
         },
         "orthogonalize": {
             "title": "Carré",
@@ -84,7 +85,8 @@
                 "line": "Ligne rendue orthogonale.",
                 "area": "Polygone rendu orthogonal."
             },
-            "not_squarish": "Cela ne peut être fait, ce n'est pas carré."
+            "not_squarish": "Cela ne peut être fait, ce n'est pas carré.",
+            "too_large": "Ceci ne peut pas être transformé en rectangle parce qu'une partie n'est pas visible."
         },
         "straighten": {
             "title": "Rendre droit",
@@ -134,7 +136,8 @@
             "annotation": "Fusionne les {n} lignes.",
             "not_eligible": "Ces éléments ne peuvent pas être fusionnés.",
             "not_adjacent": "Ces lignes ne peuvent pas être fusionnées car elles ne sont pas connectées.",
-            "restriction": "Ces lignes ne peuvent pas être fusionnées car au moins l'une d'entre elles est membre d'une relation \"{relation}\"."
+            "restriction": "Ces lignes ne peuvent pas être fusionnées car au moins l'une d'entre elles est membre d'une relation \"{relation}\".",
+            "incomplete_relation": "Ces éléments ne peuvent pas être fusionnés parce qu'au moins l'un d'entre eux n'a pas été complètement téléchargé."
         },
         "move": {
             "title": "Déplacer",
@@ -264,6 +267,8 @@
         "percent_brightness": "{opacity}% luminosité",
         "none": "Aucun",
         "custom": "Personnalisé",
+        "custom_button": "Modifier le fond personnalisé",
+        "custom_prompt": "Saisir un template d'URL de tuile. Les symboles sont {z}, {x}, {y} pour la structure Z/X/Y et {u} pour la balance des domaines.",
         "fix_misalignment": "Corriger l'alignement",
         "reset": "réinitialiser"
     },
@@ -556,6 +561,9 @@
             "covered": {
                 "label": "Couvert"
             },
+            "crop": {
+                "label": "Culture"
+            },
             "crossing": {
                 "label": "Type"
             },
@@ -591,7 +599,25 @@
                 "label": "Type"
             },
             "fixme": {
-                "label": "Corrigez-Moi"
+                "label": "À corriger"
+            },
+            "fuel": {
+                "label": "Station essence"
+            },
+            "fuel/biodiesel": {
+                "label": "Vente d'agro-carburant"
+            },
+            "fuel/diesel": {
+                "label": "Vente de diesel"
+            },
+            "fuel/e10": {
+                "label": "Vend du E10"
+            },
+            "fuel/e85": {
+                "label": "Vends du E85"
+            },
+            "fuel/lpg": {
+                "label": "Vente de gaz propane"
             },
             "generator/method": {
                 "label": "Méthode"
@@ -616,6 +642,9 @@
             "historic": {
                 "label": "Type"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -649,6 +678,9 @@
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Longueur (mètres)"
+            },
             "levels": {
                 "label": "Niveaux",
                 "placeholder": "2, 4, 6..."
@@ -720,12 +752,27 @@
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Population"
+            },
             "power": {
                 "label": "Type"
             },
             "railway": {
                 "label": "Type"
             },
+            "recycling/cans": {
+                "label": "Accepte les boîtes de conserve"
+            },
+            "recycling/clothes": {
+                "label": "Accepte les vêtements"
+            },
+            "recycling/glass": {
+                "label": "Accepte le verre"
+            },
+            "recycling/paper": {
+                "label": "Accepte le papier"
+            },
             "ref": {
                 "label": "Référence"
             },
@@ -768,12 +815,21 @@
             "shop": {
                 "label": "Type"
             },
+            "smoking": {
+                "label": "Fumeur"
+            },
+            "social_facility_for": {
+                "placeholder": "Sans-abris, handicapés, enfants, etc."
+            },
             "source": {
                 "label": "Source"
             },
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Structure",
                 "placeholder": "Inconnu",
@@ -781,7 +837,8 @@
                     "bridge": "Pont",
                     "tunnel": "Tunnel",
                     "embankment": "Remblai",
-                    "cutting": "Tranchée"
+                    "cutting": "Tranchée",
+                    "ford": "Ford"
                 }
             },
             "studio_type": {
@@ -811,6 +868,9 @@
             "tree_type": {
                 "label": "Type"
             },
+            "trees": {
+                "label": "Arbres"
+            },
             "tunnel": {
                 "label": "Tunnel"
             },
@@ -833,8 +893,11 @@
             "wheelchair": {
                 "label": "Accès en fauteuil roulant"
             },
+            "width": {
+                "label": "Largeur (mètres)"
+            },
             "wikipedia": {
-                "label": "Wikipedia"
+                "label": "Wikipédia"
             },
             "wood": {
                 "label": "Type"
@@ -855,7 +918,8 @@
                 "name": "Télésiège"
             },
             "aerialway/gondola": {
-                "name": "Gondole"
+                "name": "Gondole",
+                "terms": "Gondole"
             },
             "aerialway/magic_carpet": {
                 "name": "Bande transporteuse de personnes"
@@ -898,7 +962,7 @@
             },
             "aeroway/helipad": {
                 "name": "Héliport",
-                "terms": "Hélipad"
+                "terms": "Hélipad, Héliport"
             },
             "aeroway/runway": {
                 "name": "Piste d’atterrissage",
@@ -913,7 +977,7 @@
                 "terms": "Terminal, Terminal Aéroportuaire"
             },
             "amenity": {
-                "name": "Équipements",
+                "name": "Équipement",
                 "terms": "Commodité"
             },
             "amenity/arts_centre": {
@@ -932,6 +996,9 @@
                 "name": "Bar",
                 "terms": "Bar"
             },
+            "amenity/bbq": {
+                "name": "Barbecue/Grill"
+            },
             "amenity/bench": {
                 "name": "Banc",
                 "terms": "Banc"
@@ -984,6 +1051,10 @@
                 "name": "Enseignement supérieur (non universitaire)",
                 "terms": "Institut, École supérieure, Enseignement supérieur, Haute école, CÉGEP, cégep"
             },
+            "amenity/compressed_air": {
+                "name": "Air comprimé",
+                "terms": "Air comprimé"
+            },
             "amenity/courthouse": {
                 "name": "Tribunal",
                 "terms": "Palais de Justice, Tribunal"
@@ -1024,6 +1095,9 @@
                 "name": "Cimetière",
                 "terms": "Cimetière"
             },
+            "amenity/hospital": {
+                "name": "Terrain d'hôpital"
+            },
             "amenity/library": {
                 "name": "Bibliothèque",
                 "terms": "Bibliothèque, Librairie"
@@ -1032,6 +1106,10 @@
                 "name": "Place de marché",
                 "terms": "Marché"
             },
+            "amenity/nightclub": {
+                "name": "Boite de nuit",
+                "terms": "Boîte de nuit"
+            },
             "amenity/parking": {
                 "name": "Parc de stationnement",
                 "terms": "Parc de stationnement, parking"
@@ -1088,10 +1166,17 @@
                 "name": "Restaurant",
                 "terms": "Restaurant"
             },
+            "amenity/school": {
+                "name": "Terrain d'école"
+            },
             "amenity/shelter": {
                 "name": "Abri",
                 "terms": "Abri"
             },
+            "amenity/social_facility/food_bank": {
+                "name": "Banque alimentaire",
+                "terms": "Banque alimentaire"
+            },
             "amenity/studio": {
                 "name": "Studio"
             },
@@ -1108,7 +1193,7 @@
                 "terms": "Téléphone"
             },
             "amenity/theatre": {
-                "name": "Théatre",
+                "name": "Théâtre",
                 "terms": "Théâtre"
             },
             "amenity/toilets": {
@@ -1189,7 +1274,7 @@
             },
             "barrier/lift_gate": {
                 "name": "Barrière levante",
-                "terms": "Hayon"
+                "terms": "Barrière relevable"
             },
             "barrier/retaining_wall": {
                 "name": "Mur de soutènement",
@@ -1219,32 +1304,55 @@
                 "name": "Résidence",
                 "terms": "Appartements"
             },
+            "building/barn": {
+                "name": "Hangar agricole",
+                "terms": "Hangar agricole, Grange"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Casemate, Blockhaus, Bunker"
+            },
             "building/cathedral": {
-                "name": "Cathédrale"
+                "name": "Cathédrale",
+                "terms": "Cathédrale"
             },
             "building/chapel": {
-                "name": "Chapelle"
+                "name": "Chapelle",
+                "terms": "Chapelle"
             },
             "building/church": {
-                "name": "Église"
+                "name": "Église",
+                "terms": "Église"
             },
             "building/commercial": {
                 "name": "Bâtiment commercial",
                 "terms": "Bâtiment commercial"
             },
-            "building/entrance": {
+            "building/construction": {
-                "name": "Entrée",
+                "name": "Bâtiment en construction",
-                "terms": "Entrée"
+                "terms": "Bâtiment en construction, Chantier"
+            },
+            "building/dormitory": {
+                "name": "Dortoir"
             },
             "building/garage": {
                 "name": "Garage",
                 "terms": "Garage"
             },
+            "building/garages": {
+                "name": "Garages",
+                "terms": "Garages, Parc de stationnement couvert"
+            },
             "building/greenhouse": {
                 "name": "Serre"
             },
+            "building/hospital": {
+                "name": "Hôpital ",
+                "terms": "Hôpital, Clinique"
+            },
             "building/hotel": {
-                "name": "Hôtel"
+                "name": "Hôtel",
+                "terms": "Hôtel"
             },
             "building/house": {
                 "name": "Maison",
@@ -1259,26 +1367,45 @@
                 "terms": "Bâtiment industriel"
             },
             "building/public": {
-                "name": "Établissement public"
+                "name": "Établissement public",
+                "terms": "Bâtiment public"
             },
             "building/residential": {
                 "name": "Bâtiment résidentiel",
                 "terms": "Bâtiment résidentiel"
             },
+            "building/roof": {
+                "name": "Voûte",
+                "terms": "voûte, toit, marché couvert"
+            },
             "building/school": {
                 "name": "Bâtiment d'enseignement"
             },
             "building/stable": {
-                "name": "Étable"
+                "name": "Étable",
+                "terms": "Étable"
             },
             "building/train_station": {
-                "name": "Gare ferroviaire"
+                "name": "Gare ferroviaire",
+                "terms": "Gare, Station, Arrêt"
             },
             "building/university": {
                 "name": "Université"
             },
+            "building/warehouse": {
+                "name": "Entrepôt",
+                "terms": "Entrepôt, magasin, abri, dépôt, docks, hangar"
+            },
+            "craft/basket_maker": {
+                "name": "Vannier"
+            },
+            "craft/beekeeper": {
+                "name": "Apiculteur",
+                "terms": "Apiculteur"
+            },
             "craft/blacksmith": {
-                "name": "Forgeron"
+                "name": "Forgeron",
+                "terms": "Forgeron"
             },
             "craft/boatbuilder": {
                 "name": "Constructeur de bateaux",
@@ -1291,13 +1418,15 @@
                 "name": "Brasserie"
             },
             "craft/carpenter": {
-                "name": "Charpentier"
+                "name": "Charpentier",
+                "terms": "Charpentier"
             },
             "craft/caterer": {
                 "name": "Traiteur"
             },
             "craft/clockmaker": {
-                "name": "Horloger"
+                "name": "Horloger",
+                "terms": "Horloger, Horlogerie"
             },
             "craft/confectionary": {
                 "name": "Confiserie"
@@ -1339,10 +1468,18 @@
                 "name": "Opticien",
                 "terms": "Opticien"
             },
+            "craft/painter": {
+                "name": "Peintre",
+                "terms": "Peintre"
+            },
             "craft/photographer": {
                 "name": "Photographe",
                 "terms": "Photographe"
             },
+            "craft/photographic_laboratory": {
+                "name": "Laboratoire photographique",
+                "terms": "Laboratoire photographique, Laboratoire de développement"
+            },
             "craft/plasterer": {
                 "name": "Plâtrier"
             },
@@ -1351,10 +1488,12 @@
                 "terms": "Plombier"
             },
             "craft/pottery": {
-                "name": "Pottier"
+                "name": "Pottier",
+                "terms": "Potier"
             },
             "craft/roofer": {
-                "name": "Couvreur"
+                "name": "Couvreur",
+                "terms": "Couvreur"
             },
             "craft/saddler": {
                 "name": "Sellier"
@@ -1367,10 +1506,12 @@
                 "name": "Scierie"
             },
             "craft/sculpter": {
-                "name": "Sculpteur"
+                "name": "Sculpteur",
+                "terms": "Sculpteur"
             },
             "craft/shoemaker": {
-                "name": "Cordonnier"
+                "name": "Cordonnier",
+                "terms": "Bottier, Cordonnier"
             },
             "craft/stonemason": {
                 "name": "Tailleur de pierre"
@@ -1409,8 +1550,7 @@
                 "terms": "Téléphone d'urgence"
             },
             "entrance": {
-                "name": "Entrée",
+                "name": "Entrée/Sortie"
-                "terms": "Entrée"
             },
             "footway/crossing": {
                 "name": "Passage pieton ",
@@ -1420,19 +1560,27 @@
                 "name": "Trottoir",
                 "terms": "Trottoir"
             },
+            "ford": {
+                "name": "Ford"
+            },
             "golf/bunker": {
-                "name": "Bunker"
+                "name": "Bunker",
+                "terms": "Bunker"
             },
             "golf/fairway": {
                 "name": "Allée (golf)"
             },
+            "golf/green": {
+                "name": "Green",
+                "terms": "Green"
+            },
             "golf/hole": {
                 "name": "Trou de golf",
                 "terms": "Trou de golf"
             },
             "highway": {
                 "name": "Route",
-                "terms": "Autoroute"
+                "terms": "Autoroute, Voie rapide"
             },
             "highway/bridleway": {
                 "name": "Sentier équestre",
@@ -1452,7 +1600,7 @@
             },
             "highway/footway": {
                 "name": "Voie piétonne",
-                "terms": "Chemin piétonnier"
+                "terms": "Chemin piétonnier, Sentier"
             },
             "highway/living_street": {
                 "name": "Zone de rencontre",
@@ -1464,7 +1612,7 @@
             },
             "highway/motorway": {
                 "name": "Autoroute",
-                "terms": "Autoroute"
+                "terms": "Autoroute, Voie rapide"
             },
             "highway/motorway_junction": {
                 "name": "Bretelle d'autoroute",
@@ -1495,7 +1643,8 @@
                 "terms": "Route résidentielle"
             },
             "highway/rest_area": {
-                "name": "Aire de repos"
+                "name": "Aire de repos",
+                "terms": "Aire de repos, Aire de service"
             },
             "highway/road": {
                 "name": "Voie de type inconnu",
@@ -1519,7 +1668,7 @@
             },
             "highway/service/drive-through": {
                 "name": "Drive In",
-                "terms": "Service au comptoir"
+                "terms": "Service au comptoir, Drive-in"
             },
             "highway/service/driveway": {
                 "name": "Allée",
@@ -1555,11 +1704,11 @@
             },
             "highway/track": {
                 "name": "Piste carrossable",
-                "terms": "Piste"
+                "terms": "Piste, Chemin carrossable"
             },
             "highway/traffic_signals": {
                 "name": "Feux tricolores",
-                "terms": "Feux de circulation, Feux rouges, Lumière rouge"
+                "terms": "Feux de circulation, Feux tricolores, Feux rouges"
             },
             "highway/trunk": {
                 "name": "Voie rapide",
@@ -1665,6 +1814,9 @@
                 "name": "Prairie",
                 "terms": "Prairie"
             },
+            "landuse/military": {
+                "name": "Militaire"
+            },
             "landuse/orchard": {
                 "name": "Verger",
                 "terms": "Verger"
@@ -1705,6 +1857,9 @@
                 "name": "Parcours de golf",
                 "terms": "Golf, Terrain de golf, Parcours de golf"
             },
+            "leisure/ice_rink": {
+                "name": "Patinoire"
+            },
             "leisure/marina": {
                 "name": "Marina",
                 "terms": "Marina"
@@ -1713,6 +1868,10 @@
                 "name": "Parc",
                 "terms": "Parc"
             },
+            "leisure/picnic_table": {
+                "name": "Table de pique-nique",
+                "terms": "Table de pique-nique"
+            },
             "leisure/pitch": {
                 "name": "Terrain de sport",
                 "terms": "Terrain de sport"
@@ -1841,7 +2000,7 @@
             },
             "military/bunker": {
                 "name": "Bunker",
-                "terms": "casemate, blockhaus"
+                "terms": "casemate, blockhaus, bunker"
             },
             "military/range": {
                 "name": "Stand de tir"
@@ -1912,7 +2071,7 @@
             },
             "natural/water/pond": {
                 "name": "Étang",
-                "terms": "Etang, Mare"
+                "terms": "Étang, Mare"
             },
             "natural/water/reservoir": {
                 "name": "Bassin de retenue",
@@ -2011,7 +2170,8 @@
                 "terms": "Agence de voyage"
             },
             "piste": {
-                "name": "Piste de ski"
+                "name": "Piste de ski",
+                "terms": "Piste de ski"
             },
             "place": {
                 "name": "Toponymie",
@@ -2037,6 +2197,9 @@
                 "name": "Lieu-dit",
                 "terms": "Localité"
             },
+            "place/neighbourhood": {
+                "name": "Voisinage"
+            },
             "place/town": {
                 "name": "Ville (10.000-100.000 habitants)",
                 "terms": "Ville"
@@ -2114,6 +2277,9 @@
                 "name": "Monorail",
                 "terms": "Monorail"
             },
+            "railway/narrow_gauge": {
+                "name": "Voie étroite"
+            },
             "railway/platform": {
                 "name": "Quai de gare",
                 "terms": "Quai de gare"
@@ -2154,6 +2320,9 @@
                 "name": "Magasin de vente d'alcool",
                 "terms": "Cave, Caviste, Magasin de vin, Vins & Spiritueux"
             },
+            "shop/art": {
+                "name": "Magasin d'art"
+            },
             "shop/bakery": {
                 "name": "Boulangerie",
                 "terms": "Boulangerie"
@@ -2246,6 +2415,10 @@
                 "name": "Fleuriste",
                 "terms": "Fleuriste"
             },
+            "shop/funeral_directors": {
+                "name": "Funérarium",
+                "terms": "Funérarium, Maison funéraire"
+            },
             "shop/furniture": {
                 "name": "Magasin de meubles",
                 "terms": "Magasin de meubles"
@@ -2290,6 +2463,9 @@
                 "name": "Serrurier",
                 "terms": "Serrurier"
             },
+            "shop/lottery": {
+                "name": "Loterie"
+            },
             "shop/mall": {
                 "name": "Centre commercial",
                 "terms": "Centre d'achat"
@@ -2366,6 +2542,10 @@
                 "name": "Vidéo-club",
                 "terms": "Club vidéo"
             },
+            "shop/wine": {
+                "name": "Caviste",
+                "terms": "Caviste, Chai, Bar à vins"
+            },
             "tourism": {
                 "name": "Tourisme",
                 "terms": "Tourisme"
@@ -2455,19 +2635,19 @@
                 "terms": "Route, rue, chemin, sentier"
             },
             "type/route/bicycle": {
-                "name": "Trajet Cyclable",
+                "name": "Trajet cyclable",
                 "terms": "Piste cyclable"
             },
             "type/route/bus": {
-                "name": "Trajet de Bus",
+                "name": "Trajet de bus",
                 "terms": "Trajet d'autobus"
             },
             "type/route/detour": {
-                "name": "Trajet de Contournement",
+                "name": "Déviation",
                 "terms": "Détour"
             },
             "type/route/ferry": {
-                "name": "Trajet de Ferry",
+                "name": "Trajet de ferry",
                 "terms": "Route de traversier, Ligne de ferry"
             },
             "type/route/foot": {
@@ -2535,7 +2715,7 @@
                 "terms": "Berge"
             },
             "waterway/stream": {
-                "name": "Cours d'eau étroit",
+                "name": "Ruisseau",
                 "terms": "Ruisseau"
             },
             "waterway/weir": {

vendor/assets/iD/iD/locales/gl.json

@@ -305,7 +305,9 @@
         "start": "Editar agora"
     },
     "source_switch": {
-        "lose_changes": "Tes cambios sen gardar. Se cambias o servidor do mapa, descartaranse. Estás seguro de que queres cambiar o servidor?"
+        "live": "en línea",
+        "lose_changes": "Tes cambios sen gardar. Se cambias o servidor do mapa, descartaranse. Estás seguro de que queres cambiar o servidor?",
+        "dev": "desenvolvemento"
     },
     "tag_reference": {
         "description": "Descrición",
@@ -419,7 +421,7 @@
                 "types": {
                     "access": "Xeral",
                     "foot": "A pé",
-                    "motor_vehicle": "Automóviles",
+                    "motor_vehicle": "Automóbiles",
                     "bicycle": "Bicicletas",
                     "horse": "Cabalos"
                 },
@@ -455,9 +457,13 @@
                 "placeholders": {
                     "number": "123",
                     "street": "Rúa",
-                    "city": "Cidade"
+                    "city": "Cidade",
+                    "postcode": "Código postal"
                 }
             },
+            "admin_level": {
+                "label": "Nivel administrativo"
+            },
             "aeroway": {
                 "label": "Tipo"
             },
@@ -483,7 +489,18 @@
                 "label": "Edificio"
             },
             "capacity": {
-                "label": "Capacidade"
+                "label": "Capacidade",
+                "placeholder": "50, 100, 200..."
+            },
+            "cardinal_direction": {
+                "label": "Sentido"
+            },
+            "clock_direction": {
+                "label": "Sentido",
+                "options": {
+                    "clockwise": "Sentido horario",
+                    "anticlockwise": "Sentido antihorario"
+                }
             },
             "collection_times": {
                 "label": "Horario de recollida"
@@ -519,7 +536,8 @@
                 "label": "Tipo"
             },
             "fax": {
-                "label": "Fax"
+                "label": "Fax",
+                "placeholder": "+34 989 12 34 56"
             },
             "fee": {
                 "label": "Tarifa"
@@ -547,6 +565,10 @@
             "landuse": {
                 "label": "Tipo"
             },
+            "lanes": {
+                "label": "Carrís",
+                "placeholder": "1, 2, 3..."
+            },
             "layer": {
                 "label": "Capa"
             },
@@ -554,7 +576,8 @@
                 "label": "Tipo"
             },
             "levels": {
-                "label": "Niveis"
+                "label": "Niveis",
+                "placeholder": "2, 4, 6..."
             },
             "lit": {
                 "label": "Iluminado"
@@ -566,7 +589,8 @@
                 "label": "Tipo"
             },
             "maxspeed": {
-                "label": "Límite de velocidade"
+                "label": "Límite de velocidade",
+                "placeholder": "40, 50, 60..."
             },
             "name": {
                 "label": "Nome",
@@ -600,7 +624,8 @@
                 "label": "Tipo"
             },
             "phone": {
-                "label": "Teléfono"
+                "label": "Teléfono",
+                "placeholder": "+34 989 12 34 56"
             },
             "place": {
                 "label": "Tipo"
@@ -638,6 +663,9 @@
             "route_master": {
                 "label": "Tipo"
             },
+            "sac_scale": {
+                "label": "Dificultade do sendeiro"
+            },
             "service": {
                 "label": "Tipo"
             },
@@ -663,15 +691,24 @@
                     "cutting": "Desmonte"
                 }
             },
+            "supervised": {
+                "label": "Vixiado"
+            },
             "surface": {
                 "label": "Superficie"
             },
             "tourism": {
                 "label": "Tipo"
             },
+            "towertype": {
+                "label": "Tipo de torre"
+            },
             "tracktype": {
                 "label": "Tipo"
             },
+            "trail_visibility": {
+                "label": "Visibilidade do sendeiro"
+            },
             "water": {
                 "label": "Tipo"
             },
@@ -679,7 +716,8 @@
                 "label": "Tipo"
             },
             "website": {
-                "label": "Páxina web"
+                "label": "Sitio web",
+                "placeholder": "http://exemplo.com/"
             },
             "wetland": {
                 "label": "Tipo"
@@ -702,10 +740,12 @@
                 "name": "Vía aérea"
             },
             "aeroway/aerodrome": {
-                "name": "Aeroporto"
+                "name": "Aeroporto",
+                "terms": "aeroporto, avión, aeródromo, terminal"
             },
             "aeroway/helipad": {
-                "name": "Heliporto"
+                "name": "Heliporto",
+                "terms": "heliporto, helicóptero"
             },
             "amenity": {
                 "name": "Instalacións"
@@ -714,7 +754,8 @@
                 "name": "Caixeiro automático"
             },
             "amenity/bank": {
-                "name": "Banco"
+                "name": "Banco",
+                "terms": "banco, caixa, entidade financeira"
             },
             "amenity/bar": {
                 "name": "Bar"
@@ -729,7 +770,14 @@
                 "name": "Alugamento de Bicicletas"
             },
             "amenity/cafe": {
-                "name": "Cafetería"
+                "name": "Cafetería",
+                "terms": "cafetería, café, bar"
+            },
+            "amenity/car_rental": {
+                "name": "Aluguer de automóbiles"
+            },
+            "amenity/car_wash": {
+                "name": "Lavado de automóbiles"
             },
             "amenity/cinema": {
                 "name": "Cine"
@@ -761,6 +809,9 @@
             "amenity/hospital": {
                 "name": "Hospital"
             },
+            "amenity/kindergarten": {
+                "name": "Gardería"
+            },
             "amenity/library": {
                 "name": "Biblioteca"
             },
@@ -774,10 +825,12 @@
                 "name": "Farmacia"
             },
             "amenity/place_of_worship": {
-                "name": "Lugar de Culto"
+                "name": "Lugar de Culto",
+                "terms": "lugar de culto, igrexa, templo, capela, basílica, parroquia, santuario, ermida, catedral, sinagoga, mesquita"
             },
             "amenity/place_of_worship/christian": {
-                "name": "Igrexa"
+                "name": "Igrexa",
+                "terms": "igrexa, capela, parroquia, templo, ermida, santuario"
             },
             "amenity/place_of_worship/jewish": {
                 "name": "Sinagoga"
@@ -786,10 +839,12 @@
                 "name": "Mesquita"
             },
             "amenity/police": {
-                "name": "Policía"
+                "name": "Policía",
+                "terms": "policía, comisaría, cuartel, policía local, policía nacional, garda civil, forzas de seguridade"
             },
             "amenity/post_box": {
-                "name": "Caixa do correo"
+                "name": "Caixa do correo",
+                "terms": "correo, buzón, correos, mensaxería, postal"
             },
             "amenity/post_office": {
                 "name": "Oficina de Correos"
@@ -798,10 +853,12 @@
                 "name": "Pub"
             },
             "amenity/restaurant": {
-                "name": "Restaurante"
+                "name": "Restaurante",
+                "terms": "restaurante, mesón, taberna, comedor, comida, comer, xantar, cear, menú"
             },
             "amenity/school": {
-                "name": "Escola"
+                "name": "Escola",
+                "terms": "escola, colexio, instituto, educación, ensinanza, primaria, secundaria, ESO, bacharelato"
             },
             "amenity/swimming_pool": {
                 "name": "Piscina"
@@ -813,16 +870,18 @@
                 "name": "Teatro"
             },
             "amenity/toilets": {
-                "name": "Servicios"
+                "name": "Aseos"
             },
             "amenity/townhall": {
-                "name": "Casa do Concello"
+                "name": "Casa do Concello",
+                "terms": "casa do concello, concello, ayuntamiento, municipal"
             },
             "amenity/university": {
                 "name": "Universidade"
             },
             "amenity/waste_basket": {
-                "name": "Papeleira"
+                "name": "Papeleira",
+                "terms": "papeleira, lixo, basura"
             },
             "area": {
                 "name": "Área"
@@ -834,7 +893,7 @@
                 "name": "Bloque"
             },
             "barrier/bollard": {
-                "name": "Poste"
+                "name": "Bolardo"
             },
             "barrier/city_wall": {
                 "name": "Muralla"
@@ -860,26 +919,52 @@
             "barrier/wall": {
                 "name": "Muro"
             },
+            "boundary/administrative": {
+                "name": "Límite administrativo"
+            },
             "building": {
                 "name": "Edificio"
             },
-            "building/entrance": {
+            "building/cathedral": {
-                "name": "Entrada"
+                "name": "Catedral"
             },
-            "entrance": {
+            "building/chapel": {
-                "name": "Entrada"
+                "name": "Capela"
+            },
+            "building/church": {
+                "name": "Igrexa"
+            },
+            "building/construction": {
+                "name": "Edificio en construcción"
+            },
+            "building/garage": {
+                "name": "Garaxe"
+            },
+            "building/house": {
+                "name": "Casa"
+            },
+            "building/hut": {
+                "name": "Refuxio"
+            },
+            "emergency/phone": {
+                "name": "Teléfono de emerxencia"
+            },
+            "footway/sidewalk": {
+                "name": "Beirarrúa"
             },
             "highway": {
                 "name": "Estrada"
             },
             "highway/bridleway": {
-                "name": "Camiño cabalar"
+                "name": "Camiño de ferradura",
+                "terms": "camiño de ferradura, camiño de cabalos, senda ecuestre"
             },
             "highway/bus_stop": {
                 "name": "Parada de Autobús"
             },
             "highway/crossing": {
-                "name": "Paso de peóns"
+                "name": "Paso de peóns",
+                "terms": "paso peonil, paso peatonal, paso de cebra"
             },
             "highway/cycleway": {
                 "name": "Senda Ciclista"
@@ -894,19 +979,20 @@
                 "name": "Autovía"
             },
             "highway/motorway_link": {
-                "name": "Enlace de autovía"
+                "name": "Enlace de autovía",
+                "terms": "autovía, autopista, enlace, entrada, saída, acceso"
             },
             "highway/path": {
                 "name": "Camiño"
             },
             "highway/pedestrian": {
-                "name": "Vía peonil"
+                "name": "Rúa peonil"
             },
             "highway/primary": {
                 "name": "Estrada Primaria"
             },
             "highway/primary_link": {
-                "name": "Enlace de estrada primaria"
+                "name": "Enlace a estrada primaria"
             },
             "highway/residential": {
                 "name": "Rúa urbana"
@@ -918,7 +1004,7 @@
                 "name": "Estrada Secundaria"
             },
             "highway/secondary_link": {
-                "name": "Enlace de estrada secundaria"
+                "name": "Enlace a estrada secundaria"
             },
             "highway/service": {
                 "name": "Vía de Servicio"
@@ -930,7 +1016,7 @@
                 "name": "Estrada Terciaria"
             },
             "highway/tertiary_link": {
-                "name": "Enlace de estrada terciaria"
+                "name": "Enlace a estrada terciaria"
             },
             "highway/track": {
                 "name": "Pista"
@@ -942,7 +1028,7 @@
                 "name": "Estrada Troncal"
             },
             "highway/trunk_link": {
-                "name": "Enlace de estrada troncal"
+                "name": "Enlace a estrada troncal"
             },
             "highway/turning_circle": {
                 "name": "Círculo de Xiro"
@@ -956,6 +1042,10 @@
             "historic/archaeological_site": {
                 "name": "Sitio arqueolóxico"
             },
+            "historic/boundary_stone": {
+                "name": "Marco",
+                "terms": "marco, fito, mollón, mouteira, linde, pedra"
+            },
             "historic/castle": {
                 "name": "Castelo"
             },
@@ -999,7 +1089,7 @@
                 "name": "Granxa"
             },
             "landuse/forest": {
-                "name": "Bosque"
+                "name": "Forestal"
             },
             "landuse/grass": {
                 "name": "Herba"
@@ -1032,7 +1122,8 @@
                 "name": "Campo de Golf"
             },
             "leisure/park": {
-                "name": "Parque"
+                "name": "Parque",
+                "terms": "parque, zona verde, xardín, alameda"
             },
             "leisure/pitch": {
                 "name": "Campo Deportivo"
@@ -1052,6 +1143,9 @@
             "leisure/pitch/tennis": {
                 "name": "Cancha de Tenis"
             },
+            "leisure/pitch/volleyball": {
+                "name": "Cancha de voleibol"
+            },
             "leisure/playground": {
                 "name": "Parque Infantil"
             },
@@ -1076,12 +1170,18 @@
             "man_made/pier": {
                 "name": "Embarcadoiro"
             },
+            "man_made/pipeline": {
+                "name": "Tubería"
+            },
             "man_made/survey_point": {
                 "name": "Vértice Xeodésico"
             },
             "man_made/tower": {
                 "name": "Torre"
             },
+            "man_made/wastewater_plant": {
+                "name": "Depuradora de augas"
+            },
             "man_made/water_tower": {
                 "name": "Torre de auga"
             },
@@ -1101,7 +1201,8 @@
                 "name": "Cantil"
             },
             "natural/coastline": {
-                "name": "Liña de costa"
+                "name": "Liña de costa",
+                "terms": "liña de costa, costa, litoral, ribeira"
             },
             "natural/glacier": {
                 "name": "Glaciar"
@@ -1113,7 +1214,8 @@
                 "name": "Páramo"
             },
             "natural/peak": {
-                "name": "Cume"
+                "name": "Cume",
+                "terms": "pico, cume, montaña, monte, cúspide"
             },
             "natural/scrub": {
                 "name": "Matogueira"
@@ -1128,10 +1230,12 @@
                 "name": "Auga"
             },
             "natural/water/lake": {
-                "name": "Lago"
+                "name": "Lago",
+                "terms": "lago, lagoa, charca, auga"
             },
             "natural/water/pond": {
-                "name": "Estanque"
+                "name": "Estanque",
+                "terms": "auga, estanque, lagoa, charca"
             },
             "natural/water/reservoir": {
                 "name": "Encoro"
@@ -1149,13 +1253,14 @@
                 "name": "Lugar"
             },
             "place/city": {
-                "name": "Capital"
+                "name": "Cidade"
             },
             "place/hamlet": {
                 "name": "Aldea"
             },
             "place/island": {
-                "name": "Illa"
+                "name": "Illa",
+                "terms": "illa, isla, illote, insua"
             },
             "place/isolated_dwelling": {
                 "name": "Vivenda illada"
@@ -1175,15 +1280,42 @@
             "power": {
                 "name": "Rede eléctrica"
             },
+            "power/generator": {
+                "name": "Xerador de enerxía"
+            },
+            "power/line": {
+                "name": "Liña de alta tensión"
+            },
+            "power/pole": {
+                "name": "Poste eléctrico"
+            },
             "power/sub_station": {
                 "name": "Subestación"
             },
+            "power/tower": {
+                "name": "Torre de alta tensión"
+            },
+            "power/transformer": {
+                "name": "Transformador"
+            },
             "railway": {
                 "name": "Ferrocarril"
             },
+            "railway/abandoned": {
+                "name": "Ferrocarril abandonado"
+            },
+            "railway/disused": {
+                "name": "Ferrocarril en desuso"
+            },
             "railway/level_crossing": {
                 "name": "Paso a nivel"
             },
+            "railway/monorail": {
+                "name": "Monorraíl"
+            },
+            "railway/platform": {
+                "name": "Plataforma"
+            },
             "railway/rail": {
                 "name": "Vía de tren"
             },
@@ -1196,6 +1328,9 @@
             "railway/subway_entrance": {
                 "name": "Entrada de Metro"
             },
+            "railway/tram": {
+                "name": "Tranvía"
+            },
             "relation": {
                 "name": "Relación"
             },
@@ -1208,15 +1343,105 @@
             "shop/beauty": {
                 "name": "Salón de beleza"
             },
+            "shop/bicycle": {
+                "name": "Tenda de bicicletas"
+            },
             "shop/books": {
                 "name": "Librería"
             },
             "shop/butcher": {
                 "name": "Carnicería"
             },
+            "shop/car": {
+                "name": "Concesionario"
+            },
+            "shop/car_parts": {
+                "name": "Tenda de recambios de automóbiles"
+            },
+            "shop/car_repair": {
+                "name": "Taller de reparación de vehículos"
+            },
+            "shop/chemist": {
+                "name": "Droguería"
+            },
+            "shop/clothes": {
+                "name": "Tenda de roupa"
+            },
+            "shop/computer": {
+                "name": "Tenda de informática"
+            },
+            "shop/electronics": {
+                "name": "Tenda de electrodomésticos"
+            },
+            "shop/florist": {
+                "name": "Florería"
+            },
+            "shop/furniture": {
+                "name": "Tenda de mobles"
+            },
+            "shop/garden_centre": {
+                "name": "Centro de xardinería"
+            },
+            "shop/greengrocer": {
+                "name": "Froitería"
+            },
+            "shop/hairdresser": {
+                "name": "Perruquería"
+            },
+            "shop/hardware": {
+                "name": "Ferretería"
+            },
+            "shop/jewelry": {
+                "name": "Xoiería"
+            },
+            "shop/kiosk": {
+                "name": "Quiosco"
+            },
+            "shop/laundry": {
+                "name": "Lavandería"
+            },
+            "shop/mall": {
+                "name": "Centro comercial"
+            },
+            "shop/mobile_phone": {
+                "name": "Tenda de telefonía móvil"
+            },
+            "shop/motorcycle": {
+                "name": "Concesionario de motocicletas"
+            },
+            "shop/music": {
+                "name": "Tenda de música"
+            },
+            "shop/optician": {
+                "name": "Óptica"
+            },
+            "shop/pet": {
+                "name": "Tenda de mascotas"
+            },
+            "shop/shoes": {
+                "name": "Zapatería"
+            },
+            "shop/stationery": {
+                "name": "Papelería"
+            },
             "shop/supermarket": {
                 "name": "Supermercado"
             },
+            "shop/toys": {
+                "name": "Tenda de xoguetes"
+            },
+            "shop/travel_agency": {
+                "name": "Axencia de viaxes"
+            },
+            "shop/tyres": {
+                "name": "Tenda de neumáticos"
+            },
+            "shop/vacant": {
+                "name": "Local baleiro"
+            },
+            "shop/video": {
+                "name": "Videoclub"
+            },
             "tourism": {
                 "name": "Turismo"
             },
@@ -1239,7 +1464,8 @@
                 "name": "Chalé"
             },
             "tourism/guest_house": {
-                "name": "Hostal"
+                "name": "Hostal",
+                "terms": "hostal, pensión, hospedaxe, fonda, pousada, aloxamento, habitación"
             },
             "tourism/hostel": {
                 "name": "Albergue"
@@ -1271,12 +1497,24 @@
             "type/boundary": {
                 "name": "Límite"
             },
+            "type/boundary/administrative": {
+                "name": "Límite administrativo"
+            },
             "type/restriction": {
                 "name": "Restrición"
             },
             "type/route": {
                 "name": "Ruta"
             },
+            "type/route/bicycle": {
+                "name": "Ruta ciclista"
+            },
+            "type/route/bus": {
+                "name": "Ruta de autobús"
+            },
+            "vertex": {
+                "name": "Outro"
+            },
             "waterway": {
                 "name": "Vía de Auga"
             },
@@ -1293,13 +1531,15 @@
                 "name": "Cuneta"
             },
             "waterway/river": {
-                "name": "Río"
+                "name": "Río",
+                "terms": "río, regato, afluente, auga"
             },
             "waterway/riverbank": {
                 "name": "Ribeira do río"
             },
             "waterway/stream": {
-                "name": "Regato"
+                "name": "Regato",
+                "terms": "río, regato, rego, torrente, auga"
             },
             "waterway/weir": {
                 "name": "Presa"

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

@@ -77,8 +77,8 @@
         "orthogonalize": {
             "title": "Stavi pod pravi kut",
             "description": {
-                "line": "Stavi pod pravi kut uglove linije.",
+                "line": "Stavi pod pravi kut lomove linije.",
-                "area": "Stavi pod pravi kut uglove područja."
+                "area": "Stavi pod pravi kut ćoškove područja."
             },
             "key": "S",
             "annotation": {
@@ -339,11 +339,11 @@
         "help": "# Pomoć\n\niD je program za uređivanje [OpenStreetMap](http://www.openstreetmap.org/), \nbesplatne karte svijeta. Možeš ga koristiti za dodavanje i obnavljanje podataka u \nsvom području, čime stvaraš bolju kartu svijeta slobodnih izvornika i podataka \ndostupnu svima.\n\nKorekcije koje napraviš na karti će biti vidljive svakome tko koristi\nOpenStreetMap. Da bi mogao/la uređivati kartu, trebaš [besplatni\nOpenStreetMap korisnički račun](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) je suradnički projekt sa [izvornim kôdom dostupnim \nna GitHub-u](https://github.com/openstreetmap/iD).\n",
         "editing_saving": "# Uređivanje i spremanje promjena\n\nOvaj uređivač je primarno dizajniran za uređivanje na mreži i trenutačno ga\nkoristiš kroz internet preglednik kao web stranicu.\n\n### Odabir značajki\n\nZa odabir značajke karte, npr. ceste ili točke od interesa, klikni na nju na karti.\nPojaviti će se obrub oko značajke, otvoriti će se bočno okno koje prikazuje više\ndetalja o značajki i prikazati će se alatni izbornik sa mogućnostima koje možeš\nnapraviti na značajki.\n\nZa odabir nekoliko značajki istovremeno, drži tipku \"Shift\". Zatim ili klikni na\nznačajke koje želiš odabrati ili klikni i povuci za crtanje četverokuta. Time ćeš\nodabrati sve točke unutar četverokuta.\n\n### Spremanje uređivanja\n\nKada napraviš promjene na karti, npr. urediš ulice, zgrade i mjesta, one su\nspremljene lokalno sve dok ih ne spremiš na server. Nemoraš se briniti ukoliko\nnapraviš pogrešku - možeš poništiti promjene klikom na tipku \"Opovrgni\" i\nponoviti promjene klikom na tipku \"Ponovi\".\n\nKlikni na tipku \"Spremi\" da završiš grupu promjena - na primjer ako si završio/la\npodručje grada i želiš početi uređivati novo područje. Nakon što stisneš \"Spremi\"\nmoći ćeš pregledati sve promjene koje si napravio/la i uređivač će ti dati korisne\nprijedloge i upozorenja ako je nešto neuobičajeno među promjenama.\n\nAko je sve u redu, možeš ostaviti kratak komentar u kojem ćeš opisati napravljenu\npromjenu na karti. Ponovno klikni \"Spremi\" za postavljanje promjena na\n[OpenStreetMap.org](http://www.openstreetmap.org/), gdje će biti vidljive svim\ndrugim korisnicima i dostupne drugima za dopunu i nadogradnju.\n\nAko ne možeš završiti sve planirane promjene odjednom, možeš ugasiti prozor\nuređivača i kasnije se vratiti (na isti internet preglednik i isto računalo) i uređivač\nće ti ponuditi da nastaviš gdje si stao/la. \n",
         "roads": "# Ceste\n\nMožeš stvarati, popraviti/urediti i obrisati ceste pomoću ovog uređivača. Ceste\nmogu biti svih vrsta: puteljci, ceste, poljski putovi, biciklističke staze i drugo -\nsve staze preko kojih se često prolazi bi se trebale kartirati.\n\n### Odabir\n\nKlikni na cestu da ju odabereš. Pojaviti će se obrub oko ceste, zajedno s\nmalim alatnim izbornikom na karti i bočnim oknom koji prikazuje dodatne\ninformacije o selektiranoj cesti.\n\n### Uređivanje\n\nČesto ćeš vidjeti ceste koje se ne podudaraju s pozadinskim snimcima ili s\nGNSS tragom. Možeš urediti te ceste tako da se nalaze na ispravnom mjestu.\n\nPrvo klikni na cestu koju želiš urediti. To će ju označiti i prikazati kontrolne\ntočke unutar nje koje možeš premjestiti na točnije lokacije. Ako želiš dodati\nnove kontrolne točke za precizniju putanju, klikni dvoklikom na dio ceste gdje\nnema točke kako bi dodao/la novu.\n\nAko se cesta spaja s drugom cestom, ali nije ispravno spojena na karti, možeš\npovući kontrolnu točku na drugu cestu kako bi ih spojio/la. Spojene ceste su\nvrlo važne za kartu i osnova za omogućavanje uputa za navigaciju.\n\nTakođer možeš kliknuti alat \"Premjesti\" ili pritisnuti kraticu - tipku `M` za\npomak cijele ceste odjednom i zatim kliknuti ponovno za spremanje tog\npomaka.\n\n### Brisanje\n\nAko je cesta potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i ako\nsi utvrdio/la da zbilja ne postoji uvidom na terenu možeš ju obrisati, što će ju\nobrisati s karte. Budi oprezan/na kada brišeš značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je cesta nedavno sagrađena.\n\nZa brisanje ceste najprije ju označi, a zatim klikni na ikonicu kante za smeće ili\npritisni tipku \"Delete\".\n\n### Stvaranje\n\nAko si pronašao/la cestu koja bi trebala biti ucrtana ali nije, klikni ikonicu\n\"Linija\" na gornjem lijevom dijelu uređivača ili pritisni kraticu - tipku `2` da\nzapočneš crtanje linije.\n\nKlikni na početak ceste na karti da započneš crtanje. Ako se cesta odvaja od\npostojeće ceste, klikni na mjesto gdje se spajaju.\n\nZatim klikni na točke duž ceste tako da prate ispravnu putanju ceste, prema\npodacima satelitske snimke ili GNSS traga. Ako se cesta koju crtaš križa s\ndrugom cestom, spoji ih klikom na mjestu raskrižja. Kada si završio/la s\ncrtanjem, klikni dvoklikom sastrane ili pritisni tipku \"Return\" ili \"Enter\" na\ntipkovnici.\n",
-        "gps": "# GNSS\n\nPojam GNSS obuhvaća sve Globalne Navigacijske Satelitske Sustave, npr. američki Navstar GPS, ruski GLONASS, europski GALILEO, kineski BEIDOU. Suvremeni uređaji često koriste signale više sustava istovremeno za određivanje pozicije. GNSS podaci su najpouzdaniji izvor podataka za OpenStreetMap. Ovaj\nuređivač podržava lokalne tragove - `.gpx` datoteteke sa tvog računala.\nTakav oblik GNSS traga možeš prikupiti s raznim aplikacijama za pametne\ntelefone kao i sa drugim GNSS/GPS uređajima.\n\nZa više informacija o postupku izmjere pomoću GNSS satelita, pročitaj članak\n[\"Mjerenje sa GPS-om\"](http://learnosm.org/en/beginner/using-gps/).\n\nKako bi koristio GPX tragove za kartiranje, povuci i ispusti GPX datoteku\nna uređivač karte. Ako se datoteka ispravno učita, biti će dodana na kartu\nkao linija svjetlo zelene boje. Klikni na izbornik \"Postavke pozadine\" s\ndesne strane za uključivanje, isključivanje ili povećanje na taj novi GPX sloj.\n\nGPX trag nije direktno postavljen na OpenStreetMap, samo je prikazan na\nkarti. Da bi ga iskoristio/la na najbolji način, preko njega crtaj na\nkarti koristeći ga kao vodilju za dodavanje novih značajki. Trag možeš također\n[postaviti na OpenStreetMap](http://www.openstreetmap.org/trace/create)\nkako bi ga i drugi korisnici mogli koristiti.\n",
+        "gps": "# GNSS\n\nPojam GNSS obuhvaća sve \"Globalne Navigacijske Satelitske Sustave\", to su: američki Navstar GPS, ruski GLONASS, europski GALILEO i kineski BEIDOU. Suvremeni uređaji često koriste signale više sustava istovremeno za određivanje pozicije. GNSS podaci su najpouzdaniji izvor podataka za OpenStreetMap. Ovaj\nuređivač podržava lokalne tragove - `.gpx` datoteteke koje se nalaze na tvom računalu.\nTakav oblik GNSS traga možeš prikupiti s raznim aplikacijama za pametne\ntelefone kao i sa drugim GNSS/GPS uređajima.\n\nZa više informacija o postupku izmjere pomoću GNSS satelita, pročitaj članak\n[\"Mjerenje sa GPS-om\"](http://learnosm.org/en/beginner/using-gps/).\n\nKako bi koristio GPX tragove za kartiranje, povuci i ispusti GPX datoteku\nna uređivač karte. Ako se datoteka ispravno učita, biti će dodana na kartu\nkao linija svjetlo zelene boje. Klikni na izbornik \"Postavke pozadine\" s\ndesne strane za uključivanje, isključivanje ili povećanje na taj novi GPX sloj.\n\nGPX trag nije direktno postavljen na OpenStreetMap, samo je prikazan na\nkarti. Da bi ga iskoristio/la na najbolji način, preko njega crtaj na\nkarti koristeći ga kao vodilju za dodavanje novih značajki. Trag možeš također\n[postaviti na OpenStreetMap](http://www.openstreetmap.org/trace/create)\nkako bi ga i drugi korisnici mogli koristiti.\n",
         "imagery": "# Fotografski snimci\n\nZračni snimci su važan izvor za kartiranje. Kombinacija snimaka iz aviona,\nsatelitskih snimaka i drugih besplatno prikupljenih izvornika je dostupna s\ndesne strane u izborniku \"Postavke pozadine\".\n\nPočetno je u pozadini prikazan sloj satelitskih snimaka [karte Bing Maps](http://www.bing.com/maps/). Novi izvornici postaju dostupni pomicanjem\ni povećanjem karte na novo geografsko područje. Neke države, poput SAD-a,\nFrancuske i Danske imaju dostupne vrlo kvalitetne snimke za određena\npodručja.\n\nSnimke su ponekad pomaknute u odnosu na podatke karte zbog pogreške\nna koordinatama izvornih snimaka. Ako vidiš puno cesta izmaknutih u\nodnosu na pozadinu, nemoj ih odmah pomicati da se poklope sa pozadinom.\nUmjesto toga, možeš podesiti snimke da odgovaraju postojećim podacima\ntako da klikneš \"Popravi odstupanje\" na dnu izbornika \"Postavke pozadine\".\n",
         "addresses": "# Adrese\n\nAdrese spadaju u najkorisnije informacije na karti.\n\nIako su adrese često prikazane kao dio ulica, na OpenStreetMap karti su zapisane\nkao svojstva građevina i mjesta uzduž ulica.\n\nMožeš dodati informacije o adresi na mjesta kartirana kao rub građevine, ali i na\ngrađevine koje su kartirane kao točkasti objekt. Najbolji izvor podataka o adresama\nje prikupljanje podataka na terenu ili iz osobnog znanja - kao i svake druge\nznačajke, kopiranje sa komercijalnih izvora poput Google Maps servisa je strogo\nzabranjeno.\n",
         "inspector": "# Korištenje preglednika\n\nPreglednik je element korisničkog sučelja na lijevoj strani stranice koji se pojavljuje\nnakon što se neka značajka odabere i on omogućava uređivanje detalja značajke.\n\n### Odabir vrste značajke\n\nNakon što dodaš točku, liniju ili područje, možeš odabrati koje je vrste ta značajka,\nnpr. je li to državna cesta ili ulica, veletrgovina ili kafić.\n\nPreglednik će prikazati tipke za često korištene vrste značajki, a ostale možeš\npronaći upisivanjem naziva vrste koju tražiš u okvir za pretraživanje.\n\nKlikni na \"i\" na desnoj strani vrste značajke da saznaš više o toj značajki. Klikni na\ntipku sa imenom vrste da odabereš tu vrstu.\n\n### Korištenje obrazaca i oznaka\n\nNakon što odabereš vrstu značajke ili kada odabereš značajku koja već ima\ndefeniranu vrstu, preglednik će ti prikazati polja sa detaljima o značajki, npr.\nnjezino ime i adresu.\n\nIspod polja možeš kliknuti na ikone za dodavanje drugih detalja, kao informacije sa\n[Wikipedije](http://www.wikipedia.org/), pristup invalidskim kolicima i drugo.\n\nNa dnu preglednika, klikni na \"Sve oznake\" za dodavanje proizvoljnih drugih\noznaka za značajke. [Taginfo](http://taginfo.openstreetmap.org/) je izvrstan\nizvornik za učenje o popularnim kombinacijama oznaka koje se koriste.\n\nPromjene koje napraviš u pregledniku su automatski primijenjene na kartu.\n\nMožeš poništiti promjene u bilo kojem trenutku pritiskom na tipku \"Opovrgni\".\n",
-        "buildings": "# Građevine\n\nOpenStreetMap je najveća svjetska baza podataka o građevinama. Možeš\nstvarati i unaprijediti tu bazu podataka.\n\n### Odabir\n\nMožeš odabrati građevinu klikom na njezin rub. Pojaviti će se obrub oko\ngrađevine i otvoriti će se mali alatni izbornik i bočno okno koje prikazuje više\ninformacija o građevini.\n\n### Uređivanje\n\nPonekad su građevine neispravno pozicionirane ili imaju netočna svojstva.\n\nZa premještanje cijele građevine, odaberi ju, a zatim klikni alat \"Premjesti\".\nPomakom miša namjesti točnu lokaciju građevine i zatim klikni lijevu tipku\nmiša.\n\nZa ispravak oblika zgrade, klikni i povlači rubne točke građevine na ispravnije\nmjesto.\n\n### Stvaranje\n\nJedno od glavnih pitanja u vezi dodavanja građevina na kartu je kako ih dodati\n- kao područje ili kao točke. Pravilo je da se građevine _crtaju kao područje\nkada je god to moguće_, a označavanje tvrtki, kuća, kućnih brojeva, usluga i\ndrugih stvari za koje se građevine koriste kao točke koje se nalaze unutar\npovršine građevine.\n\nZapočni crtanje građevine kao površine klikom na tipku \"Površina\" u gornjem\nlijevom uglu sučelja, a po završetku crtanja građevine pritisni tipku \"Return\"\nna tipkovnici ili klikni na početnu točku za zatvaranje oblika.\n\n### Brisanje\n\nAko je građevina potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i\nako si utvrdio/la da zbilja ne postoji uvidom na terenu možeš ju obrisati, što će\nju obrisati s karte. Budi oprezan/na kada brišeš značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je građevina nedavno sagrađena.\n\nMožeš obrisati građevinu tako da klikneš na rub za selektiranje, a zatim\nklikneš na ikonu kante za smeće ili pritiskom tipke \"Delete\" na tipkovnici.\n",
+        "buildings": "# Građevine\n\nOpenStreetMap je najveća svjetska baza podataka o građevinama. Možeš\nstvarati i unaprijediti tu bazu podataka.\n\n### Odabir\n\nMožeš odabrati građevinu klikom na njezin rub. Pojaviti će se obrub oko\ngrađevine i otvoriti će se mali alatni izbornik i bočno okno koje prikazuje više\ninformacija o građevini.\n\n### Uređivanje\n\nPonekad su građevine neispravno pozicionirane ili imaju netočna svojstva.\n\nZa premještanje cijele građevine, odaberi ju, a zatim klikni alat \"Premjesti\".\nPomakom miša namjesti točnu lokaciju građevine i zatim klikni lijevu tipku\nmiša.\n\nZa ispravak oblika zgrade, klikni i povlači rubne točke građevine na ispravnije\nmjesto.\n\n### Stvaranje\n\nJedno od glavnih pitanja u vezi dodavanja građevina na kartu je kako ih dodati\n- kao područje ili kao točke. Pravilo je da se građevine _crtaju kao područje\nkada je god to moguće_, a označavanje tvrtki, kuća, kućnih brojeva, usluga i\ndrugih stvari za koje se građevine koriste kao točke koje se nalaze unutar\npovršine građevine.\n\nZapočni crtanje građevine kao površine klikom na tipku \"Površina\" u gornjem\nlijevom kutu sučelja, a po završetku crtanja građevine pritisni tipku \"Return\"\nna tipkovnici ili klikni na početnu točku za zatvaranje oblika.\n\n### Brisanje\n\nAko je građevina potpuno krivo ucrtana - ne vidi se na satelitskim snimkama i\nako si utvrdio/la da zbilja ne postoji uvidom na terenu možeš ju obrisati, što će\nju obrisati s karte. Budi oprezan/na kada brišeš značajke - kao i kod svakog\ndrugog uređivanja rezultati su vidljivi svima, a satelitske snimke su često\nzastarjele, pa je moguće da je građevina nedavno sagrađena.\n\nMožeš obrisati građevinu tako da klikneš na rub za selektiranje, a zatim\nklikneš na ikonu kante za smeće ili pritiskom tipke \"Delete\" na tipkovnici.\n",
         "relations": "# Relacije\n\nRelacija je poseban oblik značajki na OpenStreetMap karti koja grupira druge\nznačajke. Na primjer, dvije često korištene relacije su *cestovne relacije*, koje\nmeđusobno grupiraju dijelove cesta koje zajedno pripadaju državnoj ili\nžupanijskoj cesti i *multipoligoni*, koji međusobno grupiraju nekoliko linija\nkoje definiraju složena područja (koja se sastoje od  više područja ili ona koja\nimaju rupu u sebi poput krafne).\n\nSkupine značajki u relaciji se nazivaju *članovi*. U bočnom oknu možeš vidjeti\nkojim sve relacijama značajka pripada i tamo kliknuti na relaciju kako bi ju\nodabrao/la. Kada je relacija odabrana možeš vidjeti sve njezine članove koji su\noznačeni na karti i izlistani u bočnom oknu.\n\niD će uglavnom automatski održavati relacije dok ti uređuješ kartu. Glavna\nstvar koje moraš biti svjestan/na je da ako obrišeš dio ceste da ju nacrtaš\npreciznije, trebaš provjeriti da je i novi dio član istih relacija kao i originalni\ndio.\n\n## Uređivanje relacija\n\nAko želiš uređivati relacije, ovdje su navedene osnove.\n\nZa dodavanje značajke nekoj relaciji, označi značajku, klikni tipku \"+\" u odjeljku\n\"Sve relacije\" na dnu bočnog okna i odaberi ili upiši ime relacije.\n\nZa stvaranje nove relacije, odaberi prvu značajku koja bi trebala biti član,\nzatim klikni tipku \"+\" u odjeljku \"Sve relacije\" i odaberi \"Nova relacija...\".\n\nZa odstranjivanje značajke iz relacije, odaberi značajku i klikni ikonu kante za\nsmeće pokraj relacije iz koje ju želiš ukloniti.\n\nMožeš stvarati višestruke poligone - multipoligone sa rupama pomoću alata\n\"Spoji\". Nacrtaj dva područja (unutarnje i vanjsko), drži tipku Shift i klikni na\noba područja kako bi ih selektirao/la i zatim klikni na tipku \"Spoji\" (+).\n"
     },
     "intro": {
@@ -352,7 +352,7 @@
             "drag": "Glavno područje karte prikazuje OpenStreetMap podatke iznad pozadine. Možeš mijenjati pogled povlačeći i pomičući, kao na svakoj drugoj web karti. **Pomakni prikaz karte!**",
             "select": "Značajke karte su prikazane na tri načina: koristeći točke, linije ili područja. Sve značajke mogu se odabrati klikom na njih. **Klikni na točku kako bi ju odabrao/la.**",
             "header": "Zaglavlje nam pokazuje tip svojstva.",
-            "pane": "Kada je značajka odabrana, prikazan je uređivač svojstava. Zaglavlje prikazuje tip značajke, a glavni prozor prikazuje njegova svojstva npr. naziv i adresu. **Zatvori uređivač svojstava sa gumbom x u gornjem desnom uglu.**"
+            "pane": "Kada je značajka odabrana, prikazan je uređivač svojstava. Zaglavlje prikazuje tip značajke, a glavni prozor prikazuje njegova svojstva npr. naziv i adresu. **Zatvori uređivač svojstava sa gumbom x u gornjem desnom kutu.**"
         },
         "points": {
             "title": "Točke",
@@ -1224,9 +1224,6 @@
             "building/detached": {
                 "name": "Samostojni dom"
             },
-            "building/entrance": {
-                "name": "Ulaz"
-            },
             "building/garage": {
                 "name": "Garaža"
             },
@@ -1372,9 +1369,6 @@
             "emergency/phone": {
                 "name": "Telefon za nuždu"
             },
-            "entrance": {
-                "name": "Ulaz"
-            },
             "golf/rough": {
                 "name": "Grubo"
             },

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

@@ -71,7 +71,8 @@
                 "line": "Vonal köralakúvá tétele.",
                 "area": "Terület köralakúvá tétele."
             },
-            "not_closed": "Nem lehet köralakúvá tenni, mert nem hurok."
+            "not_closed": "Nem lehet köralakúvá tenni, mert nem hurok.",
+            "too_large": "Nem lehet körré igazítani, mert nem látszik az egész alakzat."
         },
         "orthogonalize": {
             "title": "Szögletesít",
@@ -84,7 +85,8 @@
                 "line": "Vonal sarkainak szögletesítése.",
                 "area": "Terület sarkainak szögletesítése."
             },
-            "not_squarish": "Nem lehet szögletesíteni, mert nem szögletes."
+            "not_squarish": "Nem lehet szögletesíteni, mert nem szögletes.",
+            "too_large": "Nem lehet négyszögesíteni, mert nem látszik az egész alakzat."
         },
         "straighten": {
             "title": "Kiegyenesít",
@@ -134,7 +136,8 @@
             "annotation": "{n} vonal egyesítve.",
             "not_eligible": "Az elemek nem egyesíthetőek.",
             "not_adjacent": "A vonalak nem egyesíthetőek, mert nincsenek összekapcsolva.",
-            "restriction": "A vonalak nem egyesíthetőek, mert legalább az egyikük egy \"{relation}\" kapcsolat tagja."
+            "restriction": "A vonalak nem egyesíthetőek, mert legalább az egyikük egy \"{relation}\" kapcsolat tagja.",
+            "incomplete_relation": "Nem sikerült az egyesítés, mert legalább egy elem nincs teljesen letöltve."
         },
         "move": {
             "title": "Mozgatás",
@@ -264,6 +267,8 @@
         "percent_brightness": "{opacity}% fényerő",
         "none": "Nincs",
         "custom": "Egyéni",
+        "custom_button": "Egyedi háttér szerkesztése",
+        "custom_prompt": "Adj meg egy csempe URL sablont. Érvényes tokenek: {z}, {x}, {y} a Z/X/Y rendszerű URL-ekhez és {u} a kvadratikusakhoz.",
         "fix_misalignment": "Eltolódás korrigálása",
         "reset": "visszavonás"
     },
@@ -394,6 +399,9 @@
             "category-building": {
                 "name": "Épület"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Területfunkció"
             },
@@ -567,6 +575,9 @@
             "description": {
                 "label": "Leírás"
             },
+            "electrified": {
+                "label": "Villamosítottság"
+            },
             "elevation": {
                 "label": "Tengerszint feletti magasság"
             },
@@ -589,6 +600,9 @@
             "fixme": {
                 "label": "JavítsKi"
             },
+            "fuel": {
+                "label": "Üzemanyag"
+            },
             "generator/method": {
                 "label": "Módszer"
             },
@@ -707,6 +721,18 @@
             "railway": {
                 "label": "Típus"
             },
+            "recycling/cans": {
+                "label": "Fémhulladékot elfogad"
+            },
+            "recycling/clothes": {
+                "label": "Használt ruhát elfogad"
+            },
+            "recycling/glass": {
+                "label": "Üveget elfogad"
+            },
+            "recycling/paper": {
+                "label": "Papírt elfogad"
+            },
             "ref": {
                 "label": "Azonosító"
             },
@@ -737,6 +763,9 @@
             "sac_scale": {
                 "label": "Ösvény nehézsége"
             },
+            "seasonal": {
+                "label": "Időszakos"
+            },
             "service": {
                 "label": "Típus"
             },
@@ -749,12 +778,18 @@
             "shop": {
                 "label": "Típus"
             },
+            "smoking": {
+                "label": "Dohányzó"
+            },
             "source": {
                 "label": "Forrás"
             },
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Szerkezet",
                 "placeholder": "Ismeretlen",
@@ -765,6 +800,9 @@
                     "cutting": "Bevágás"
                 }
             },
+            "studio_type": {
+                "label": "Típus"
+            },
             "supervised": {
                 "label": "Felügyelt"
             },
@@ -789,6 +827,12 @@
             "tree_type": {
                 "label": "Típus"
             },
+            "trees": {
+                "label": "Fák"
+            },
+            "tunnel": {
+                "label": "Alagút"
+            },
             "vending": {
                 "label": "Termékek típusa"
             },
@@ -933,12 +977,28 @@
             "amenity/cinema": {
                 "name": "Mozi"
             },
+            "amenity/clinic": {
+                "name": "Klinika",
+                "terms": "Klinika, Rendelőintézet"
+            },
+            "amenity/clock": {
+                "name": "Óra",
+                "terms": "Óra"
+            },
             "amenity/college": {
                 "name": "Főiskola"
             },
             "amenity/courthouse": {
                 "name": "Bíróság"
             },
+            "amenity/dentist": {
+                "name": "Fogorvos",
+                "terms": "Fogorvos, Fogász, Fogászat"
+            },
+            "amenity/doctor": {
+                "name": "Orvos",
+                "terms": "Orvos, Doktor"
+            },
             "amenity/drinking_water": {
                 "name": "Ivóvíz"
             },
@@ -960,6 +1020,12 @@
             "amenity/grave_yard": {
                 "name": "Sírkert"
             },
+            "amenity/hospital": {
+                "name": "Kórház"
+            },
+            "amenity/kindergarten": {
+                "name": "Óvoda"
+            },
             "amenity/library": {
                 "name": "Könyvtár"
             },
@@ -1010,10 +1076,21 @@
             "amenity/restaurant": {
                 "name": "Étterem"
             },
+            "amenity/school": {
+                "name": "Iskola"
+            },
             "amenity/shelter": {
                 "name": "Menedék",
                 "terms": "fedett, fedél, esőház, esőkunyhó, menedékház"
             },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Hajléktalan menedék",
+                "terms": "Hajléktalan menedék"
+            },
+            "amenity/studio": {
+                "name": "Stúdió",
+                "terms": "Stúdió"
+            },
             "amenity/swimming_pool": {
                 "name": "Úszómedence"
             },
@@ -1039,6 +1116,10 @@
                 "name": "Árusító automata",
                 "terms": "italautomata, italgép"
             },
+            "amenity/veterinary": {
+                "name": "Állatorvos",
+                "terms": "Állatorvos, Állatorvosi rendelő"
+            },
             "amenity/waste_basket": {
                 "name": "Szemetes"
             },
@@ -1106,15 +1187,60 @@
             "building/apartments": {
                 "name": "Lakások"
             },
+            "building/barn": {
+                "name": "Pajta",
+                "terms": "Pajta"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker"
+            },
+            "building/cabin": {
+                "name": "Faház",
+                "terms": "Faház"
+            },
+            "building/cathedral": {
+                "name": "Katedrális",
+                "terms": "Katedrális, Székesegyház"
+            },
+            "building/chapel": {
+                "name": "Kápolna",
+                "terms": "Kápolna, Imaház"
+            },
+            "building/church": {
+                "name": "Templom",
+                "terms": "Templom, Plébánia, Imaház"
+            },
             "building/commercial": {
                 "name": "Kereskedelmi épület"
             },
-            "building/entrance": {
+            "building/construction": {
-                "name": "Bejárat"
+                "name": "Ház építés alatt",
+                "terms": "Ház építés alatt"
+            },
+            "building/dormitory": {
+                "name": "Kollégium",
+                "terms": "Kollégium, Diákszálló, Diákotthon"
             },
             "building/garage": {
                 "name": "Garázs"
             },
+            "building/garages": {
+                "name": "Garazsak",
+                "terms": "Garazsak"
+            },
+            "building/greenhouse": {
+                "name": "Üvegház",
+                "terms": "Üvegház"
+            },
+            "building/hospital": {
+                "name": "Kórházi épület",
+                "terms": "Kórházi épület"
+            },
+            "building/hotel": {
+                "name": "Hotel épület",
+                "terms": "Hotel épület"
+            },
             "building/house": {
                 "name": "Ház"
             },
@@ -1125,10 +1251,122 @@
                 "name": "Ipari épület",
                 "terms": "Gyárépület"
             },
+            "building/public": {
+                "name": "Nyilvános épület",
+                "terms": "Nyilvános épület"
+            },
             "building/residential": {
                 "name": "Lakóépület",
                 "terms": "Lakóház, lakás, ház"
             },
+            "building/roof": {
+                "name": "Tető",
+                "terms": "Tető"
+            },
+            "building/school": {
+                "name": "Iskolaépület",
+                "terms": "Iskolaépület"
+            },
+            "building/shed": {
+                "name": "Kunyhó",
+                "terms": "Kunyhó, Fészer, Pajta"
+            },
+            "building/terrace": {
+                "name": "Sorház",
+                "terms": "Sorház"
+            },
+            "building/train_station": {
+                "name": "Vasútállomás",
+                "terms": "Vasútállomás, Vasúti megálló"
+            },
+            "building/university": {
+                "name": "Egyetemi épület",
+                "terms": "Egyetemi épület"
+            },
+            "building/warehouse": {
+                "name": "Raktár",
+                "terms": "Raktár, Lerakat"
+            },
+            "craft/basket_maker": {
+                "name": "Kosárfonó",
+                "terms": "Kosárfonó"
+            },
+            "craft/beekeeper": {
+                "name": "Méhész",
+                "terms": "Méhész"
+            },
+            "craft/blacksmith": {
+                "name": "Patkolókovács",
+                "terms": "Patkolókovács"
+            },
+            "craft/boatbuilder": {
+                "name": "Hajógyáros",
+                "terms": "Hajógyáros"
+            },
+            "craft/bookbinder": {
+                "name": "Könyvkötő",
+                "terms": "Könyvkötő"
+            },
+            "craft/brewery": {
+                "name": "Sörfőzde",
+                "terms": "Sörfőzde, Sörfőző"
+            },
+            "craft/carpenter": {
+                "name": "Asztalos",
+                "terms": "Asztalos, Ács"
+            },
+            "craft/electrician": {
+                "name": "Villanyszerelő",
+                "terms": "Villanyszerelő"
+            },
+            "craft/gardener": {
+                "name": "Kertész",
+                "terms": "Kertész"
+            },
+            "craft/insulator": {
+                "name": "Szigetelő",
+                "terms": "Szigetelő"
+            },
+            "craft/jeweler": {
+                "name": "Ékszerész",
+                "terms": "Ékszerész, Ékszeres"
+            },
+            "craft/key_cutter": {
+                "name": "Kulcsos",
+                "terms": "Kulcsos, Kulcskészítő, Kulcsmásoló"
+            },
+            "craft/optician": {
+                "name": "Szemész",
+                "terms": "Szemész"
+            },
+            "craft/painter": {
+                "name": "Festő",
+                "terms": "Festő, Festőművész"
+            },
+            "craft/photographer": {
+                "name": "Fotós",
+                "terms": "Fotós, Fotográfus"
+            },
+            "craft/photographic_laboratory": {
+                "name": "Fotólabor",
+                "terms": "Fotólabor"
+            },
+            "craft/shoemaker": {
+                "name": "Cipész",
+                "terms": "Cipész, Cipőkészítő"
+            },
+            "craft/sweep": {
+                "name": "Kéményseprő",
+                "terms": "Kéményseprő"
+            },
+            "craft/tailor": {
+                "name": "Szabó",
+                "terms": "Szabó"
+            },
+            "craft/watchmaker": {
+                "name": "Órás",
+                "terms": "Órás"
+            },
             "embankment": {
                 "name": "Töltés"
             },
@@ -1142,9 +1380,6 @@
             "emergency/phone": {
                 "name": "Segélykérő telefon"
             },
-            "entrance": {
-                "name": "Bejárat"
-            },
             "footway/crossing": {
                 "name": "Kereszteződés"
             },
@@ -1323,6 +1558,10 @@
             "landuse/meadow": {
                 "name": "Rét"
             },
+            "landuse/military": {
+                "name": "Katonai",
+                "terms": "Katonai, Honvédségi"
+            },
             "landuse/orchard": {
                 "name": "Gyümölcsös"
             },
@@ -1348,6 +1587,10 @@
                 "name": "Kutyafuttató",
                 "terms": "Kutyasétáltató"
             },
+            "leisure/firepit": {
+                "name": "Tűzrakó hely",
+                "terms": "Tűzrakó hely"
+            },
             "leisure/garden": {
                 "name": "Kert"
             },
@@ -1360,6 +1603,10 @@
             "leisure/park": {
                 "name": "Park"
             },
+            "leisure/picnic_table": {
+                "name": "Piknikasztal",
+                "terms": "Piknikasztal"
+            },
             "leisure/pitch": {
                 "name": "Sportpálya"
             },
@@ -1619,6 +1866,10 @@
             "place/locality": {
                 "name": "Lakatlan hely"
             },
+            "place/neighbourhood": {
+                "name": "Környék",
+                "terms": "Környék, Negyed"
+            },
             "place/town": {
                 "name": "Város"
             },
@@ -1669,6 +1920,10 @@
             "railway/disused": {
                 "name": "Használaton kívüli vasút"
             },
+            "railway/funicular": {
+                "name": "Sikló",
+                "terms": "Sikló, Siklóvasút"
+            },
             "railway/halt": {
                 "name": "Vasúti megállóhely",
                 "terms": "megállóhely"
@@ -1679,6 +1934,10 @@
             "railway/monorail": {
                 "name": "Egysínű vasút"
             },
+            "railway/narrow_gauge": {
+                "name": "Kisvasút",
+                "terms": "Kisvasút, Keskeny nyomközű vasút"
+            },
             "railway/platform": {
                 "name": "Vasúti platform"
             },

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

@@ -866,9 +866,6 @@
             "building/apartments": {
                 "name": "Apartemen"
             },
-            "building/entrance": {
-                "name": "Masuk"
-            },
             "building/garage": {
                 "name": "Garasi"
             },
@@ -878,9 +875,6 @@
             "emergency/phone": {
                 "name": "Telepon Darurat"
             },
-            "entrance": {
-                "name": "Pintu Masuk"
-            },
             "highway": {
                 "name": "Jalan Raya"
             },

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

@@ -480,6 +480,9 @@
             "country": {
                 "label": "Land"
             },
+            "crop": {
+                "label": "Uppskera"
+            },
             "crossing": {
                 "label": "Tegund"
             },
@@ -514,12 +517,18 @@
             "fixme": {
                 "label": "Lagaðu mig"
             },
+            "fuel": {
+                "label": "Eldsneyti"
+            },
             "highway": {
                 "label": "Tegund"
             },
             "historic": {
                 "label": "Tegund"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -611,6 +620,18 @@
             "railway": {
                 "label": "Tegund"
             },
+            "recycling/cans": {
+                "label": "Tekur við dósum"
+            },
+            "recycling/clothes": {
+                "label": "Tekur við fötum"
+            },
+            "recycling/glass": {
+                "label": "Tekur við gleri"
+            },
+            "recycling/paper": {
+                "label": "Tekur við pappír"
+            },
             "ref": {
                 "label": "Heimildir"
             },
@@ -641,6 +662,9 @@
             "sac_scale": {
                 "label": "Erfiðleikastig"
             },
+            "seasonal": {
+                "label": "Árstíðabundið"
+            },
             "service": {
                 "label": "Tegund"
             },
@@ -650,12 +674,18 @@
             "shop": {
                 "label": "Tegund"
             },
+            "smoking": {
+                "label": "Reykingar"
+            },
             "source": {
                 "label": "Uppruni"
             },
             "sport": {
                 "label": "Íþrótt"
             },
+            "sport_ice": {
+                "label": "Íþrótt"
+            },
             "structure": {
                 "label": "Mannvirki",
                 "placeholder": "Óþekkt",
@@ -684,6 +714,12 @@
             "trail_visibility": {
                 "label": "Sýnileiki"
             },
+            "trees": {
+                "label": "Tré"
+            },
+            "tunnel": {
+                "label": "Göng"
+            },
             "water": {
                 "label": "Tegund"
             },
@@ -729,7 +765,8 @@
                 "name": "Flugskýli"
             },
             "aeroway/helipad": {
-                "name": "Þyrlupallur"
+                "name": "Þyrlupallur",
+                "terms": "lendingarpallur"
             },
             "aeroway/runway": {
                 "name": "Flugbraut"
@@ -747,11 +784,15 @@
                 "name": "Hraðbanki"
             },
             "amenity/bank": {
-                "name": "Banki"
+                "name": "Banki",
+                "terms": "fjármálastofnun"
             },
             "amenity/bar": {
                 "name": "Knæpa"
             },
+            "amenity/bbq": {
+                "name": "Grill"
+            },
             "amenity/bench": {
                 "name": "Bekkur"
             },
@@ -762,7 +803,8 @@
                 "name": "Hjólaleiga"
             },
             "amenity/cafe": {
-                "name": "Kaffihús"
+                "name": "Kaffihús",
+                "terms": "tehús"
             },
             "amenity/car_rental": {
                 "name": "Bílaleiga"
@@ -770,8 +812,15 @@
             "amenity/car_wash": {
                 "name": "Bílaþvottur"
             },
+            "amenity/childcare": {
+                "name": "Barnagæsla"
+            },
             "amenity/cinema": {
-                "name": "Kvikmyndahús"
+                "name": "Kvikmyndahús",
+                "terms": "bíó"
+            },
+            "amenity/clock": {
+                "name": "Klukka"
             },
             "amenity/college": {
                 "name": "Háskóli"
@@ -800,17 +849,30 @@
             "amenity/grave_yard": {
                 "name": "Grafreitur"
             },
+            "amenity/hospital": {
+                "name": "Spítalalóð"
+            },
+            "amenity/kindergarten": {
+                "name": "Leikskólalóð"
+            },
             "amenity/library": {
                 "name": "Bókasafn"
             },
             "amenity/marketplace": {
                 "name": "Markaður"
             },
+            "amenity/nightclub": {
+                "name": "Næturklúbbur"
+            },
+            "amenity/parking": {
+                "name": "Bílastæði"
+            },
             "amenity/pharmacy": {
                 "name": "Lyfjaverslun"
             },
             "amenity/place_of_worship": {
-                "name": "Tilbeiðsluhús"
+                "name": "Tilbeiðsluhús",
+                "terms": "musteri, kirkja, kapella, bænahús"
             },
             "amenity/place_of_worship/buddhist": {
                 "name": "Búddistamusteri"
@@ -822,10 +884,12 @@
                 "name": "Bænahús gyðinga"
             },
             "amenity/place_of_worship/muslim": {
-                "name": "Moska"
+                "name": "Moska",
+                "terms": "bænahús múslima"
             },
             "amenity/police": {
-                "name": "Lögregla"
+                "name": "Lögregla",
+                "terms": "löggan"
             },
             "amenity/post_box": {
                 "name": "Póstkassi"
@@ -839,6 +903,15 @@
             "amenity/restaurant": {
                 "name": "Veitingahús"
             },
+            "amenity/school": {
+                "name": "Skólalóð"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Mataraðstoð"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Athvarf heimilislausra"
+            },
             "amenity/swimming_pool": {
                 "name": "Sundlaug"
             },
@@ -860,6 +933,9 @@
             "amenity/university": {
                 "name": "Háskóli"
             },
+            "amenity/veterinary": {
+                "name": "Dýralæknir"
+            },
             "amenity/waste_basket": {
                 "name": "Ruslafata"
             },
@@ -926,14 +1002,39 @@
             "building/apartments": {
                 "name": "Íbúðir"
             },
+            "building/barn": {
+                "name": "Hlaða"
+            },
+            "building/bunker": {
+                "name": "Byrgi"
+            },
+            "building/cabin": {
+                "name": "Sumarhús",
+                "terms": "Sumarbústaður, kofi"
+            },
+            "building/cathedral": {
+                "name": "Dómkirkja"
+            },
+            "building/chapel": {
+                "name": "Kapella"
+            },
+            "building/church": {
+                "name": "Kirkja"
+            },
             "building/commercial": {
                 "name": "Atvinnuhúsnæði"
             },
             "building/construction": {
                 "name": "Á byggingarstigi"
             },
-            "building/entrance": {
+            "building/dormitory": {
-                "name": "Inngangur"
+                "name": "Heimavist"
+            },
+            "building/garage": {
+                "name": "Bílskúr"
+            },
+            "building/garages": {
+                "name": "Bílskúrar"
             },
             "building/hospital": {
                 "name": "Sjúkrahúsbygging"
@@ -944,6 +1045,9 @@
             "building/house": {
                 "name": "Einbýlishús"
             },
+            "building/hut": {
+                "name": "Kofi"
+            },
             "building/industrial": {
                 "name": "Iðnaðarhúsnæði"
             },
@@ -956,24 +1060,79 @@
             "building/retail": {
                 "name": "Verslunarhúsnæði"
             },
+            "building/roof": {
+                "name": "Þak"
+            },
             "building/school": {
                 "name": "Skólabygging"
             },
+            "building/shed": {
+                "name": "Skúr",
+                "terms": "garðskáli"
+            },
+            "building/static_caravan": {
+                "name": "Staðfast hjólhýsi"
+            },
+            "building/terrace": {
+                "name": "Raðhús"
+            },
+            "building/train_station": {
+                "name": "Lestarstöð"
+            },
             "building/university": {
                 "name": "Háskólabygging"
             },
+            "building/warehouse": {
+                "name": "Vöruhús"
+            },
+            "craft/dressmaker": {
+                "name": "Kjólasaumari"
+            },
+            "craft/electrician": {
+                "name": "Rafvirki"
+            },
+            "craft/gardener": {
+                "name": "Garðyrkjumaður"
+            },
+            "craft/jeweler": {
+                "name": "Skartgripasali"
+            },
+            "craft/key_cutter": {
+                "name": "Lyklaþjónusta"
+            },
+            "craft/locksmith": {
+                "name": "Lyklasmiður"
+            },
+            "craft/optician": {
+                "name": "Gleraugnasali"
+            },
+            "craft/painter": {
+                "name": "Málari"
+            },
             "craft/photographer": {
                 "name": "Ljósmyndari"
             },
+            "craft/plumber": {
+                "name": "Pípari"
+            },
+            "craft/shoemaker": {
+                "name": "Skósmiður"
+            },
+            "craft/tailor": {
+                "name": "Skraddari"
+            },
+            "craft/upholsterer": {
+                "name": "Bólstrari"
+            },
+            "craft/watchmaker": {
+                "name": "Úrsmiður"
+            },
             "emergency/ambulance_station": {
                 "name": "Sjúkrabílastöð"
             },
             "emergency/phone": {
                 "name": "Neyðarsími"
             },
-            "entrance": {
-                "name": "Inngangur"
-            },
             "highway": {
                 "name": "Þjóðvegur"
             },
@@ -1022,6 +1181,9 @@
             "highway/residential": {
                 "name": "Íbúagata"
             },
+            "highway/rest_area": {
+                "name": "Hvíldarsvæði"
+            },
             "highway/road": {
                 "name": "Óþekktur vegur"
             },
@@ -1041,7 +1203,8 @@
                 "name": "Afgreiðslulúga"
             },
             "highway/service/driveway": {
-                "name": "Innkeyrsla"
+                "name": "Innkeyrsla",
+                "terms": "Heimreið"
             },
             "highway/service/emergency_access": {
                 "name": "Neyðaraðgangur"
@@ -1049,6 +1212,9 @@
             "highway/service/parking_aisle": {
                 "name": "Bílastæðagangur"
             },
+            "highway/services": {
+                "name": "Þjónustusvæði"
+            },
             "highway/steps": {
                 "name": "Tröppur"
             },
@@ -1136,9 +1302,16 @@
             "landuse/industrial": {
                 "name": "Iðnaðarsvæði"
             },
+            "landuse/landfill": {
+                "name": "Landfylling"
+            },
             "landuse/meadow": {
                 "name": "Engi"
             },
+            "landuse/military": {
+                "name": "Hersvæði",
+                "terms": "herstöð, æfingasvæði"
+            },
             "landuse/orchard": {
                 "name": "Aldingarður"
             },
@@ -1160,12 +1333,18 @@
             "leisure/dog_park": {
                 "name": "Hundagarður"
             },
+            "leisure/firepit": {
+                "name": "Eldstæði"
+            },
             "leisure/garden": {
                 "name": "Garður"
             },
             "leisure/golf_course": {
                 "name": "Golfvöllur"
             },
+            "leisure/ice_rink": {
+                "name": "Skautasvell"
+            },
             "leisure/marina": {
                 "name": "Bátahöfn"
             },
@@ -1322,6 +1501,9 @@
             "place/locality": {
                 "name": "Staðfesti"
             },
+            "place/neighbourhood": {
+                "name": "Hverfi"
+            },
             "place/town": {
                 "name": "Bær"
             },
@@ -1334,6 +1516,9 @@
             "power": {
                 "name": "Orka"
             },
+            "power/generator": {
+                "name": "Aflstöð"
+            },
             "power/line": {
                 "name": "Orkulína"
             },
@@ -1358,6 +1543,9 @@
             "railway/disused": {
                 "name": "Ónotaðir lestarteinar"
             },
+            "railway/funicular": {
+                "name": "Toglest"
+            },
             "railway/level_crossing": {
                 "name": "Jöfn vegamót"
             },
@@ -1394,6 +1582,9 @@
             "shop/alcohol": {
                 "name": "Vínbúð"
             },
+            "shop/art": {
+                "name": "Listverslun"
+            },
             "shop/bakery": {
                 "name": "Bakarí"
             },
@@ -1406,6 +1597,9 @@
             "shop/bicycle": {
                 "name": "Hjólabúð"
             },
+            "shop/bookmaker": {
+                "name": "Veðmangari"
+            },
             "shop/books": {
                 "name": "Bóksala"
             },
@@ -1463,6 +1657,9 @@
             "shop/florist": {
                 "name": "Blómabúð"
             },
+            "shop/funeral_directors": {
+                "name": "Útfararheimili"
+            },
             "shop/furniture": {
                 "name": "Húsgagnaverslun"
             },
@@ -1517,6 +1714,10 @@
             "shop/pet": {
                 "name": "Dýrabúð"
             },
+            "shop/seafood": {
+                "name": "Fiskverslu",
+                "terms": "verslun með sjávarfang"
+            },
             "shop/shoes": {
                 "name": "Skóbúð"
             },

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

@@ -212,7 +212,7 @@
     "commit": {
         "title": "Salva le modifiche",
         "description_placeholder": "Una breve descrizione delle tue modifiche",
-        "message_label": "Messaggio di invio",
+        "message_label": "Commento",
         "upload_explanation": "Le modifiche che carichi saranno visibili su tutte le mappe che usano i dati di OpenStreetMap.",
         "upload_explanation_with_user": "Le modifiche che carichi come {user} saranno visibili su tutte le mappe che usano i dati di OpenStreetMap.",
         "save": "Salva",
@@ -607,6 +607,9 @@
             "fixme": {
                 "label": "Sistemare"
             },
+            "fuel": {
+                "label": "Carburante"
+            },
             "gauge": {
                 "label": "Scartamento"
             },
@@ -634,6 +637,7 @@
                 "label": "Tipo"
             },
             "hoops": {
+                "label": "Canestri",
                 "placeholder": "1, 2, 4..."
             },
             "iata": {
@@ -740,6 +744,9 @@
             "place": {
                 "label": "Tipo"
             },
+            "population": {
+                "label": "Popolazione"
+            },
             "power": {
                 "label": "Tipo"
             },
@@ -788,6 +795,9 @@
             "sac_scale": {
                 "label": "Difficoltà del sentiero"
             },
+            "seasonal": {
+                "label": "Stagionale"
+            },
             "service": {
                 "label": "Tipo"
             },
@@ -800,6 +810,12 @@
             "shop": {
                 "label": "Tipo"
             },
+            "sloped_curb": {
+                "label": "Cordolo inclinato"
+            },
+            "smoking": {
+                "label": "Zona fumatori"
+            },
             "social_facility_for": {
                 "label": "Tipo di utenza",
                 "placeholder": "Senza dimora, disabili, minori, ..."
@@ -810,6 +826,9 @@
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Struttura",
                 "placeholder": "Sconosciuto",
@@ -817,7 +836,8 @@
                     "bridge": "Ponte",
                     "tunnel": "Tunnel",
                     "embankment": "Argine",
-                    "cutting": "Infossato"
+                    "cutting": "Infossato",
+                    "ford": "Guado"
                 }
             },
             "studio_type": {
@@ -829,6 +849,9 @@
             "surface": {
                 "label": "Superficie"
             },
+            "tactile_paving": {
+                "label": "Pavimento tattile"
+            },
             "toilets/disposal": {
                 "label": "Smaltimento"
             },
@@ -980,6 +1003,10 @@
                 "name": "Bar",
                 "terms": "caffè,caffé,snack,caffetteria"
             },
+            "amenity/bbq": {
+                "name": "Barbecue/Griglia",
+                "terms": "grigliata,barbeque"
+            },
             "amenity/bench": {
                 "name": "Panchina",
                 "terms": "panca,poltrona,sedile"
@@ -1096,6 +1123,10 @@
                 "name": "Parcheggio",
                 "terms": "parcheggio auto,autorimessa"
             },
+            "amenity/parking_entrance": {
+                "name": "Entrata/Uscita Garage",
+                "terms": "garage,posto auto,posteggio,parcheggio"
+            },
             "amenity/pharmacy": {
                 "name": "Farmacia",
                 "terms": "Farmacia"
@@ -1300,14 +1331,26 @@
                 "name": "Appartamenti",
                 "terms": "appartamenti,condominio,palazzo,palazzone,casermone,case popolari,abitazioni,case,edilizia popolare,peep,iacp"
             },
+            "building/barn": {
+                "name": "Fienile",
+                "terms": "granaio,basso servizio,tesa"
+            },
             "building/bunker": {
                 "name": "Bunker",
                 "terms": "bunker,casamatta"
             },
+            "building/cabin": {
+                "name": "Capanna",
+                "terms": "capanna,attrezzi,rimessa,ripostiglio,basso servizio"
+            },
             "building/cathedral": {
                 "name": "Cattedrale",
                 "terms": "cattedrale,chiesa,monumento,religioso"
             },
+            "building/chapel": {
+                "name": "Cappella",
+                "terms": "chiesetta,capellina"
+            },
             "building/church": {
                 "name": "Chiesa",
                 "terms": "cristiano,abbazia,basilica,cattedrale,presbiterio,cappella,chiesa,casa di Dio,luogo di preghiera,luogo di culto,missione,oratorio,parrocchia,sacello,edicola votiva,tabernacolo,tempio"
@@ -1320,13 +1363,17 @@
                 "name": "Edificio in costruzione",
                 "terms": "cantiere,struttura,in costruzione"
             },
+            "building/detached": {
+                "name": "Casa autonoma",
+                "terms": "casa autonoma"
+            },
             "building/dormitory": {
                 "name": "Dormitorio",
                 "terms": "dormitorio,struttura sociale"
             },
             "building/entrance": {
-                "name": "Entrata",
+                "name": "Entrata/Uscita",
-                "terms": "Entrata"
+                "terms": "entrata,uscita,emergenza,accesso,porta,portone,ingresso"
             },
             "building/garage": {
                 "name": "Garage",
@@ -1368,6 +1415,10 @@
                 "name": "Edificio residenziale",
                 "terms": "Edificio residenziale"
             },
+            "building/retail": {
+                "name": "Negozio",
+                "terms": "edificio commerciale,commerciale,negozi"
+            },
             "building/roof": {
                 "name": "Tettoia",
                 "terms": "tetto,pensilina"
@@ -1376,10 +1427,18 @@
                 "name": "Edificio scolastico",
                 "terms": "accademia,alma mater,lavagna,collegio,dipartimento,disciplina,classe,facoltà,aula,istituto,istituzione,riformatorio,scuola,edificio scolastico,seminario,università"
             },
+            "building/shed": {
+                "name": "Capanno",
+                "terms": "capanno degli attrezzi,capanna,rimessa,capannone"
+            },
             "building/stable": {
                 "name": "Stalla",
                 "terms": "stalla,ricovero,scuderia"
             },
+            "building/terrace": {
+                "name": "Villette a schiera",
+                "terms": "villette,fila di case"
+            },
             "building/train_station": {
                 "name": "Stazione ferroviaria",
                 "terms": "treno,stazione,centrale"
@@ -1454,12 +1513,20 @@
                 "name": "Fotografo",
                 "terms": "fotografia,stampe"
             },
+            "craft/photographic_laboratory": {
+                "name": "Laboratorio Fotografico",
+                "terms": "laboratorio,foto,fotografia,stampe"
+            },
             "craft/plumber": {
                 "name": "Idraulico"
             },
             "craft/sailmaker": {
                 "name": "Velaio"
             },
+            "craft/sawmill": {
+                "name": "Segheria",
+                "terms": "legno,segheria"
+            },
             "craft/sculpter": {
                 "name": "Scultore"
             },
@@ -1488,8 +1555,8 @@
                 "terms": "Telefono di emergenza"
             },
             "entrance": {
-                "name": "Entrata",
+                "name": "Entrata/Uscita",
-                "terms": "Entrata"
+                "terms": "entrata,uscita,emergenza,accesso,porta,portone,ingresso"
             },
             "footway/crossing": {
                 "name": "Attraversamento",
@@ -1499,6 +1566,10 @@
                 "name": "Marciapiede",
                 "terms": "marciapiedi,passeggio,salvagente,banchina"
             },
+            "ford": {
+                "name": "Guado",
+                "terms": "guado"
+            },
             "golf/bunker": {
                 "name": "Bunker",
                 "terms": "sabbia"
@@ -1723,6 +1794,10 @@
                 "name": "Cimitero",
                 "terms": "Cimitero"
             },
+            "landuse/churchyard": {
+                "name": "Area parrocchiale",
+                "terms": "sagrato,parrocchia"
+            },
             "landuse/commercial": {
                 "name": "Commerciale",
                 "terms": "Commerciale"
@@ -1763,6 +1838,10 @@
                 "name": "Coltivazione erbacea",
                 "terms": "Prato"
             },
+            "landuse/military": {
+                "name": "Militare",
+                "terms": "base,militare,forze dell'ordine,soldati,caserma,fanteria,artiglieria"
+            },
             "landuse/orchard": {
                 "name": "Frutteto",
                 "terms": "Frutteto"
@@ -2358,6 +2437,10 @@
                 "name": "Fioraio",
                 "terms": "Fioraio"
             },
+            "shop/funeral_directors": {
+                "name": "Casa funeraria",
+                "terms": "funerale,cimitero"
+            },
             "shop/furniture": {
                 "name": "Negozio di mobili",
                 "terms": "Negozio di mobili"
@@ -2486,6 +2569,10 @@
                 "name": "Videoteca",
                 "terms": "Videoteca"
             },
+            "shop/wine": {
+                "name": "Enoteca",
+                "terms": "vino,negozio di vini"
+            },
             "tourism": {
                 "name": "Turismo",
                 "terms": "turismo,attrazione,turistica,interesse,turisti,escursionismo,viaggio,gita"

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

@@ -610,6 +610,33 @@
             "fuel": {
                 "label": "ガソリンスタンド"
             },
+            "fuel/biodiesel": {
+                "label": "バイオディーゼルの販売"
+            },
+            "fuel/diesel": {
+                "label": "軽油の販売"
+            },
+            "fuel/e10": {
+                "label": "E10の販売"
+            },
+            "fuel/e85": {
+                "label": "E85の販売"
+            },
+            "fuel/lpg": {
+                "label": "プロパンの販売"
+            },
+            "fuel/octane_100": {
+                "label": "レース用ガソリンの販売"
+            },
+            "fuel/octane_91": {
+                "label": "レギュラーガソリンの販売"
+            },
+            "fuel/octane_95": {
+                "label": "中品質ガソリンの販売"
+            },
+            "fuel/octane_98": {
+                "label": "ハイオクガソリンの販売"
+            },
             "gauge": {
                 "label": "軌間"
             },
@@ -673,6 +700,9 @@
             "leisure": {
                 "label": "タイプ"
             },
+            "length": {
+                "label": "長さ (m)"
+            },
             "levels": {
                 "label": "階数",
                 "placeholder": "2, 4, 6..."
@@ -744,6 +774,9 @@
             "place": {
                 "label": "タイプ"
             },
+            "population": {
+                "label": "人口"
+            },
             "power": {
                 "label": "区分"
             },
@@ -807,6 +840,9 @@
             "shop": {
                 "label": "店舗種別"
             },
+            "sloped_curb": {
+                "label": "歩道のすりつけ勾配"
+            },
             "smoking": {
                 "label": "喫煙"
             },
@@ -830,7 +866,8 @@
                     "bridge": "橋",
                     "tunnel": "トンネル",
                     "embankment": "土手",
-                    "cutting": "切り通し"
+                    "cutting": "切り通し",
+                    "ford": "洗い越し"
                 }
             },
             "studio_type": {
@@ -842,6 +879,9 @@
             "surface": {
                 "label": "路面状態"
             },
+            "tactile_paving": {
+                "label": "点字ブロック"
+            },
             "toilets/disposal": {
                 "label": "汚物処理"
             },
@@ -885,6 +925,9 @@
             "wheelchair": {
                 "label": "車椅子の利用可否"
             },
+            "width": {
+                "label": "幅 (m)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1029,6 +1072,10 @@
                 "name": "車の洗浄",
                 "terms": "洗車機, 洗車, 車洗浄, カーウォッシュ"
             },
+            "amenity/charging_station": {
+                "name": "充電スタンド",
+                "terms": "充電ステーション, 急速充電システム, 充電スタンド, 給電スタンド"
+            },
             "amenity/childcare": {
                 "name": "保育施設",
                 "terms": "託児所,保育園,幼稚園,学童保育"
@@ -1049,6 +1096,10 @@
                 "name": "単科大学",
                 "terms": "大学,短大,専門学校,高専"
             },
+            "amenity/compressed_air": {
+                "name": "空気入れ",
+                "terms": "空気入れ, エアー調整"
+            },
             "amenity/courthouse": {
                 "name": "裁判所",
                 "terms": "裁判所"
@@ -1113,6 +1164,10 @@
                 "name": "駐車場",
                 "terms": "駐車場"
             },
+            "amenity/parking_entrance": {
+                "name": "駐車場の出入口",
+                "terms": "駐車場の出入口"
+            },
             "amenity/pharmacy": {
                 "name": "薬局",
                 "terms": "調剤,調剤薬局,薬局"
@@ -1359,7 +1414,7 @@
             },
             "building/entrance": {
                 "name": "出入口",
-                "terms": "出入口, エントランス"
+                "terms": "出入口, 入口, 出口"
             },
             "building/garage": {
                 "name": "車庫",
@@ -1639,7 +1694,7 @@
             },
             "entrance": {
                 "name": "出入口",
-                "terms": "出入口"
+                "terms": "出入口, 入口, 出口"
             },
             "footway/crossing": {
                 "name": "横断歩道",
@@ -1649,6 +1704,10 @@
                 "name": "歩道",
                 "terms": "歩道"
             },
+            "ford": {
+                "name": "洗い越し",
+                "terms": "洗い越し, 浅瀬"
+            },
             "golf/bunker": {
                 "name": "サンドトラップ",
                 "terms": "サンドトラップ,バンカー"
@@ -1881,6 +1940,10 @@
                 "name": "霊園",
                 "terms": "霊園, 墓地"
             },
+            "landuse/churchyard": {
+                "name": "教会の敷地",
+                "terms": "教会, 教会の敷地"
+            },
             "landuse/commercial": {
                 "name": "オフィス地区",
                 "terms": "ビジネス街,オフィス街,オフィス地区"
@@ -1921,6 +1984,10 @@
                 "name": "牧草地",
                 "terms": "牧草地"
             },
+            "landuse/military": {
+                "name": "軍事",
+                "terms": "軍事,自衛隊"
+            },
             "landuse/orchard": {
                 "name": "果樹園",
                 "terms": "果樹園, 果物畑, リンゴ畑, ミカン畑"
@@ -2673,6 +2740,10 @@
                 "name": "ビデオソフト店",
                 "terms": "ビデオソフト店, DVD店"
             },
+            "shop/wine": {
+                "name": "ワイン店",
+                "terms": "ワイン店, 酒屋"
+            },
             "tourism": {
                 "name": "観光",
                 "terms": "旅行, 観光"

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

@@ -61,17 +61,18 @@
             "annotation": "태그를 바꿨습니다."
         },
         "circularize": {
-            "title": "순환하기",
+            "title": "둥글게하기",
             "description": {
-                "line": "이 선 순환을 만듭니다.",
+                "line": "이 선을 둥글게 만듭니다.",
-                "area": "이 지역 순환을 만듭니다."
+                "area": "이 지역을 둥글게 만듭니다."
             },
             "key": "O",
             "annotation": {
-                "line": "선 순환을 만들었습니다.",
+                "line": "선을 둥글게 만들었습니다.",
-                "area": "지역 순환을 만들었습니다."
+                "area": "지역을 둥글게 만들었습니다."
             },
-            "not_closed": "지역이 닫혀있지 않기 때문에 순환을 만들 수 없습니다."
+            "not_closed": "지역이 닫혀있지 않기 때문에 둥글게 만들 수 없습니다.",
+            "too_large": "지역이 현재 충분히 보이지 않기 때문에 둥글게 만들 수 없습니다."
         },
         "orthogonalize": {
             "title": "사각지기",
@@ -84,7 +85,8 @@
                 "line": "선의 모서리를 사각지게 했습니다.",
                 "area": "지역의 모서리를 사각지게 했습니다."
             },
-            "not_squarish": "사각 형태가 아니기 때문에 사각지게 할 수 없습니다."
+            "not_squarish": "사각 형태가 아니기 때문에 사각지게 만들 수 없습니다.",
+            "too_large": "지역이 현재 충분히 보이지 않기 때문에 사각지게 만들 수 없습니다."
         },
         "straighten": {
             "title": "곧게 하기",
@@ -265,6 +267,8 @@
         "percent_brightness": "명도 {opacity}%",
         "none": "없음",
         "custom": "사용자 지정",
+        "custom_button": "사용자 지정 배경 편집",
+        "custom_prompt": "타일 URL 템플릿을 입력하세요. 올바른 토큰은 Z/X/Y scheme에 대해 {z}, {x}, {y}이고 quadtile scheme에 대해 {u}입니다.",
         "fix_misalignment": "정렬 고치기",
         "reset": "재설정"
     },
@@ -376,7 +380,7 @@
             "title": "선",
             "add": "선은 도로, 철도와 강과 같은 기능을 표현하는 데 사용됩니다. **새 선을 추가하려면 선 버튼을 클릭하세요.**",
             "start": "**도로의 끝에 클릭하여 선을 시작하세요.**",
-            "intersect": "선에 더 많은 노드를 추가하려면 클릭하세요. 필요하다면 그리는 동안 지도를 드래그할 수 있습니다. 도로와 선의 다른 많은 유형은 큰 네트워크의 부분입니다. 이 선이 작동하는 애플리케이션을 경로 지정하기 위해서는 제대로 연결하는 것이 중요합니다. **두 선을 연결하는 교차로를 만드려면, Flower Street를 클릭하세요.**",
+            "intersect": "선에 더 많은 노드를 추가하려면 클릭하세요. 필요하다면 그리는 동안 지도를 드래그할 수 있습니다. 도로와 선의 다른 많은 유형은 큰 네트워크의 부분입니다. 이 선이 작동하는 애플리케이션의 경로 지정을 위해서는 제대로 연결하는 것이 중요합니다. **두 선을 연결하는 교차로를 만드려면, Flower Street를 클릭하세요.**",
             "finish": "선은 마지막 노드를 다시 클릭하여 마칠 수 있습니다. **도로 그리기를 마치세요.**",
             "road": "**목록에서 도로를 선택하세요**",
             "residential": "여기에 도로의 여러 종류가 있지만, 가장 자주 그리게 되는 것은 주거 도로입니다. **주거 도로 유형을 선택하세요**",
@@ -474,6 +478,21 @@
             "admin_level": {
                 "label": "관리 수준"
             },
+            "aerialway": {
+                "label": "유형"
+            },
+            "aerialway/capacity": {
+                "label": "수용자 수 (시간당)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "소요 시간 (분)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/occupancy": {
+                "label": "무게",
+                "placeholder": "2, 4, 8..."
+            },
             "aeroway": {
                 "label": "유형"
             },
@@ -508,7 +527,7 @@
                 "label": "건물"
             },
             "capacity": {
-                "label": "수용 가능한 수",
+                "label": "수용자 수",
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
@@ -580,12 +599,18 @@
                 "label": "참고",
                 "placeholder": "홀 수 (1-18)"
             },
+            "handicap": {
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "유형"
             },
             "historic": {
                 "label": "유형"
             },
+            "hoops": {
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
@@ -677,6 +702,9 @@
                 "label": "전화",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/type": {
+                "label": "유형"
+            },
             "place": {
                 "label": "유형"
             },
@@ -744,6 +772,9 @@
                     "cutting": "절토"
                 }
             },
+            "studio_type": {
+                "label": "유형"
+            },
             "supervised": {
                 "label": "감독 장소"
             },
@@ -952,6 +983,9 @@
             "amenity/restaurant": {
                 "name": "음식점"
             },
+            "amenity/school": {
+                "name": "학교 운동장"
+            },
             "amenity/shelter": {
                 "name": "피난처"
             },
@@ -1049,9 +1083,6 @@
             "building/commercial": {
                 "name": "상업 건물"
             },
-            "building/entrance": {
-                "name": "입구"
-            },
             "building/garage": {
                 "name": "차고"
             },
@@ -1067,6 +1098,9 @@
             "building/residential": {
                 "name": "주거 건물"
             },
+            "building/school": {
+                "name": "학교 건물"
+            },
             "embankment": {
                 "name": "둑",
                 "terms": "제방"
@@ -1081,9 +1115,6 @@
             "emergency/phone": {
                 "name": "긴급 전화"
             },
-            "entrance": {
-                "name": "입구"
-            },
             "footway/crossing": {
                 "name": "횡단보도"
             },
@@ -1322,6 +1353,9 @@
             "leisure/golf_course": {
                 "name": "골프장"
             },
+            "leisure/ice_rink": {
+                "name": "아이스 링크"
+            },
             "leisure/marina": {
                 "name": "마리나",
                 "terms": "항구,선착장"
@@ -1329,6 +1363,9 @@
             "leisure/park": {
                 "name": "공원"
             },
+            "leisure/picnic_table": {
+                "name": "피크닉 테이블"
+            },
             "leisure/pitch": {
                 "name": "운동장"
             },

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

@@ -941,9 +941,6 @@
                 "name": "Komercinis pastatas",
                 "terms": "komercinis,pastatas,statinys"
             },
-            "building/entrance": {
-                "name": "Įėjimas"
-            },
             "building/garage": {
                 "name": "Garažas"
             },
@@ -964,9 +961,6 @@
             "emergency/phone": {
                 "name": "Pagalbos telefonas"
             },
-            "entrance": {
-                "name": "Įėjimas"
-            },
             "footway/sidewalk": {
                 "name": "Šaligatvis"
             },

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

@@ -676,15 +676,9 @@
             "building/apartments": {
                 "name": "Dzīvokļi"
             },
-            "building/entrance": {
-                "name": "Ieeja"
-            },
             "building/house": {
                 "name": "Māja"
             },
-            "entrance": {
-                "name": "Ieeja"
-            },
             "highway": {
                 "name": "Šoseja"
             },

vendor/assets/iD/iD/locales/nl.json

@@ -1132,9 +1132,6 @@
             "building/dormitory": {
                 "name": "Slaapzaal"
             },
-            "building/entrance": {
-                "name": "Ingang"
-            },
             "building/garage": {
                 "name": "Garage",
                 "terms": "garage"
@@ -1265,9 +1262,6 @@
             "emergency/phone": {
                 "name": "Praatpaal"
             },
-            "entrance": {
-                "name": "Ingang"
-            },
             "highway": {
                 "name": "Autosnelweg"
             },

vendor/assets/iD/iD/locales/no.json

@@ -800,9 +800,6 @@
             "building/apartments": {
                 "name": "Leiligheter"
             },
-            "building/entrance": {
-                "name": "Inngang"
-            },
             "building/house": {
                 "name": "Hus"
             },
@@ -812,9 +809,6 @@
             "emergency/phone": {
                 "name": "Nødtelefon"
             },
-            "entrance": {
-                "name": "Inngang"
-            },
             "highway": {
                 "name": "Vei"
             },

vendor/assets/iD/iD/locales/pl.json

@@ -265,6 +265,7 @@
         "percent_brightness": "jasność {opacity}%",
         "none": "Brak",
         "custom": "Własne",
+        "custom_button": "Edycja własnego podkładu",
         "fix_misalignment": "Wyrównaj podkład",
         "reset": "resetuj"
     },
@@ -597,6 +598,9 @@
             "fixme": {
                 "label": "Napraw mnie"
             },
+            "fuel": {
+                "label": "Paliwo"
+            },
             "gauge": {
                 "label": "Wskaźnik"
             },
@@ -712,6 +716,9 @@
             "place": {
                 "label": "Typ"
             },
+            "population": {
+                "label": "Populacja"
+            },
             "power": {
                 "label": "Typ"
             },
@@ -748,6 +755,9 @@
             "sac_scale": {
                 "label": "Trudność trasy"
             },
+            "seasonal": {
+                "label": "Sezonowy"
+            },
             "service": {
                 "label": "Typ"
             },
@@ -760,12 +770,18 @@
             "shop": {
                 "label": "Typ"
             },
+            "smoking": {
+                "label": "Dla palących, Palenie, "
+            },
             "source": {
                 "label": "Źródło"
             },
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Struktura",
                 "placeholder": "Nieznane",
@@ -844,22 +860,28 @@
                 "name": "Kolejka górska"
             },
             "aerialway/chair_lift": {
-                "name": "Wyciag krzesełkowy"
+                "name": "Wyciag krzesełkowy",
+                "terms": "Wyciąg narciarski krzesełkowy,"
             },
             "aerialway/gondola": {
-                "name": "Gondola"
+                "name": "Gondola",
+                "terms": "Wyciąg narciarski gondolowy, Gondola"
             },
             "aerialway/magic_carpet": {
-                "name": "wyciąg narciarski dywanowy"
+                "name": "wyciąg narciarski dywanowy",
+                "terms": "Narciarski pas transmisyjny dla dzieci, "
             },
             "aerialway/platter": {
-                "name": "Wyciag talerzykowy"
+                "name": "Wyciag talerzykowy",
+                "terms": "Wyciąg talerzykowy, "
             },
             "aerialway/pylon": {
-                "name": "Podpora wyciagu narciarskiego"
+                "name": "Podpora wyciagu narciarskiego",
+                "terms": "Podpora, słup "
             },
             "aerialway/rope_tow": {
-                "name": "Wyrwirączka"
+                "name": "Wyrwirączka",
+                "terms": "Wyrwirączka"
             },
             "aerialway/station": {
                 "name": "Stacja wyciagu narciarskiego"
@@ -921,6 +943,9 @@
                 "name": "Bar",
                 "terms": "bar"
             },
+            "amenity/bbq": {
+                "name": "Grill"
+            },
             "amenity/bench": {
                 "name": "Ławka",
                 "terms": "ławka,siedzenie,siedzisko"
@@ -964,7 +989,8 @@
                 "name": "Klinika"
             },
             "amenity/clock": {
-                "name": "Zegar"
+                "name": "Zegar",
+                "terms": "Zegar, "
             },
             "amenity/college": {
                 "name": "Uczelnia",
@@ -975,7 +1001,8 @@
                 "terms": "sąd,sprawiedliwość,trybunał"
             },
             "amenity/dentist": {
-                "name": "Dentysta"
+                "name": "Dentysta",
+                "terms": "Dentysta, "
             },
             "amenity/doctor": {
                 "name": "Doktor"
@@ -1016,6 +1043,10 @@
                 "name": "Targowisko",
                 "terms": "targowisko,targ,rynek,giełda"
             },
+            "amenity/nightclub": {
+                "name": "Klub nocny",
+                "terms": "Klub nocny,"
+            },
             "amenity/parking": {
                 "name": "Parking samochodowy"
             },
@@ -1067,13 +1098,15 @@
                 "terms": "bar,kawiarnia,stołówka,jadalnia,drive-in,knajpa,jadłodajnia,fast food,grill,gospoda,klub nocny,pizzeria"
             },
             "amenity/shelter": {
-                "name": "Schronienie"
+                "name": "Schronienie",
+                "terms": "schronienie, "
             },
             "amenity/social_facility": {
                 "name": "Placówka pomocy społecznej"
             },
             "amenity/social_facility/food_bank": {
-                "name": "Bank żywności"
+                "name": "Bank żywności",
+                "terms": "Bank żywności, "
             },
             "amenity/social_facility/homeless_shelter": {
                 "name": "Schronisko dla bezdomnych"
@@ -1114,7 +1147,8 @@
                 "terms": "automat do sprzedaży"
             },
             "amenity/veterinary": {
-                "name": "Weterynarz"
+                "name": "Weterynarz",
+                "terms": "Zakład weterynaryjny, Weterynarz"
             },
             "amenity/waste_basket": {
                 "name": "Kosz na śmieci",
@@ -1209,24 +1243,24 @@
                 "name": "Bunkier"
             },
             "building/cathedral": {
-                "name": "Katedra"
+                "name": "Katedra",
+                "terms": "Katedra, "
             },
             "building/chapel": {
-                "name": "Kaplica"
+                "name": "Kaplica",
+                "terms": "Kaplica, "
             },
             "building/church": {
-                "name": "Kościół"
+                "name": "Kościół",
+                "terms": "Kościół, "
             },
             "building/commercial": {
                 "name": "Nieruchomość komercyjna",
                 "terms": "sklep,komercyjny,sprzedaż,handlowy"
             },
             "building/dormitory": {
-                "name": "Akademik"
+                "name": "Akademik",
-            },
+                "terms": "Akademik, bursa, "
-            "building/entrance": {
-                "name": "Wejście",
-                "terms": "wejście,drzwi"
             },
             "building/garage": {
                 "name": "Garaż",
@@ -1236,7 +1270,8 @@
                 "name": "Garaże"
             },
             "building/greenhouse": {
-                "name": "Szklarnia"
+                "name": "Szklarnia",
+                "terms": "Szklarnia"
             },
             "building/house": {
                 "name": "Dom",
@@ -1258,7 +1293,11 @@
                 "terms": "blok, kamienica, dom, czynszówka"
             },
             "building/roof": {
-                "name": "Zadaszenie"
+                "name": "Zadaszenie",
+                "terms": "Dach,"
+            },
+            "building/school": {
+                "name": "Budynek szkolny"
             },
             "building/shed": {
                 "name": "Szopa"
@@ -1267,7 +1306,8 @@
                 "name": "Stajnia"
             },
             "building/train_station": {
-                "name": "Stacja kolejowa"
+                "name": "Stacja kolejowa",
+                "terms": "Stacja kolejowa, "
             },
             "building/warehouse": {
                 "name": "Magazyn"
@@ -1285,7 +1325,8 @@
                 "name": "Introligator"
             },
             "craft/brewery": {
-                "name": "Gorzelnia"
+                "name": "Gorzelnia",
+                "terms": "Gorzelnia, "
             },
             "craft/caterer": {
                 "name": "Żywieniowiec"
@@ -1306,7 +1347,8 @@
                 "name": "Ogrodnik"
             },
             "craft/glaziery": {
-                "name": "Szklarz"
+                "name": "Szklarz",
+                "terms": "Zakład szklarski, Szklarz"
             },
             "craft/handicraft": {
                 "name": "Rzemiosło"
@@ -1318,7 +1360,8 @@
                 "name": "Ślusarz"
             },
             "craft/optician": {
-                "name": "Optyk"
+                "name": "Optyk",
+                "terms": "Zakład optyczny, Optyk"
             },
             "craft/painter": {
                 "name": "Malarz"
@@ -1326,6 +1369,9 @@
             "craft/photographer": {
                 "name": "Fotograf"
             },
+            "craft/photographic_laboratory": {
+                "name": "Laboratorium fotograficzne"
+            },
             "craft/plasterer": {
                 "name": "Tynkarz"
             },
@@ -1357,10 +1403,12 @@
                 "name": "Szewc"
             },
             "craft/stonemason": {
-                "name": "Zakład kamieniarski"
+                "name": "Zakład kamieniarski",
+                "terms": "Zakład Kamieniarski, Kamieniarz"
             },
             "craft/sweep": {
-                "name": "Kominiarz"
+                "name": "Kominiarz",
+                "terms": "Kominiarz"
             },
             "craft/tailor": {
                 "name": "Krawiec"
@@ -1392,17 +1440,17 @@
                 "name": "Telefon alarmowy",
                 "terms": "telefon,alarmowy,alarm"
             },
-            "entrance": {
-                "name": "Wejście",
-                "terms": "wejście,przejście"
-            },
             "footway/crossing": {
-                "name": "Przejście dla pieszych"
+                "name": "Przejście dla pieszych",
+                "terms": "przejście dla pieszych, "
             },
             "footway/sidewalk": {
                 "name": "Chodnik",
                 "terms": "chodnik"
             },
+            "golf/hole": {
+                "name": "dołek na polu golfowym "
+            },
             "highway": {
                 "name": "Droga",
                 "terms": "droga,szlak,ulica"
@@ -1503,7 +1551,8 @@
                 "name": "Uliczka parkingowa"
             },
             "highway/services": {
-                "name": "Obszar usługowy"
+                "name": "Obszar usługowy",
+                "terms": "Obszar serwisowy, "
             },
             "highway/steps": {
                 "name": "Schody",
@@ -1630,6 +1679,9 @@
                 "name": "Łąka",
                 "terms": "Łąka"
             },
+            "landuse/military": {
+                "name": "Wojskowy"
+            },
             "landuse/orchard": {
                 "name": "Sad",
                 "terms": "Sad"
@@ -1650,7 +1702,8 @@
                 "terms": "winnica"
             },
             "leisure": {
-                "name": "Rozrywka i wypoczynek"
+                "name": "Rozrywka i wypoczynek",
+                "terms": "Wypoczynek, czas wolny"
             },
             "leisure/dog_park": {
                 "name": "Park dla psów"
@@ -1663,6 +1716,9 @@
                 "name": "Pole golfowe",
                 "terms": "pole golfowe"
             },
+            "leisure/ice_rink": {
+                "name": "Lodowisko"
+            },
             "leisure/marina": {
                 "name": "Przystań",
                 "terms": "przystań"
@@ -1671,8 +1727,12 @@
                 "name": "Park",
                 "terms": "las,ogród,trawa,zieleń,trawnik,łąka,miejsce,plac,teren rekreacyjny"
             },
+            "leisure/picnic_table": {
+                "name": "Stół piknikowy"
+            },
             "leisure/pitch": {
-                "name": "Boisko"
+                "name": "Boisko",
+                "terms": "boisko sportowe, boisko"
             },
             "leisure/pitch/american_football": {
                 "name": "Boisko do futbolu amerykańskiego"
@@ -1725,7 +1785,8 @@
                 "terms": "tor wyścigowy"
             },
             "line": {
-                "name": "Linia"
+                "name": "Linia",
+                "terms": "Linia, lina"
             },
             "man_made": {
                 "name": "Obiekty sztuczne"
@@ -1831,7 +1892,8 @@
                 "terms": "Krzaki, zarośla"
             },
             "natural/spring": {
-                "name": "Źródło"
+                "name": "Źródło",
+                "terms": "źródło"
             },
             "natural/tree": {
                 "name": "Drzewo",
@@ -1861,7 +1923,8 @@
                 "name": "Puszcza"
             },
             "office": {
-                "name": "Biuro"
+                "name": "Biuro",
+                "terms": "Biuro,"
             },
             "office/accountant": {
                 "name": "Księgowy",
@@ -1875,13 +1938,15 @@
                 "name": "Instytucja edukacyjna"
             },
             "office/employment_agency": {
-                "name": "Agencja zatrudnienia"
+                "name": "Agencja zatrudnienia",
+                "terms": "Agencja pracy, "
             },
             "office/estate_agent": {
                 "name": "Biuro nieruchomości"
             },
             "office/insurance": {
-                "name": "Biuro ubezpieczeń"
+                "name": "Biuro ubezpieczeń",
+                "terms": "Agencja ubezpieczeniowa"
             },
             "office/newspaper": {
                 "name": "Gazeta"
@@ -1906,7 +1971,8 @@
                 "name": "Biuro podróży"
             },
             "piste": {
-                "name": "Trasa narciarska"
+                "name": "Trasa narciarska",
+                "terms": "Trasa narciarska"
             },
             "place": {
                 "name": "Miejsce"
@@ -1929,6 +1995,9 @@
             "place/locality": {
                 "name": "Okolica"
             },
+            "place/neighbourhood": {
+                "name": "Sąsiedztwo"
+            },
             "place/town": {
                 "name": "Miasto",
                 "terms": "Miasteczko"
@@ -1951,7 +2020,8 @@
                 "terms": "lina wysokiego napięcia, lina energetyczna"
             },
             "power/minor_line": {
-                "name": "Linia energetyczna o niskim stopniu ważności"
+                "name": "Linia energetyczna o niskim stopniu ważności",
+                "terms": "Linia energetyczna niskiego napięcia, "
             },
             "power/pole": {
                 "name": "Słup elektryczny"
@@ -2084,7 +2154,8 @@
                 "name": "Konfekcja"
             },
             "shop/convenience": {
-                "name": "Sklep ogólnospożywczy"
+                "name": "Sklep ogólnospożywczy",
+                "terms": "mały sklep, sklepik osiedlowy"
             },
             "shop/deli": {
                 "name": "Delikatesy"
@@ -2093,7 +2164,8 @@
                 "name": "Dom towarowy"
             },
             "shop/doityourself": {
-                "name": "Sklep dla majsterkowiczów"
+                "name": "Sklep dla majsterkowiczów",
+                "terms": "sklep dla majsterkowiczów"
             },
             "shop/dry_cleaning": {
                 "name": "Pralnia chemiczna"
@@ -2119,7 +2191,8 @@
                 "name": "Centrum ogrodnicze"
             },
             "shop/gift": {
-                "name": "Sklep z pamiątkami"
+                "name": "Sklep z pamiątkami",
+                "terms": "sklep z prezentami"
             },
             "shop/greengrocer": {
                 "name": "Warzywniak",
@@ -2159,7 +2232,8 @@
                 "name": "Sklep z telefonami komórkowymi"
             },
             "shop/motorcycle": {
-                "name": "Dealer motocykli"
+                "name": "Dealer motocykli",
+                "terms": "Dealer motocyklowy"
             },
             "shop/music": {
                 "name": "Sklep muzyczny",
@@ -2176,7 +2250,8 @@
                 "name": "Sklep turystyczny"
             },
             "shop/pet": {
-                "name": "Sklep zoologiczny"
+                "name": "Sklep zoologiczny",
+                "terms": "Sklep zoologiczny"
             },
             "shop/photo": {
                 "name": "sklep fotograficzny"
@@ -2199,7 +2274,8 @@
                 "terms": "sklep z zabawkami"
             },
             "shop/travel_agency": {
-                "name": "Biuro podróży"
+                "name": "Biuro podróży",
+                "terms": "Biuro podróży, "
             },
             "shop/tyres": {
                 "name": "Sklep z oponami"
@@ -2213,6 +2289,10 @@
             "shop/video": {
                 "name": "Sklep wideo"
             },
+            "shop/wine": {
+                "name": "Winiarnia",
+                "terms": "Winiarnia"
+            },
             "tourism": {
                 "name": "Turystyka",
                 "terms": "Turystyka"
@@ -2277,7 +2357,8 @@
                 "name": "Granica"
             },
             "type/boundary/administrative": {
-                "name": "Granica administracyjna"
+                "name": "Granica administracyjna",
+                "terms": "Granica administracyjna, "
             },
             "type/multipolygon": {
                 "name": "Wielokąt złożony"
@@ -2291,7 +2372,8 @@
                 "terms": "trasa"
             },
             "type/route/bicycle": {
-                "name": "Droga rowerowa"
+                "name": "Droga rowerowa",
+                "terms": "Trasa rowerowa, "
             },
             "type/route/bus": {
                 "name": "Trasa autobusowa "
@@ -2336,7 +2418,8 @@
                 "name": "Kanał"
             },
             "waterway/dam": {
-                "name": "Tama"
+                "name": "Tama",
+                "terms": "Zapora"
             },
             "waterway/ditch": {
                 "name": "Rów"
@@ -2349,7 +2432,8 @@
                 "terms": "odpływ,potok,ujście,strumyk,dopływ,ciek wodny"
             },
             "waterway/riverbank": {
-                "name": "Brzeg rzeki"
+                "name": "Brzeg rzeki",
+                "terms": "Brzeg rzeki, "
             },
             "waterway/stream": {
                 "name": "Strumień",

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

@@ -478,9 +478,6 @@
             "building": {
                 "name": "Clădire"
             },
-            "entrance": {
-                "name": "Intrare"
-            },
             "highway": {
                 "name": "Autostradă"
             },

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

@@ -663,6 +663,9 @@
             "leisure": {
                 "label": "Тип"
             },
+            "length": {
+                "label": "Длина (метры)"
+            },
             "levels": {
                 "label": "Этажи",
                 "placeholder": "2, 4, 6..."
@@ -733,6 +736,9 @@
             "place": {
                 "label": "Тип"
             },
+            "population": {
+                "label": "Население"
+            },
             "power": {
                 "label": "Тип"
             },
@@ -867,6 +873,9 @@
             "wheelchair": {
                 "label": "Доступность для инвалидных колясок"
             },
+            "width": {
+                "label": "Ширина (метры)"
+            },
             "wikipedia": {
                 "label": "Википедия"
             },
@@ -1026,6 +1035,9 @@
                 "name": "Колледж",
                 "terms": "ПТУ, колледж, техникум"
             },
+            "amenity/compressed_air": {
+                "name": "Сжатый воздух"
+            },
             "amenity/courthouse": {
                 "name": "Суд",
                 "terms": "Суд"
@@ -1128,6 +1140,9 @@
                 "name": "Паб",
                 "terms": "Паб"
             },
+            "amenity/ranger_station": {
+                "name": "Лесничество"
+            },
             "amenity/recycling": {
                 "name": "Переработка мусора",
                 "terms": "Переработка мусора, Мусоропереработка, Утилизация мусора, Переработка отходов, Утилизация отходов"
@@ -1308,8 +1323,8 @@
                 "name": "Общежитие"
             },
             "building/entrance": {
-                "name": "Вход",
+                "name": "Вход/выход",
-                "terms": "вход, дверь, главный вход"
+                "terms": "вход, выход"
             },
             "building/garage": {
                 "name": "Гараж",
@@ -1371,7 +1386,8 @@
                 "name": "Здание университета, института "
             },
             "building/warehouse": {
-                "name": "Склад"
+                "name": "Склад",
+                "terms": " склад, складское помещение, товарный склад, пакгауз, хранилище"
             },
             "craft/basket_maker": {
                 "name": "Корзина",
@@ -1382,7 +1398,8 @@
                 "terms": "пчеловод, пасечник"
             },
             "craft/blacksmith": {
-                "name": "Кузнец"
+                "name": "Кузнец",
+                "terms": "ковка, кузнец, кузница, кузня"
             },
             "craft/boatbuilder": {
                 "name": "Строительство лодок"
@@ -1419,6 +1436,10 @@
                 "name": "Садовник",
                 "terms": "садовник"
             },
+            "craft/glaziery": {
+                "name": "Стекольная мастерская ",
+                "terms": "остекление, стекла, стёкла, стекольная мастерская, стекольщик"
+            },
             "craft/handicraft": {
                 "name": "Рукодельник"
             },
@@ -1451,6 +1472,9 @@
                 "name": "фотограф",
                 "terms": "фотограф, фото оператор"
             },
+            "craft/photographic_laboratory": {
+                "name": "Фотолаборатория"
+            },
             "craft/plasterer": {
                 "name": "Скульптор"
             },
@@ -1529,8 +1553,8 @@
                 "terms": "аварийный телефон, телефон спасения, 112, 911, 01, 02, 03, 04"
             },
             "entrance": {
-                "name": "Вход",
+                "name": "Вход/выход",
-                "terms": "вход, дверь, главный вход"
+                "terms": "вход, выход"
             },
             "footway/crossing": {
                 "name": "Пешеходный переход",
@@ -2092,6 +2116,10 @@
                 "name": "Страховая компания",
                 "terms": "Страховой агент, Страхование, Автострахование, Полис, ОМС, КАСКО, ОСАГО, Страховка,"
             },
+            "office/it": {
+                "name": "IT-офис",
+                "terms": "IT-офис, ИТ-офис, офис IT, офис IT-специалиста, офис ИТ, офис ИТ-специалиста"
+            },
             "office/lawyer": {
                 "name": "Юридические услуги",
                 "terms": "Адвокат, Нотариус, Адвокатская контора, Нотариальная контора, Юридическая консультация"
@@ -2488,6 +2516,9 @@
                 "name": "Видеомагазин",
                 "terms": "Видео салон, Продажа фильмов и видеозаписей"
             },
+            "shop/wine": {
+                "name": "Винный магазин"
+            },
             "tourism": {
                 "name": "Туризм",
                 "terms": "Туризм, Отдых, Путешествия"

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

@@ -267,6 +267,8 @@
         "percent_brightness": "{opacity}% jas",
         "none": "Žiadne",
         "custom": "Voliteľné",
+        "custom_button": "Upraviť volitelné pozadie",
+        "custom_prompt": "Zadajte URL pre vzor mapového podkladu. Platné znaky sú {z}, {x}, {y} pre Z/X/Y schému a {u} pre quadtile schému.",
         "fix_misalignment": "Oprav zarovnanie",
         "reset": "vynulovať"
     },
@@ -805,6 +807,9 @@
             "shop": {
                 "label": "Typ"
             },
+            "sloped_curb": {
+                "label": "Znížený obrubník"
+            },
             "smoking": {
                 "label": "Fajčenie"
             },
@@ -840,6 +845,9 @@
             "surface": {
                 "label": "Povrch"
             },
+            "tactile_paving": {
+                "label": "Taktilné značenie"
+            },
             "toilets/disposal": {
                 "label": "Odstraňovanie"
             },
@@ -1355,10 +1363,6 @@
                 "name": "Internát",
                 "terms": "internat,intrak,intrák"
             },
-            "building/entrance": {
-                "name": "Vstup",
-                "terms": "vchod,východ,vychod,únikový východ,unikovy vychod,brána,brana,dvere,vráta,vrata"
-            },
             "building/garage": {
                 "name": "Garáž",
                 "terms": "garaz,garáže,garaze,parkovanie,kryté parkovanie,kryte parkovanie"
@@ -1539,6 +1543,10 @@
                 "name": "Fotograf",
                 "terms": "fotografia,fotografovanie,fotka,fotky"
             },
+            "craft/photographic_laboratory": {
+                "name": "Fotografické laboratórium",
+                "terms": "fotograficke laboratorium,fotolab"
+            },
             "craft/plasterer": {
                 "name": "Fasádnik",
                 "terms": "fasadnik,štukatér,stukater,omietkár,omietkar"
@@ -1631,10 +1639,6 @@
                 "name": "Núdzový telefón",
                 "terms": "nudzovy telefon,SOS,tiesňová linka,tiesnova linka,núdzový telefón.nudzovy telefon"
             },
-            "entrance": {
-                "name": "Vstup",
-                "terms": "vchod,východ,vychod,únikový východ,unikovy vychod,brána,brana,dvere,vráta,vrata"
-            },
             "footway/crossing": {
                 "name": "Prechod",
                 "terms": "Prechod pre chodcov,zebra"
@@ -1875,6 +1879,10 @@
                 "name": "Cintorín",
                 "terms": "cintorin,hroby,pohrebisko,hrobky,cmiter"
             },
+            "landuse/churchyard": {
+                "name": "Kostolný pozemok",
+                "terms": "kostolny pozemok,kostol"
+            },
             "landuse/commercial": {
                 "name": "Obchodné",
                 "terms": "obchodne,komercia,komercne,komerčné"
@@ -1915,6 +1923,10 @@
                 "name": "Lúka",
                 "terms": "luka,pastviny,trava,tráva,paša,pasa"
             },
+            "landuse/military": {
+                "name": "Armádne",
+                "terms": "armadne, armada"
+            },
             "landuse/orchard": {
                 "name": "Sad",
                 "terms": "sad,stromy,ovocie,ovocné stromy,ovocne stromy,ovocný sad,ovocny sad"
@@ -2307,6 +2319,10 @@
                 "name": "Susedstvo",
                 "terms": "okrsok,oblast,oblasť,štvrť,stvrt"
             },
+            "place/suburb": {
+                "name": "Mestská časť",
+                "terms": "mestska cast"
+            },
             "place/town": {
                 "name": "Mesto",
                 "terms": "mestecko,mestečko"
@@ -2619,6 +2635,10 @@
                 "name": "Obchod s fototechnikou",
                 "terms": "Fotoateliér,fotoatelier,fotostudio,fotoštúdio,fotografia"
             },
+            "shop/seafood": {
+                "name": "Obchod s morskými špecialitami",
+                "terms": "obchod s morskymi specialitami,plody mora,ryby,morské ryby,morske ryby,kreverty,treska,tuniak"
+            },
             "shop/shoes": {
                 "name": "Obchod s obuvov",
                 "terms": "obuv,topánky,topanky"
@@ -2659,6 +2679,10 @@
                 "name": "Videopožičovňa",
                 "terms": "videopozicovna,DVD,CD,VHS,blue-ray,blueray,blue ray,video"
             },
+            "shop/wine": {
+                "name": "Vináreň",
+                "terms": "vinaren,vinoteka,vínotéka,vino,víno"
+            },
             "tourism": {
                 "name": "Turizmus",
                 "terms": "turizmus,turistika,turisticke,turistické,hotel,motel,chata,muzeum,múzeum,atrakcia,zoo,park"

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

@@ -1002,10 +1002,6 @@
                 "name": "Poslovna stavba",
                 "terms": "Pisarne"
             },
-            "building/entrance": {
-                "name": "Vhod",
-                "terms": "Vrata, Izhod, Portal"
-            },
             "building/garage": {
                 "name": "Garaža",
                 "terms": "Garažna hiša"
@@ -1145,9 +1141,6 @@
                 "name": "Požarni hidrant",
                 "terms": "hidrant, vodni hidrant"
             },
-            "entrance": {
-                "name": "Vhod"
-            },
             "footway/crossing": {
                 "name": "Prehod za pešce",
                 "terms": "zebra"

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

@@ -594,6 +594,24 @@
             "fixme": {
                 "label": "Поправи ме"
             },
+            "fuel/biodiesel": {
+                "label": "Продаје биодизел"
+            },
+            "fuel/diesel": {
+                "label": "Продаје дизел"
+            },
+            "fuel/e10": {
+                "label": "Продаје Е10"
+            },
+            "fuel/e85": {
+                "label": "Продаје Е85"
+            },
+            "fuel/lpg": {
+                "label": "Продаје пропан"
+            },
+            "fuel/octane_98": {
+                "label": "Продаје премијум бензин"
+            },
             "gauge": {
                 "label": "Колосек"
             },
@@ -610,6 +628,7 @@
                 "placeholder": "Број рупе (1-18)"
             },
             "handicap": {
+                "label": "Хендикеп",
                 "placeholder": "1-18"
             },
             "highway": {
@@ -655,6 +674,9 @@
             "leisure": {
                 "label": "Врста"
             },
+            "length": {
+                "label": "Дужина (метара)"
+            },
             "levels": {
                 "label": "Нивои",
                 "placeholder": "2, 4, 6..."
@@ -722,6 +744,9 @@
             "place": {
                 "label": "Врста"
             },
+            "population": {
+                "label": "Насељеност"
+            },
             "power": {
                 "label": "Врста"
             },
@@ -863,6 +888,9 @@
             "wheelchair": {
                 "label": "Прилаз за инвалидска колица"
             },
+            "width": {
+                "label": "Ширина (метара)"
+            },
             "wikipedia": {
                 "label": "Википедија"
             },
@@ -964,6 +992,9 @@
             "amenity/college": {
                 "name": "Факултет"
             },
+            "amenity/compressed_air": {
+                "name": "Компримовани ваздух"
+            },
             "amenity/courthouse": {
                 "name": "Судница"
             },
@@ -1009,6 +1040,9 @@
             "amenity/nightclub": {
                 "name": "Ноћни клуб"
             },
+            "amenity/parking": {
+                "name": "Ауто паркинг"
+            },
             "amenity/pharmacy": {
                 "name": "Апотека"
             },
@@ -1184,7 +1218,7 @@
                 "name": "Студентски дом"
             },
             "building/entrance": {
-                "name": "Улаз"
+                "name": "Улаз/излаз"
             },
             "building/garage": {
                 "name": "Гаража"
@@ -1246,9 +1280,15 @@
             "craft/bookbinder": {
                 "name": "Књиговезац"
             },
+            "craft/brewery": {
+                "name": "Пивара"
+            },
             "craft/carpenter": {
                 "name": "Столар"
             },
+            "craft/carpet_layer": {
+                "name": "Паркетар"
+            },
             "craft/clockmaker": {
                 "name": "Сајџија"
             },
@@ -1309,6 +1349,9 @@
             "craft/tailor": {
                 "name": "Kројач"
             },
+            "craft/tiler": {
+                "name": "Керамичар"
+            },
             "craft/tinsmith": {
                 "name": "Калајџија"
             },
@@ -1331,7 +1374,7 @@
                 "name": "Телефон за хитне случајеве"
             },
             "entrance": {
-                "name": "Улаз"
+                "name": "Улаз/излаз"
             },
             "footway/crossing": {
                 "name": "Прелаз"
@@ -1493,6 +1536,9 @@
             "landuse/cemetery": {
                 "name": "Гробље"
             },
+            "landuse/churchyard": {
+                "name": "Црквено двориште"
+            },
             "landuse/commercial": {
                 "name": "Пословна област"
             },
@@ -1502,6 +1548,9 @@
             "landuse/farm": {
                 "name": "Фарма"
             },
+            "landuse/farmland": {
+                "name": "Обрадиво земљиште"
+            },
             "landuse/farmyard": {
                 "name": "Сеоско двориште"
             },
@@ -1520,6 +1569,9 @@
             "landuse/meadow": {
                 "name": "Ливада"
             },
+            "landuse/military": {
+                "name": "Војска "
+            },
             "landuse/orchard": {
                 "name": "Воћњак"
             },
@@ -1619,6 +1671,9 @@
             "man_made/embankment": {
                 "name": "Насип"
             },
+            "man_made/flagpole": {
+                "name": "Јарбол за заставу"
+            },
             "man_made/lighthouse": {
                 "name": "Светионик"
             },
@@ -1649,6 +1704,9 @@
             "man_made/water_works": {
                 "name": "Водовод"
             },
+            "military/airfield": {
+                "name": "Узлетиште"
+            },
             "military/barracks": {
                 "name": "Касарна"
             },
@@ -1718,9 +1776,18 @@
             "office": {
                 "name": "Канцеларија"
             },
+            "office/accountant": {
+                "name": "Рачуновођа"
+            },
+            "office/architect": {
+                "name": "Архитекта"
+            },
             "office/educational_institution": {
                 "name": "Образовна институција"
             },
+            "office/employment_agency": {
+                "name": "Служба за запошљавање"
+            },
             "office/lawyer": {
                 "name": "Адвокатска канцеларија"
             },
@@ -1967,6 +2034,9 @@
             "shop/pet": {
                 "name": "Продавница кућних љубимаца"
             },
+            "shop/seafood": {
+                "name": "Продавница морске хране "
+            },
             "shop/shoes": {
                 "name": "Продавница обуће"
             },
@@ -1997,6 +2067,9 @@
             "shop/video": {
                 "name": "Видео клуб"
             },
+            "shop/wine": {
+                "name": "Продавница вина"
+            },
             "tourism": {
                 "name": "Туризам"
             },

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

@@ -970,9 +970,6 @@
             "building/apartments": {
                 "name": "Lägenheter"
             },
-            "building/entrance": {
-                "name": "Entré"
-            },
             "building/garage": {
                 "name": "Garage"
             },
@@ -989,9 +986,6 @@
             "emergency/phone": {
                 "name": "Nödtelefon"
             },
-            "entrance": {
-                "name": "Entré"
-            },
             "highway": {
                 "name": "Väg",
                 "terms": "Väg, gata, förbindelse, led, trafikled, körbana, stråk, stig, gång, bana, sträcka, passage"

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

@@ -438,18 +438,12 @@
             "building/apartments": {
                 "name": "அபார்ட்மண்டுகள்"
             },
-            "building/entrance": {
-                "name": "நுழைவுவாயில்"
-            },
             "building/house": {
                 "name": "வீடு"
             },
             "craft/painter": {
                 "name": "ஓவியர்"
             },
-            "entrance": {
-                "name": "நுழைவுவாயில்"
-            },
             "highway/bus_stop": {
                 "name": "பேருந்து நிலையம்"
             },

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

@@ -532,9 +532,6 @@
             "building/hut": {
                 "name": "గుడిసె"
             },
-            "entrance": {
-                "name": "ప్రవేశ ద్వారం"
-            },
             "highway/footway": {
                 "name": "కాల్దారి"
             },

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

@@ -0,0 +1,544 @@
+{
+    "modes": {
+        "add_area": {
+            "title": "Area o poligon",
+            "description": "Magdagdag ng mga parke, mga gusali, lawa o iba pang mga \"area\" sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang lugar, tulad ng isang parke, lawa, o gusali."
+        },
+        "add_line": {
+            "title": "Linya o guhit",
+            "description": "Magdagdag ng mga kalsada o kalye, mga daanang pantao, kanal o iba pang mga linya sa mapa.",
+            "tail": "Mag-click sa mapa upang simulan ang pagguhit ng isang linya tulad ng kalsada, daanang pantao, o ruta."
+        },
+        "add_point": {
+            "title": "Punto o tuldok",
+            "description": "Magdagdag ng kainan, monumento, \"postbox\" o iba pang mga punto o tuldok sa mapa.",
+            "tail": "Mag-click sa mapa upang magdagdag ng isang punto o tuldok."
+        },
+        "browse": {
+            "title": "Mag-browse",
+            "description": "I-pan at i-zoom ang mapa."
+        },
+        "draw_area": {
+            "tail": "I-click upang magdagdag ng mga node sa iyong polygon o area. I-click ang unang node upang isarado ang polygon o area."
+        },
+        "draw_line": {
+            "tail": "I-click upang magdagdag ng higit pang mga node sa linya. Mag-click sa iba pang mga linya upang kumonekta sa kanila, at i-double click upang tapusin ang linya."
+        }
+    },
+    "operations": {
+        "add": {
+            "annotation": {
+                "point": "Nagdagdag ng isang punto o tuldok.",
+                "vertex": "Nagdagdag ng node sa isang way.",
+                "relation": "Nagdagdag ng relation."
+            }
+        },
+        "start": {
+            "annotation": {
+                "line": "Nagsimula ng isang linya.",
+                "area": "Nagsimula sa isang area o polygon."
+            }
+        },
+        "continue": {
+            "key": "S",
+            "title": "Ipagpatuloy",
+            "description": "Ipagpatuloy ang linyang ito.",
+            "not_eligible": "Walang linyang maaring ipagpatuloy dito.",
+            "multiple": "Mga ilang mga linya ay maaaring ipagpatuloy dito. Upang pumili ng isang linya, pindutin ang ng Shift at i-click ito upang piliin.",
+            "annotation": {
+                "line": "Karugtong ng isang linya.",
+                "area": "Nagpatuloy sa pagguhit ng area o poligon."
+            }
+        },
+        "cancel_draw": {
+            "annotation": "Kinansela ang pagguhit."
+        },
+        "change_role": {
+            "annotation": "Binago ang role ng isang kasapi ng  relation."
+        },
+        "change_tags": {
+            "annotation": "Pinalitan ang mga tag."
+        },
+        "circularize": {
+            "title": "Pina-bilog",
+            "description": {
+                "line": "Gawing pabilog ang linyang ito.",
+                "area": "Gawing pabilog ang area o poligong ito."
+            },
+            "key": "O",
+            "annotation": {
+                "line": "Ginawang pabilog and isang linya.",
+                "area": "Ginawang pabilog and isang area o poligon."
+            },
+            "not_closed": "Hindi ito maaaring gawing pabilog dahil hindi ito isang \"loop\".",
+            "too_large": "Hindi na ito maaaring gawing pabilog dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "orthogonalize": {
+            "title": "Iskawalado",
+            "description": {
+                "line": "Gawing iskwalado ang mga kanto ng linyang ito.",
+                "area": "Gawing iskwalado ang mga kanto ng area o poligong ito."
+            },
+            "key": "S",
+            "annotation": {
+                "line": "Ginawang iskawalado ang bawat kanto ng linya.",
+                "area": "Ginawang iskawalado ang bawat kanto ng area o poligon."
+            },
+            "not_squarish": "Hindi maaring gawing iskwalado.",
+            "too_large": "Hindi ito maaaring gawing iskuwalado dahil hindi sapat ang kasalukuyang nakikita sa mapa."
+        },
+        "straighten": {
+            "title": "Ituwid",
+            "description": "Ituwid ang linyang ito.",
+            "key": "S",
+            "annotation": "Naituwid ang linya.",
+            "too_bendy": "Hindi naituwid dahil masyadong kurbado."
+        },
+        "delete": {
+            "title": "Burahin",
+            "description": "Burahin ito sa mapa.",
+            "annotation": {
+                "point": "Binura ang isang point o tuldok.",
+                "vertex": "Binura ang isang node mula sa way o linya.",
+                "line": "Binura ang isang linya.",
+                "area": "Binary ang isang area o poligon.",
+                "relation": "Binura ang isang \"relation\".",
+                "multiple": "Binura ang {n} bagay sa mapa."
+            },
+            "incomplete_relation": "Hindi maaring mabura dahil ito ay hindi pa ganap na nai-download."
+        },
+        "add_member": {
+            "annotation": "Dinagdag ang kasapi o miyembro ng relation."
+        },
+        "delete_member": {
+            "annotation": "Inalis ang kasapi o miyembro ng relation."
+        },
+        "connect": {
+            "annotation": {
+                "point": "Dinugtong ang isang \"way\" sa isang punto o tuldok.",
+                "vertex": "Dinugtong ang isang \"way\" sa isa pang \"way\".",
+                "line": "Dinugtong ang isang \"way\" sa isang linya.",
+                "area": "Dinugtong ang isang \"way\" sa isang area o poligon."
+            }
+        },
+        "disconnect": {
+            "title": "Alisin ang pagkakadugtong",
+            "description": "Alisin sa pagkakadugtong ang mga linya / poligon.",
+            "key": "D",
+            "annotation": "Naalis sa pagkakadugtong ang mga linya / poligon.",
+            "not_connected": "Hindi sapat na bilang ng mga linya upang i-diskonekta o paghiwalayin."
+        },
+        "merge": {
+            "title": "Pagsamahin",
+            "description": "Pagdugtungin ang mga linyang ito.",
+            "key": "C",
+            "annotation": "Dinugtung ang {n} linya.",
+            "not_eligible": "Ang mga bagay na ito ay hindi maaaring pagsamahin.",
+            "not_adjacent": "Hindi mapagsama ang linyang ito dahil sila ay hindi konektado.",
+            "restriction": "Hindi maaaring ipagsama o i-merge dahil ang isa sa mga miyembro ng '{relation}\" ito ay hindi pa ganap na nai-download.",
+            "incomplete_relation": "Hindi maaaring ipagsama o i-merge dahil ang isa sa mga ito ay hindi pa ganap na nai-download."
+        },
+        "move": {
+            "title": "Ilipat ng posisyon",
+            "description": "Ilipat ang posisyon.",
+            "key": "M",
+            "annotation": {
+                "point": "Inilipat ang posisyon ng isang punto o tuldok.",
+                "vertex": "Inilipat ang posisyon ng isang \"node\" na sa isang \"way\".",
+                "line": "Inilipat ang posisyon ng isang linya.",
+                "area": "Inilipat ang posisyon ng isang area o poligon.",
+                "multiple": "Inilipat ang posisyon ang maraming bagay."
+            },
+            "incomplete_relation": "Hindi maaring ilipat ng posisyon dahil ito ay hindi pa ganap na nai-download."
+        },
+        "rotate": {
+            "title": "Paikutin",
+            "description": "Paikutin ang bagay na ito mula sa kanyang \"center point\".",
+            "key": "R",
+            "annotation": {
+                "line": "Pinaikot ang linya.",
+                "area": "Pinaikot ang area o poligon."
+            }
+        },
+        "reverse": {
+            "title": "Baliktarin",
+            "description": "Baliktarin ang direksyon ng linyang ito.",
+            "key": "V",
+            "annotation": "Binaliktad ang direksyon ng linya."
+        },
+        "split": {
+            "title": "Hatiin",
+            "description": {
+                "line": "Hatiin sa dalawa ang linya mula sa node na ito.",
+                "area": "Hatiin ang hangganan ng lugar na ito sa dalawa.",
+                "multiple": "Hatiin ang linya o hangganan ng lugar na ito sa dalawa."
+            },
+            "key": "X",
+            "annotation": {
+                "line": "Hatiin ang linya.",
+                "area": "Hatiin ang hangganan ng area o poligon.",
+                "multiple": "Hatiin ang {n} linya/area o poligon."
+            },
+            "not_eligible": "Hindi maaaring hatiin ang linya mula sa umpisa o dulong \"node\" nito.",
+            "multiple_ways": "Masyadong maraming mga linya dito upang hatiin."
+        }
+    },
+    "undo": {
+        "tooltip": "I-undo:{action}",
+        "nothing": "Walang ma-undo"
+    },
+    "redo": {
+        "tooltip": "i-redo: {action}",
+        "nothing": "Walang ma-redo."
+    },
+    "tooltip_keyhint": "Shortcut:",
+    "browser_notice": "Ang editor na ito ay suportado sa Firefox, Chrome, Safari, Opera, at Internet Explorer 9 at sa mas mataas pang bersion. I-upgrade ang inyong browser o gamitin Potlatch 2 upang i-edit ng mapa.",
+    "translate": {
+        "translate": "I-salin",
+        "localized_translation_label": "Multilingual name",
+        "localized_translation_language": "Pumili ng wika",
+        "localized_translation_name": "Pangalan"
+    },
+    "zoom_in_edit": "Mag-zoom-in para makapag-edit",
+    "logout": "Mag-logout",
+    "loading_auth": "Kumokonekta sa OpenStreetMap ...",
+    "report_a_bug": "I-ulat ang bug",
+    "status": {
+        "error": "Hindi maka-konekta sa API.",
+        "offline": "Kasalukuyang offline ang API. Subukang mag-edit muli sa ibang pagkakataon.",
+        "readonly": "Kasalukuyang nasa read-only ang API. Kailangan mong maghintay upang i-save ang iyong mga pagbabago."
+    },
+    "commit": {
+        "title": "I-save ang mga binago.",
+        "description_placeholder": "Maikling paglalarawan ng iyong mga ambag o edits",
+        "message_label": "Mag-commit mensahe",
+        "upload_explanation": "Ang mga pagbabagong na-upload ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
+        "upload_explanation_with_user": "Ang mga pagbabagong na-upload bilang {user} ay makikita sa lahat ng mapang gumagamit ng datos ng OpenStreetMap.",
+        "save": "I-save",
+        "cancel": "Kanselahin",
+        "warnings": "Mga babala",
+        "modified": "Binago",
+        "deleted": "Binura",
+        "created": "Nilikha"
+    },
+    "contributors": {
+        "list": "Edits nina {users}",
+        "truncated_list": "Edits nina {users} at {count} iba pa"
+    },
+    "geocoder": {
+        "search": "Maghanap sa buong mundo ...",
+        "no_results_visible": "Walang mga resulta sa kasalukuyang lugar sa mapa",
+        "no_results_worldwide": "Walang mga resultang natagpuan"
+    },
+    "geolocate": {
+        "title": "Ipakita ang kasalukuyang lokasyon."
+    },
+    "inspector": {
+        "no_documentation_combination": "Walang documentation para sa kumbinasyon ng mga tag na ginamit",
+        "no_documentation_key": "Walang \"documentation\" na magagamit para sa \"key\" na ito.",
+        "show_more": "Higit pang detalye",
+        "view_on_osm": "Tingnan sa openstreetmap.org",
+        "all_tags": "Lahat ng tags",
+        "all_members": "Lahat ng kasapi",
+        "all_relations": "Lahat ng \"relation\"",
+        "new_relation": "Bagong relation ...",
+        "role": "Kasapi",
+        "choose": "Pumili ng uri ng \"features\"",
+        "results": "{n} mga resulta para sa {search}",
+        "reference": "Tingnan sa OpenStreetMap Wiki",
+        "back_tooltip": "Baguhin ang \"feature\"",
+        "remove": "Alisin",
+        "search": "Mag-search",
+        "multiselect": "Napiling mga item",
+        "unknown": "Unknown",
+        "incomplete": "<not downloaded>",
+        "feature_list": "Mag-hanap ng \"feature\"",
+        "edit": "I-edit ang \"feature\"",
+        "none": "Wala",
+        "node": "Node",
+        "way": "Way",
+        "relation": "Relation",
+        "location": "Lokasyon"
+    },
+    "background": {
+        "title": "\"Background\" o \"imagery\"",
+        "description": "Mga setting ng \"background\" o \"imagery\"",
+        "percent_brightness": "{opacity}% Pagkalinaw",
+        "none": "Wala",
+        "custom": "Custom",
+        "custom_button": "I-edit ang custom na background",
+        "custom_prompt": "Magpasok ng template na tile URL. Ang wastong mga token ay {z}, {x}, {y} para sa Z/X/Y scheme at {u} naman para sa quadtile scheme.",
+        "fix_misalignment": "Ayusin ang pagkakahanay ng \"imagery\"",
+        "reset": "I-reset"
+    },
+    "restore": {
+        "heading": "Mayroon kang hindi na-save ng mga pagbabago",
+        "description": "Ibig mo bang ibalik ang mga hindi na-save na pagbabago mula sa isang nakaraang session sa pag-edit?",
+        "restore": "Ibalik",
+        "reset": "I-reset"
+    },
+    "save": {
+        "title": "I-save",
+        "help": "I-save ang mga pagbabago sa OpenStreetMap upang makita ng ibang gumagamit ng datos.",
+        "no_changes": "Walang mga pagbabago upang i-save.",
+        "error": "May error habang sinusubukang i-save",
+        "uploading": "Ina-upload ang mga pagbabago sa OpenStreetMap.",
+        "unsaved_changes": "Mayroon kang hindi na-save ng mga pagbabago"
+    },
+    "success": {
+        "edited_osm": "Nag-edit sa OSM!",
+        "just_edited": "Nag-edit ka sa OpenStreetMap!",
+        "view_on_osm": "Tingnan sa OSM",
+        "facebook": "I-share sa Facebook",
+        "twitter": "I-share sa Twitter",
+        "google": "I-share sa Google+",
+        "help_html": "Ang iyong nagawang mga pagbabago ay lilitaw sa \"Standard\" layer sa loob ng ilang minuto. Para sa iba pang mga layer at ang ilang mga tampok, maaaring mas matagal kaysa ilang minuto\n(<a href ='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank '>basahin ang detalye dito</ a>).\n"
+    },
+    "confirm": {
+        "okay": "Okay"
+    },
+    "splash": {
+        "welcome": "Maligayang pagdating sa iD OpenStreetMap editor",
+        "text": "Ang iD ay isang simple ngunit magandang editor para sa pag-edit ng libreng mapa ng buong mundo.  Ito ay bersyon {version}. Para sa karagdagang impormasyon tingnan ang {website} at i-ulat ang mga bugs sa {github}.",
+        "walkthrough": "Simulan ang \"Walkthrough\"",
+        "start": "Simulan ang pag-edit"
+    },
+    "source_switch": {
+        "live": "live",
+        "lose_changes": "Mayroon kang hindi na-save ang mga pagbabago. Mawawala ang pagbabagong ito kung lilipat sa ibang map server.   Sigurado ka bang gusto mong lumipat ng server?",
+        "dev": "dev"
+    },
+    "tag_reference": {
+        "description": "Paglalarawan",
+        "on_wiki": "{tag} sa wiki.osm.org",
+        "used_with": "Kabilang sa gingamait ang {type}"
+    },
+    "validations": {
+        "untagged_point": "Walang tag na punto o tuldok",
+        "untagged_line": "Walang tag na linya",
+        "untagged_area": "Walang tag na area o poligon",
+        "many_deletions": "Nagbura ka ng {n} bagay sa mapa. Sigurado ka bang gusto mong gawin ito? Ito ay tatanggalin sa mapa na nakikita sa openstreetmap.org.",
+        "tag_suggests_area": "Ang tag na {tag} ay kalimitang para sa mga area o poligon sublait ito ay nasa linya lamang.",
+        "untagged_tooltip": "Pumili ng uri ng \"feature\" na naglalarawan kung ano ang {geometry} na ito.",
+        "deprecated_tags": "Hindi na ginagamit na \"tag\": {tags}"
+    },
+    "zoom": {
+        "in": "i-zoom in",
+        "out": "I-zoom out"
+    },
+    "cannot_zoom": "Hindi na pwedeng mag-zoom out sa kasalukuyang \"mode\".",
+    "gpx": {
+        "local_layer": "Lokal na GPX file",
+        "drag_drop": "I-drag at i-drop ang .gpx file mula sa inyong \"computer\" sa pahinang ito, o i-click ang button sa kanan upang mag-browse",
+        "zoom": "I-zoom sa GPX track",
+        "browse": "Mag-browse ng .gpx file"
+    },
+    "help": {
+        "title": "Tulong",
+        "help": "# Help\n\nIto ay isang editor para sa [OpenStreetMap] (http://www.openstreetmap.org/), isang libre at maaaring i-edit na mapa ng mundo. Maaari mo itong gamitin upang idagdag at i-update ang iyong lugar, sa paggawa ng isang open-source at open-data na mapa ng mundo para magamit ng lahat.\n\nAng pag-edit na gagawin mo sa mapang ito ay makikita ng lahat ng gumagamit OpenStreetMap. Upang makapag-edit, kakailanganin mo ng [OpenStreetMap account] (https://www.openstreetmap.org/user/new). \n\nAng [iD editor] (http://ideditor.com/) ay isang collaborative proyekto,  ang [source code ay matatagpuan sa GitHub] (https://github.com/openstreetmap/iD).\n",
+        "editing_saving": "### Pag-edit & Saving\n\nEditor na ito ay dinisenyo upang gumana lalo na sa online, at ina-access mo ito sa pamamagitan ng isang website sa ngayon.\n\n### Pagpili ng Mga Tampok\n\nUpang pumili ng isang tampok ng mapa , tulad ng kalsada o punto ng interes , i-click \nsa ito sa mapa. Ito ay i-highlight ang mga napiling tampok , buksan ang isang panel na may \nmga detalye tungkol dito , at ipakita ang menu ng mga bagay na maaari mong gawin gamit ang tampok. \n\nUpang pumili ng maraming mga tampok , pindutin nang matagal ang 'Shift ' key. Pagkatapos ay i-click ang alinman sa \nsa ang tampok na gusto mong piliin , o i-drag sa mapa upang gumuhit ng parihaba . \nAy ito gumuhit ng isang kahon at piliin ang lahat ng mga punto sa loob nito.\n\n### Saving Pag-edit \n\nKapag gumawa ka ng mga pagbabago tulad ng pag-edit ng mga kalsada, gusali , at mga lugar, ang mga ito ay \nnaka-imbak sa isang lugar lamang hanggang sa i-save mo ang mga ito sa server. Huwag mag-alala kung gumawa ka \nisang pagkakamali - maaari mong i-undo ang mga pagbabago sa pamamagitan ng pag-click sa pindutan undo , at gawing muli ang \nmga pagbabago sa pamamagitan ng pag-click sa pindutan gawing muli.\n\nI-click ang 'I-save ' upang matapos sa isang pangkat ng mga pag-edit - halimbawa , kung nag- nakumpleto \nisang lugar ng bayan at nais na magsimula sa isang bagong lugar . Magkakaroon ka ng pagkakataong \nupang suriin kung ano ang iyong nagawa , at ang editor supplies nakakatulong na mga mungkahi\nat babala kung may isang bagay ay hindi tila karapatan tungkol sa mga pagbabago . \n\nKung mukhang maganda ang lahat ng bagay , maaari mong ipasok ang isang maikling komento na nagpapaliwanag ng mga pagbabago\nna ginawa mo , at i-click muli ang ' I-save' upang i-post ang mga pagbabago\nsa [ OpenStreetMap.org ] ( http://www.openstreetmap.org/ ), kung saan ang mga ito ay nakikita \nsa lahat ng iba pang mga gumagamit at magagamit para sa iba upang bumuo at pagbutihin sa.\n\nKung hindi mo maaaring tapusin ang iyong mga pag-edit sa isang sitting , maaari mong iwanan ang editor window at bumalik ( sa parehong browser at computer ) , at ang\neditor application ay mag-aalok upang ibalik ang iyong trabaho .\n\n"
+    },
+    "intro": {
+        "navigation": {
+            "title": "Navigation",
+            "drag": "Ang pangunahing lugar ng mapa ay nagpapakita ng datos ng na makikita sa OpenStreetMap. Maaari kang mag-navigate sa pamamagitan ng pag-drag at pag-scroll, tulad ng anumang webmap. **I-drag ang mapa!**",
+            "select": "Mga tampok ng mapa ay kinakatawan ng tatlong paraan: gamit ang mga puntos, mga linya o area/poligon. Ang lahat ng mga tampok ay maaaring piliin sa pamamagitan ng pag-click sa mga ito. **Mag-click sa punto upang piliin ito.**",
+            "header": "Ang \"header\" ay nagpapakita kung anong uri ng \"feature\" ito.",
+            "pane": "Kapag ang isang tampok ay pinili, ang feature editor ay ipinapakita. Ang header ay nagpapakita kung anong uri ng tampok at ipinapakita sa pangunahing pane ang mga katangian ng tampok, tulad ng pangalan at address. **Isara ang feature editor gamit ang close button na malapit sa kanang tuktok. **"
+        },
+        "points": {
+            "title": "Mga Punto o tuldok",
+            "add": "Ang mga puntos ay maaaring gamitin upang kumatawan sa mga tampok tulad ng mga tindahan, kainan at mga monumento. Markahan ang mga ito sa tukoy na lokasyon, at ilarawan kung ano ito. **I-click ang pindutan ng Point upang magdagdag ng bagong punto.**",
+            "place": "Gumawa ng punto sa pamamagitan ng pag-click sa mapa. **Ilagay ang tuldok sa tuktok ng gusali.**",
+            "search": "Maraming iba't ibang mga tampok ang pwedeng kumatawan bilang puntos. Ang puntong iyong nai-dagdag ay isang Cafe. **I-search ang '{name}'**",
+            "choose": "**Pumili ng Cafe mula sa talaan.**",
+            "describe": "Ang punto o tuldok na ito ay minarkahan bilang \"cafe\".  Gamit ang \"feature editor\", maari tayong magdagdag ng iba pang impormasyon. **Magdagdag ng pangalan**",
+            "close": "Ang feature editor ay maaring isara sa pamamagitan ng pag-click ng \"Close\". **Isara the feature editor**",
+            "reselect": "Kadalasan, may mga puntos nang nalikha ng ibang mappers, ngunit may mga mali o hindi kumpleto. Maaaring i-edit ang mga puntos na ito. **Piliin ang punto na nilikha mo kanina.**",
+            "fixname": "**Baguhin o magdagdag ng pangalan ng kalsada at isara ang \"feature editor\"**",
+            "reselect_delete": "Ang lahat ng mga nasa mapa ay maaring burahin. **Mag-click sa punto na nilikha mo.**",
+            "delete": "Ang menu sa paligid ng punto ay naglalaman ng mga operasyon na maaaring isagawa dito, tulad ng pagbura. **Burahin ang punto. **"
+        },
+        "areas": {
+            "title": "Mga area o poligon",
+            "add": "Ang mga area o poligon ay mas detalyadong paraan upang kumatawan sa mga tampok. Nagbibigay ang mga ito ng impormasyon sa mga hangganan o boundary ng lugar. Ang karamihan ng maaring i-mapa gamit ang puntos ay pwede rin i-katawan bilang area o poligon. **I-click ang button para sa Area upang magdagdag ng bagong area o poligon.**",
+            "corner": "Ang paglikha ng area o poligon ay sa pamamagitan ng paglalagay node sa paligid ng mga hangganan ng lugar. **Ilagay ang unang node sa isa sa mga sulok ng palaruan.**",
+            "place": "Ipagpatuloy ang pag-guhit ng area o pligon sa pamamagitan ng paglalagay ng higit pang mga node. Tapusin ito sa pamamagitan ng pag-click sa umpisang node. ** Gumuhit ng area o pilgon ng palaruan.**",
+            "search": "**Hanapin ang '{name}'.**",
+            "choose": "**Pliin ang \"Playground\" mula sa talaan.**",
+            "describe": "**Magdagdag ng pangalan at isara ang \"feature editor\"**"
+        },
+        "lines": {
+            "title": "Mga linya",
+            "add": "Ang mga linya ay ginagamit para kumatawan sa mga \"feature\" na gaya ng mga kalsada, riles ng tren at ilog. **I-click ang button para sa \"Linya\" upang magdagdag ng bagong linya. **",
+            "start": "**Simulan ang linya sa pamamagitan ng pag-click sa dulo ng kalsada.**",
+            "finish": "Ang mga linya ay matatapos sa pamamagitan ng pag-click muli sa huling node. **Taposin ang pagguhit ng kalsada.**",
+            "road": "**Piliin ang \"Road\" mula sa talaan**",
+            "residential": "Mayroong iba't ibang mga uri ng mga kalsada, ang pinaka-karaniwang ay residential. **Piliin ang residential na uri ng kalsada**",
+            "describe": "**Magdagdag ng pangalan ng kalsada at isara ang \"feature editor\"**",
+            "restart": "Kailangang i-intersect ang kalsada sa Flower Street.",
+            "wrong_preset": "Hindi ka pumili ang Residential na uri ng kalsada. **I-click dito upang piliin muli**"
+        },
+        "startediting": {
+            "title": "Umpisahan ang pag-edit",
+            "help": "Higit pang mga documentation at ang walkthrough ang makukuha dito.",
+            "save": "Huwag kalimutan na regular na i-save ang iyong mga binago!",
+            "start": "Simulan ang pagma-mapa!"
+        }
+    },
+    "presets": {
+        "fields": {
+            "address": {
+                "label": "Address",
+                "placeholders": {
+                    "number": "123",
+                    "street": "Kalsada",
+                    "city": "Siyudad"
+                }
+            },
+            "aerialway": {
+                "label": "Uri"
+            },
+            "aeroway": {
+                "label": "Uri"
+            },
+            "amenity": {
+                "label": "Uri"
+            },
+            "artwork_type": {
+                "label": "Uri"
+            },
+            "atm": {
+                "label": "ATM"
+            },
+            "barrier": {
+                "label": "Uri"
+            },
+            "bicycle_parking": {
+                "label": "Uri"
+            },
+            "boundary": {
+                "label": "Uri"
+            },
+            "building": {
+                "label": "Gusali"
+            },
+            "building_area": {
+                "label": "Gusali"
+            },
+            "capacity": {
+                "label": "Kapasidad"
+            },
+            "construction": {
+                "label": "Uri"
+            },
+            "crossing": {
+                "label": "Uri"
+            },
+            "entrance": {
+                "label": "Uri"
+            },
+            "fire_hydrant/type": {
+                "label": "Uri"
+            },
+            "generator/type": {
+                "label": "Uri"
+            },
+            "highway": {
+                "label": "Uri"
+            },
+            "historic": {
+                "label": "Uri"
+            },
+            "information": {
+                "label": "Uri"
+            },
+            "internet_access": {
+                "options": {
+                    "wlan": "Wifi"
+                }
+            },
+            "landuse": {
+                "label": "Uri"
+            },
+            "leisure": {
+                "label": "Uri"
+            },
+            "man_made": {
+                "label": "Uri"
+            },
+            "name": {
+                "label": "Pangalan"
+            },
+            "office": {
+                "label": "Uri"
+            },
+            "parking": {
+                "label": "Uri"
+            },
+            "piste/type": {
+                "label": "Uri"
+            },
+            "place": {
+                "label": "Uri"
+            },
+            "power": {
+                "label": "Uri"
+            },
+            "railway": {
+                "label": "Uri"
+            },
+            "relation": {
+                "label": "Uri"
+            },
+            "restriction": {
+                "label": "Uri"
+            },
+            "route": {
+                "label": "Uri"
+            },
+            "route_master": {
+                "label": "Uri"
+            },
+            "service": {
+                "label": "Uri"
+            },
+            "shelter_type": {
+                "label": "Uri"
+            },
+            "shop": {
+                "label": "Uri"
+            },
+            "studio_type": {
+                "label": "Uri"
+            },
+            "tourism": {
+                "label": "Uri"
+            },
+            "tracktype": {
+                "label": "Uri"
+            },
+            "tree_type": {
+                "label": "Uri"
+            },
+            "water": {
+                "label": "Uri"
+            },
+            "waterway": {
+                "label": "Uri"
+            },
+            "wetland": {
+                "label": "Uri"
+            },
+            "wood": {
+                "label": "Uri"
+            }
+        },
+        "presets": {
+            "building": {
+                "name": "Gusali"
+            }
+        }
+    }
+}

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

@@ -848,9 +848,6 @@
             "building/construction": {
                 "name": "Yapı İnşaat Aşamasında"
             },
-            "building/entrance": {
-                "name": "Giriş"
-            },
             "building/garage": {
                 "name": "Garaj"
             },
@@ -953,9 +950,6 @@
             "emergency/fire_hydrant": {
                 "name": "Yangın Musluğu"
             },
-            "entrance": {
-                "name": "Giriş"
-            },
             "footway/sidewalk": {
                 "name": "Kaldırım"
             },

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

@@ -71,7 +71,8 @@
                 "line": "Лінія перетворена на коло.",
                 "area": "Полігон перетворено на коло."
             },
-            "not_closed": "Неможливо перетворити на коло — лінія не замкнена."
+            "not_closed": "Неможливо перетворити на коло — лінія не замкнена.",
+            "too_large": "Неможливо перетворити на коло, не все що є видно."
         },
         "orthogonalize": {
             "title": "Випрямити кути",
@@ -84,7 +85,8 @@
                 "line": "Випрямлено кути лінії.",
                 "area": "Випрямлено кути полігону."
             },
-            "not_squarish": "Випрямити кути не вдалось, об’єкт не має відповідних кутів."
+            "not_squarish": "Випрямити кути не вдалось, об’єкт не має відповідних кутів.",
+            "too_large": "Неможливо зробити кути прямими, не все що є видно."
         },
         "straighten": {
             "title": "Випрямити",
@@ -134,7 +136,8 @@
             "annotation": "Об’єднати {n} ліній.",
             "not_eligible": "Ці об’єкти неможливо злити.",
             "not_adjacent": "Ці лінії неможливо злити, бо вони не з’єднані.",
-            "restriction": "Ці лінії не можуть бути об’єднані, принаймні одна з них є членом зв’язку \"{relation}\"."
+            "restriction": "Ці лінії не можуть бути об’єднані, принаймні одна з них є членом зв’язку \"{relation}\".",
+            "incomplete_relation": "Ці об’єкти не можуть бути об’єднані, принаймні один з них завантажений не повністю."
         },
         "move": {
             "title": "Пересунути",
@@ -264,6 +267,8 @@
         "percent_brightness": "прозорість {opacity}%",
         "none": "Пусте",
         "custom": "Власний фон",
+        "custom_button": "Параметри власного фону",
+        "custom_prompt": "Введіть шаблон URL для квадратів мапи. Використовуйте  {z}, {x}, {y} для схеми Z/X/Y та {u} для схеми QuadTiles.",
         "fix_misalignment": "Виправити зсув",
         "reset": "скинути"
     },
@@ -961,7 +966,8 @@
                 "terms": "Marketplace, hbyjr,базар,базарна площа"
             },
             "amenity/parking": {
-                "name": "Автостоянка"
+                "name": "Автостоянка",
+                "terms": "стоянка, паркування, парковка, fdnjcnjzyrf"
             },
             "amenity/pharmacy": {
                 "name": "Аптека",
@@ -1141,10 +1147,6 @@
                 "name": "Комерційна нерухомість",
                 "terms": "Commercial Building,rjvthwsqyf ythejvscnm"
             },
-            "building/entrance": {
-                "name": "Вхід",
-                "terms": "Entrance,dsl,двері,ворота,вихід,фіртка"
-            },
             "building/garage": {
                 "name": "Гараж",
                 "terms": "Garage,ufhf"
@@ -1183,10 +1185,6 @@
                 "name": "Телефон виклику екстрених служб",
                 "terms": "Emergency Phone,tekeajy dbrkbre trchtyb cke"
             },
-            "entrance": {
-                "name": "Вхід",
-                "terms": "Entrance,dsl,двері,ворота,вихід,фіртка"
-            },
             "footway/crossing": {
                 "name": "Перехрестя"
             },

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

@@ -610,6 +610,33 @@
             "fuel": {
                 "label": "Nhiên liệu"
             },
+            "fuel/biodiesel": {
+                "label": "Bán Diesel Sinh học"
+            },
+            "fuel/diesel": {
+                "label": "Bán Diesel"
+            },
+            "fuel/e10": {
+                "label": "Bán E10"
+            },
+            "fuel/e85": {
+                "label": "Bán E85"
+            },
+            "fuel/lpg": {
+                "label": "Bán Prôpan"
+            },
+            "fuel/octane_100": {
+                "label": "Bán Xăng Xe đua"
+            },
+            "fuel/octane_91": {
+                "label": "Bán Xăng Bình thường"
+            },
+            "fuel/octane_95": {
+                "label": "Bán Xăng Trung hạng"
+            },
+            "fuel/octane_98": {
+                "label": "Bán Xăng Thượng hạng"
+            },
             "gauge": {
                 "label": "Khổ"
             },
@@ -673,6 +700,9 @@
             "leisure": {
                 "label": "Loại"
             },
+            "length": {
+                "label": "Chiều dài (Mét)"
+            },
             "levels": {
                 "label": "Số Tầng",
                 "placeholder": "2, 4, 6…"
@@ -744,6 +774,9 @@
             "place": {
                 "label": "Kiểu"
             },
+            "population": {
+                "label": "Dân số"
+            },
             "power": {
                 "label": "Kiểu"
             },
@@ -807,6 +840,9 @@
             "shop": {
                 "label": "Kiểu"
             },
+            "sloped_curb": {
+                "label": "Lề đường Dốc"
+            },
             "smoking": {
                 "label": "Hút thuốc"
             },
@@ -830,7 +866,8 @@
                     "bridge": "Cầu",
                     "tunnel": "Đường hầm",
                     "embankment": "Đường đắp cao",
-                    "cutting": "Đường xẻ"
+                    "cutting": "Đường xẻ",
+                    "ford": "Nơi Lội qua Sông"
                 }
             },
             "studio_type": {
@@ -842,6 +879,9 @@
             "surface": {
                 "label": "Mặt"
             },
+            "tactile_paving": {
+                "label": "Gạch dành cho Người Khiếm thị"
+            },
             "toilets/disposal": {
                 "label": "Phương pháp thải"
             },
@@ -885,6 +925,9 @@
             "wheelchair": {
                 "label": "Đi Xe lăn Được"
             },
+            "width": {
+                "label": "Chiều ngang (Mét)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
@@ -1029,6 +1072,10 @@
                 "name": "Rửa xe",
                 "terms": "tiệm rửa xe, rửa xe, tiem rua xe, rua xe"
             },
+            "amenity/charging_station": {
+                "name": "Trạm Sạc Pin",
+                "terms": "trạm sạc pin, trạm sạc xe hơi điện, tram sac pin, tram sac xe hoi dien"
+            },
             "amenity/childcare": {
                 "name": "Giữ trẻ",
                 "terms": "giữ trẻ, giữ con nít, giữ đứa bé, giu tre, giu con nit, giu dua be"
@@ -1049,6 +1096,10 @@
                 "name": "Trường Cao đẳng",
                 "terms": "trường cao đẳng, cao đẳng, CĐ, truong cao dang, cao dang, CD"
             },
+            "amenity/compressed_air": {
+                "name": "Khí Nén",
+                "terms": "khí nén, không khí nén, khi nen, khong khi nen"
+            },
             "amenity/courthouse": {
                 "name": "Tòa",
                 "terms": "tòa án, tòa, toà án, toà, toa an, toa"
@@ -1113,6 +1164,10 @@
                 "name": "Bãi Đậu xe",
                 "terms": "bãi đậu xe, sân đậu xe, đậu xe, bãi đỗ xe, sân đỗ xe, đỗ xe, bai dau xe, san dau xe, dau xe, bai do xe, san do xe, do xe"
             },
+            "amenity/parking_entrance": {
+                "name": "Lối Ra vào Ga ra",
+                "terms": "lối ra vào ga ra, lối ra vào ga-ra, lối ra ga ra, lối vào ga ra, lối ra ga-ra, lối ra ga-ra, loi ra vao ga ra, loi ra vao ga-ra, loi ra ga ra, loi vao ga ra, loi ra ga-ra, loi ra ga-ra"
+            },
             "amenity/pharmacy": {
                 "name": "Nhà thuốc",
                 "terms": "nhà thuốc, tiệm thuốc, nha thuoc, tiem thuoc"
@@ -1358,8 +1413,8 @@
                 "terms": "ký túc xá, kí túc xá, ký túc sá, kí túc sá, cư xá, ky tuc xa, ki tuc xa, ky tuc sa, ki tuc sa, cu xa"
             },
             "building/entrance": {
-                "name": "Cửa vào",
+                "name": "Cửa Ra vào",
-                "terms": "cửa vào, lối vào, cua vao, loi vao"
+                "terms": "cửa ra vào, cửa ra, cửa vào, cổng vào, lối vào, cua ra vao, cua ra, cua vao, cong vao, loi vao"
             },
             "building/garage": {
                 "name": "Ga ra",
@@ -1638,8 +1693,8 @@
                 "terms": "điện thoại khẩn cấp, dien thoai khan cap"
             },
             "entrance": {
-                "name": "Cửa vào",
+                "name": "Lối Ra vào",
-                "terms": "cửa vào, lối vào, cua vao, loi vao"
+                "terms": "lối vào, cửa ra vào, cửa ra, cửa vào, cổng vào, loi vao, cua ra vao, cua ra, cua vao, cong vao"
             },
             "footway/crossing": {
                 "name": "Lối Băng qua Đường",
@@ -1649,6 +1704,10 @@
                 "name": "Lề đường",
                 "terms": "lề đường, vỉa hè, đường đi bộ, đường dạo, le duong, vie he, duong di bo, duong dao"
             },
+            "ford": {
+                "name": "Nơi Lội qua Sông",
+                "terms": "nơi lội qua sông, chỗ lội qua sông, nơi lội qua suối, chỗ lội qua suối, nơi cạn, chỗ cạn, noi loi qua song, cho loi qua song, noi lo qua suoi, cho loi qua suoi, noi can, cho can"
+            },
             "golf/bunker": {
                 "name": "Bẫy Cát",
                 "terms": "bẫy cát, hố cát, boongke, boong-ke, boong ke, bunker, bay cat, ho cat"
@@ -1881,6 +1940,10 @@
                 "name": "Nghĩa địa",
                 "terms": "nghĩa địa, nghĩa trang, bãi tha ma, mộ, nghia dia, nghia trang, bai tha ma, mo"
             },
+            "landuse/churchyard": {
+                "name": "Sân Nhà thờ",
+                "terms": "sân nhà thờ, khu đất nhà thờ, sân nhà thờ chính tòa, khu đất nhà thờ chính tòa, sân nhà thờ chính toà, khu đất nhà thờ chính toà, sân nhà thờ chánh tòa, khu đất nhà thờ chánh tòa, sân nhà thờ chánh toà, khu đất nhà thờ chánh tòa, san nha tho, khu dat nha tho, san nha tho chinh toa, khu dat nha tho chinh toa, san nha tho chanh toa, khu dat nha tho chanh toa"
+            },
             "landuse/commercial": {
                 "name": "Thương mại",
                 "terms": "thương mại, văn phòng, công ty, công ti, buôn bán, thuong mai, van phong, cong ty, cong ti, buon ban"
@@ -1921,6 +1984,10 @@
                 "name": "Đồng cỏ",
                 "terms": "đồng cỏ, bãi cỏ, dong co, bai co"
             },
+            "landuse/military": {
+                "name": "Quân đội",
+                "terms": "quân đội, căn cứ quân đội, không quân, căn cứ không quân, hải quân, căn cứ hải quân, quân sự, lính, bộ đội, quan doi, can cu quan doi, khong quan, can cu khong quan, hai quan, can cu hai quan, quan su, linh, bo doi"
+            },
             "landuse/orchard": {
                 "name": "Vườn Cây",
                 "terms": "vườn cây, vườn trồng cây, vườn cây ăn trái, vườn cây ăn quả, vườn trái cây, vuon cay, vuon trong cay, vuon cay an trai, vuon cay an qua, vuon trai cay"
@@ -2673,6 +2740,10 @@
                 "name": "Tiệm Phim",
                 "terms": "tiệm bán phim, tiệm bán video, tiệm mướn phim, tiệm mướn video, chỗ bán phim, chỗ mướn phim, cửa hàng phim, cửa hiệu phim, quầy bán phim, tiem ban phim, tiem ban video, tiem muon phim, tiem muon video, cho ban phim, cho muon phim, cua hang phim, cua hieu phim, quay ban phim"
             },
+            "shop/wine": {
+                "name": "Tiệm Rượu vang",
+                "terms": "tiệm rượu vang, nơi bán rượu vang, chỗ bán rượu vang, quầy bán rượu vang, cửa hàng rượu vang, cửa hàng bán rượu vang, tiệm bán rượu vang, tiem ruou vang, noi ban ruou vang, cho ban ruou vang, quay ban ruou vang, cua hang ruou vang, cua hang ban ruou vang, tiem ban ruou vang"
+            },
             "tourism": {
                 "name": "Du lịch",
                 "terms": "du lịch, máy bay, xe lửa, chuyến bay, nghỉ hè, du lich, may bay, xe lua, chuyen bay, nghi he"

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

@@ -1187,10 +1187,6 @@
                 "name": "商業樓宇",
                 "terms": "Commercial Building,商業建築物,商業樓宇"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "building/garage": {
                 "name": "車庫",
                 "terms": "Garage,車庫"
@@ -1235,10 +1231,6 @@
                 "name": "求助電話",
                 "terms": "Emergency Phone,求助電話,緊急電話"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "Crossing,路口"

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

@@ -265,6 +265,7 @@
         "percent_brightness": "{opacity}%不透明度",
         "none": "空",
         "custom": "自定义",
+        "custom_button": "编辑自定义背景",
         "fix_misalignment": "修复对齐",
         "reset": "重置"
     },
@@ -772,6 +773,9 @@
             "sport": {
                 "label": "运动"
             },
+            "sport_ice": {
+                "label": "体育"
+            },
             "structure": {
                 "label": "结构",
                 "placeholder": "未知种类",
@@ -1232,10 +1236,6 @@
             "building/construction": {
                 "name": "在建建筑"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "入口"
-            },
             "building/garage": {
                 "name": "车库",
                 "terms": "车库"
@@ -1282,6 +1282,16 @@
                 "name": "仓库",
                 "terms": "仓库,货栈"
             },
+            "craft/beekeeper": {
+                "name": "养蜂人"
+            },
+            "craft/blacksmith": {
+                "name": "铁匠"
+            },
+            "craft/bookbinder": {
+                "name": "装订工人",
+                "terms": "书籍钉装员,装订商,装订工,钉书匠"
+            },
             "craft/brewery": {
                 "name": "酿酒厂",
                 "terms": "酒厂,酿酒厂,酒坊"
@@ -1322,10 +1332,6 @@
                 "name": "紧急电话",
                 "terms": "紧急电话"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "路口"
@@ -1349,6 +1355,9 @@
                 "name": "开球区",
                 "terms": "开球区,发球台"
             },
+            "golf/water_hazard": {
+                "name": "障碍水池"
+            },
             "highway": {
                 "name": "道路",
                 "terms": "公路"
@@ -1637,6 +1646,9 @@
                 "name": "公园",
                 "terms": "公园"
             },
+            "leisure/picnic_table": {
+                "name": "野餐桌"
+            },
             "leisure/pitch": {
                 "name": "体育场",
                 "terms": "运动场,运动场所"
@@ -2260,6 +2272,9 @@
                 "name": "照相馆",
                 "terms": "照相馆"
             },
+            "shop/seafood": {
+                "name": "海鲜店"
+            },
             "shop/shoes": {
                 "name": "鞋店",
                 "terms": "鞋店"

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

@@ -1125,10 +1125,6 @@
                 "name": "商業樓宇",
                 "terms": "Commercial Building,商業建築物,商業樓宇"
             },
-            "building/entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "building/garage": {
                 "name": "車庫",
                 "terms": "Garage,車庫"
@@ -1165,10 +1161,6 @@
                 "name": "求助電話",
                 "terms": "Emergency Phone,求助電話,緊急電話"
             },
-            "entrance": {
-                "name": "入口",
-                "terms": "Entrance,入口"
-            },
             "footway/crossing": {
                 "name": "路口",
                 "terms": "Crossing,路口"

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

@@ -1207,9 +1207,6 @@
             "building/commercial": {
                 "name": "商用樓宇"
             },
-            "building/entrance": {
-                "name": "入口"
-            },
             "building/garage": {
                 "name": "車庫"
             },
@@ -1414,9 +1411,6 @@
             "emergency/phone": {
                 "name": "緊急電話"
             },
-            "entrance": {
-                "name": "入口"
-            },
             "footway/crossing": {
                 "name": "行人過路線"
             },

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

@@ -872,18 +872,12 @@
             "building/apartments": {
                 "name": "酒店公寓"
             },
-            "building/entrance": {
-                "name": "入口"
-            },
             "building/house": {
                 "name": "房屋"
             },
             "emergency/phone": {
                 "name": "紧急电话"
             },
-            "entrance": {
-                "name": "入口"
-            },
             "highway": {
                 "name": "公路"
             },