Update to iD v1.5.4

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index f472ce7f6c810dd4cec219dcd0751776b2af39db..25f79ef3d3a14b33bc124a82f354017337998321 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -253,6 +253,18 @@ g.vertex.shared .stroke {
 }
 
 g.midpoint .fill {
 }
 
 g.midpoint .fill {

+    fill: #eee;
+    stroke: #444;
+    stroke-opacity: .6;
+    opacity: .7;
+}
+
+g.midpoint.tag-highway-pedestrian .fill,
+g.midpoint.tag-highway-steps .fill,
+g.midpoint.tag-highway-path .fill,
+g.midpoint.tag-highway-footway .fill,
+g.midpoint.tag-highway-cycleway .fill,
+g.midpoint.tag-highway-bridleway .fill {

     fill: #fff;
     stroke: #333;
     stroke-opacity: .8;
     fill: #fff;
     stroke: #333;
     stroke-opacity: .8;


@@ -412,15 +424,24 @@ path.fill.tag-leisure-park {
     background-color: rgba(140, 208, 95, 0.2);
 }
 
     background-color: rgba(140, 208, 95, 0.2);
 }
 

+path.fill.tag-landuse-residential,
+path.fill.tag-landuse-retail,
+path.fill.tag-landuse-commercial,
+path.fill.tag-landuse-industrial {
+    fill: none;
+    stroke-width: 60px;
+}
+

 path.stroke.tag-landuse-residential {
     stroke: rgb(224, 110, 95);
 }
 path.fill.tag-landuse-residential {
 path.stroke.tag-landuse-residential {
     stroke: rgb(224, 110, 95);
 }
 path.fill.tag-landuse-residential {

-    fill: rgba(224, 110, 95, 0.1);
+    stroke: rgba(224, 110, 95, 0.3);

 }
 .preset-icon-fill-area.tag-landuse-residential {
     border-color: rgb(224, 110, 95);
 }
 .preset-icon-fill-area.tag-landuse-residential {
     border-color: rgb(224, 110, 95);

-    background-color: rgba(224, 110, 95, 0.1);
+    background: none;
+    box-shadow: inset 0 0 0 5px rgba(224, 110, 95, 0.3);

 }
 
 path.stroke.tag-landuse-retail,
 }
 
 path.stroke.tag-landuse-retail,


@@ -429,23 +450,25 @@ path.stroke.tag-landuse-commercial {
 }
 path.fill.tag-landuse-retail,
 path.fill.tag-landuse-commercial {
 }
 path.fill.tag-landuse-retail,
 path.fill.tag-landuse-commercial {

-    fill: rgba(234, 176, 86, 0.1);
+    stroke: rgba(234, 176, 86, 0.3);

 }
 .preset-icon-fill-area.tag-landuse-retail,
 .preset-icon-fill-area.tag-landuse-commercial {
     border-color: rgb(234, 176, 86);
 }
 .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);
+    background: none;
+    box-shadow: inset 0 0 0 5px rgba(234, 176, 86, 0.3);

 }
 
 path.stroke.tag-landuse-industrial {
     stroke: rgb(228, 164, 245);
 }
 path.fill.tag-landuse-industrial {
 }
 
 path.stroke.tag-landuse-industrial {
     stroke: rgb(228, 164, 245);
 }
 path.fill.tag-landuse-industrial {

-    fill: rgba(228, 164, 245, 0.1);
+    stroke: rgba(228, 164, 245, 0.3);

 }
 .preset-icon-fill-area.tag-landuse-industrial {
     border-color: rgb(228, 164, 245);
 }
 .preset-icon-fill-area.tag-landuse-industrial {
     border-color: rgb(228, 164, 245);

-    background-color: rgba(228, 164, 245, 0.1);
+    background: none;
+    box-shadow: inset 0 0 0 5px rgba(228, 164, 245, 0.3);

 }
 
 path.stroke.tag-landuse-basin,
 }
 
 path.stroke.tag-landuse-basin,

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index 3190ee2422f3c6b39e5c07fde8184867c885b89c..11c3eb29ba1371f42429a41988249deac01098f3 100644 (file)
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -16411,7 +16411,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
     return d3.rebind(context, dispatch, 'on');
 };
 

-iD.version = '1.5.3';
+iD.version = '1.5.4';

 
 (function() {
     var detected = {};
 
 (function() {
     var detected = {};


@@ -23788,10 +23788,14 @@ iD.Background = function(context) {
 
     background.zoomToGpxLayer = function() {
         if (background.hasGpxLayer()) {
 
     background.zoomToGpxLayer = function() {
         if (background.hasGpxLayer()) {

-            var gpx = d3.geo.bounds(gpxLayer.geojson());
-
-            if (!context.map().extent().intersects(gpx)) {
-                context.map().extent(gpx);
+            var viewport = context.map().extent().polygon(),
+                coords = _.reduce(gpxLayer.geojson().features, function(coords, feature) {
+                    var c = feature.geometry.coordinates;
+                    return _.union(coords, feature.geometry.type === 'Point' ? [c] : c);
+                }, []);
+
+            if (!iD.geo.polygonIntersectsPolygon(viewport, coords)) {
+                context.map().extent(d3.geo.bounds(gpxLayer.geojson()));

             }
         }
     };
             }
         }
     };


@@ -24825,6 +24829,12 @@ iD.svg.Areas = function(projection) {
 
     var patternKeys = ['landuse', 'natural', 'amenity'];
 
 
     var patternKeys = ['landuse', 'natural', 'amenity'];
 

+    var clipped = ['residential', 'commercial', 'retail', 'industrial'];
+
+    function clip(entity) {
+        return clipped.indexOf(entity.tags.landuse) !== -1;
+    }
+

     function setPattern(d) {
         for (var i = 0; i < patternKeys.length; i++) {
             if (patterns.hasOwnProperty(d.tags[patternKeys[i]])) {
     function setPattern(d) {
         for (var i = 0; i < patternKeys.length; i++) {
             if (patterns.hasOwnProperty(d.tags[patternKeys[i]])) {


@@ -24867,11 +24877,28 @@ iD.svg.Areas = function(projection) {
         });
 
         var data = {
         });
 
         var data = {

+            clip: areas.filter(clip),

             shadow: strokes,
             stroke: strokes,
             fill: areas
         };
 
             shadow: strokes,
             stroke: strokes,
             fill: areas
         };
 

+        var clipPaths = surface.selectAll('defs').selectAll('.clipPath')
+           .filter(filter)
+           .data(data.clip, iD.Entity.key);
+
+        clipPaths.enter()
+           .append('clipPath')
+           .attr('class', 'clipPath')
+           .attr('id', function(entity) { return entity.id + '-clippath'; })
+           .append('path');
+
+        clipPaths.selectAll('path')
+           .attr('d', path);
+
+        clipPaths.exit()
+           .remove();
+

         var areagroup = surface
             .select('.layer-areas')
             .selectAll('g.areagroup')
         var areagroup = surface
             .select('.layer-areas')
             .selectAll('g.areagroup')


@@ -24910,6 +24937,10 @@ iD.svg.Areas = function(projection) {
 
                 this.setAttribute('class', entity.type + ' area ' + layer + ' ' + entity.id);
 
 
                 this.setAttribute('class', entity.type + ' area ' + layer + ' ' + entity.id);
 

+                if (layer === 'fill' && clip(entity)) {
+                    this.setAttribute('clip-path', 'url(#' + entity.id + '-clippath)');
+                }
+

                 if (layer === 'fill') {
                     setPattern.apply(this, arguments);
                 }
                 if (layer === 'fill') {
                     setPattern.apply(this, arguments);
                 }


@@ -25687,25 +25718,29 @@ iD.svg.Midpoints = function(projection, context) {
             .filter(midpointFilter)
             .data(_.values(midpoints), function(d) { return d.id; });
 
             .filter(midpointFilter)
             .data(_.values(midpoints), function(d) { return d.id; });
 

-        var group = groups.enter()
+        var enter = groups.enter()

             .insert('g', ':first-child')
             .attr('class', 'midpoint');
 
             .insert('g', ':first-child')
             .attr('class', 'midpoint');
 

-        group.append('polygon')
+        enter.append('polygon')

             .attr('points', '-6,8 10,0 -6,-8')
             .attr('class', 'shadow');
 
             .attr('points', '-6,8 10,0 -6,-8')
             .attr('class', 'shadow');
 

-        group.append('polygon')
+        enter.append('polygon')

             .attr('points', '-3,4 5,0 -3,-4')
             .attr('class', 'fill');
 
             .attr('points', '-3,4 5,0 -3,-4')
             .attr('class', 'fill');
 

-        groups.attr('transform', function(d) {
-            var translate = iD.svg.PointTransform(projection),
-                a = context.entity(d.edge[0]),
-                b = context.entity(d.edge[1]),
-                angle = Math.round(iD.geo.angle(a, b, projection) * (180 / Math.PI));
-            return translate(d) + ' rotate(' + angle + ')';
-        });
+        groups
+            .attr('transform', function(d) {
+                var translate = iD.svg.PointTransform(projection),
+                    a = context.entity(d.edge[0]),
+                    b = context.entity(d.edge[1]),
+                    angle = Math.round(iD.geo.angle(a, b, projection) * (180 / Math.PI));
+                return translate(d) + ' rotate(' + angle + ')';
+            })
+            .call(iD.svg.TagClasses().tags(
+                function(d) { return d.parents[0].tags; }
+            ));

 
         // Propagate data bindings.
         groups.select('polygon.shadow');
 
         // Propagate data bindings.
         groups.select('polygon.shadow');


@@ -25786,6 +25821,11 @@ iD.svg.Points = function(projection, context) {
 };
 iD.svg.Surface = function() {
     return function (selection) {
 };
 iD.svg.Surface = function() {
     return function (selection) {

+        selection.selectAll('defs')
+            .data([0])
+            .enter()
+            .append('defs');
+

         var layers = selection.selectAll('.layer')
             .data(['areas', 'lines', 'hit', 'halo', 'label']);
 
         var layers = selection.selectAll('.layer')
             .data(['areas', 'lines', 'hit', 'halo', 'label']);
 


@@ -102087,7 +102127,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "advanced": "Advanced (black diamond)",
                         "expert": "Expert (double black diamond)",
                         "freeride": "Freeride (off-piste)",
                         "advanced": "Advanced (black diamond)",
                         "expert": "Expert (double black diamond)",
                         "freeride": "Freeride (off-piste)",

-                        "extreme": "Extreme (climing equipment required)"
+                        "extreme": "Extreme (climbing equipment required)"

                     }
                 }
             },
                     }
                 }
             },


@@ -114636,7 +114676,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "delete": {
                 "title": "Delete",
             },
             "delete": {
                 "title": "Delete",

-                "description": "Remove this from the map.",
+                "description": "Delete object permanently.",

                 "annotation": {
                     "point": "Deleted a point.",
                     "vertex": "Deleted a node from a way.",
                 "annotation": {
                     "point": "Deleted a point.",
                     "vertex": "Deleted a node from a way.",


@@ -115451,7 +115491,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                         "advanced": "Advanced (black diamond)",
                         "expert": "Expert (double black diamond)",
                         "freeride": "Freeride (off-piste)",
                         "advanced": "Advanced (black diamond)",
                         "expert": "Expert (double black diamond)",
                         "freeride": "Freeride (off-piste)",

-                        "extreme": "Extreme (climing equipment required)"
+                        "extreme": "Extreme (climbing equipment required)"

                     }
                 },
                 "piste/grooming": {
                     }
                 },
                 "piste/grooming": {

diff --git a/vendor/assets/iD/iD/locales/ca.json b/vendor/assets/iD/iD/locales/ca.json
index b57a912e357b180b00d42339e786b60db2a83e0c..e05fc204eb3320cc2220f4f66f6ae48e5402e14e 100644 (file)
--- a/vendor/assets/iD/iD/locales/ca.json
+++ b/vendor/assets/iD/iD/locales/ca.json
@@ -832,7 +832,7 @@
                     "0": "0: Incl. mitjana <10%, grava/terra compactada, sense obstacles",
                     "1": "1: Incl. mitjana <15%. grava/terra compactada, pocs i petits obstacles",
                     "2": "2: Incl. mitjana <20%, superfície estable, roques i arrels de la mida d'un puny",
                     "0": "0: Incl. mitjana <10%, grava/terra compactada, sense obstacles",
                     "1": "1: Incl. mitjana <15%. grava/terra compactada, pocs i petits obstacles",
                     "2": "2: Incl. mitjana <20%, superfície estable, roques i arrels de la mida d'un puny",

-                    "3": "3: Incl. mitjana <25%, superfície veriable, roques i banques de la mida d'un puny",
+                    "3": "3: Incl. mitjana <25%, superfície variable, roques i banques de la mida d'un puny",

                     "4": "4: Incl. mitjana <30%, condicions pobres, grans roques/branques",
                     "5": "5: Molt empinat, generalment la bicicleta ha de ser empesa."
                 }
                     "4": "4: Incl. mitjana <30%, condicions pobres, grans roques/branques",
                     "5": "5: Molt empinat, generalment la bicicleta ha de ser empesa."
                 }


@@ -905,7 +905,7 @@
                     "novice": "Debutants (instrucció)",
                     "easy": "Fàcil (pista verda)",
                     "intermediate": "Intermedi (Pista blava)",
                     "novice": "Debutants (instrucció)",
                     "easy": "Fàcil (pista verda)",
                     "intermediate": "Intermedi (Pista blava)",

-                    "advanced": "Avançat (Pista Negre nivell I )",
+                    "advanced": "Avançat (Pista negra nivell I )",

                     "expert": "Expert (Pista negra nivell II)",
                     "freeride": "Pista no oficial (fora pistes)",
                     "extreme": "Extrem (es necessita equipament d'escalada)"
                     "expert": "Expert (Pista negra nivell II)",
                     "freeride": "Pista no oficial (fora pistes)",
                     "extreme": "Extrem (es necessita equipament d'escalada)"


@@ -1362,7 +1362,7 @@
             },
             "amenity/parking": {
                 "name": "Aparcament",
             },
             "amenity/parking": {
                 "name": "Aparcament",

-                "terms": "Aparcament, Pàrquing, Garatge"
+                "terms": "Aparcament, Pàrquing, Garatge, Parking, parking"

             },
             "amenity/parking_entrance": {
                 "name": "Entrada de Garatge/Sortida"
             },
             "amenity/parking_entrance": {
                 "name": "Entrada de Garatge/Sortida"

diff --git a/vendor/assets/iD/iD/locales/da.json b/vendor/assets/iD/iD/locales/da.json
index 91d10fb8f5d8913dae2d9d8b2bb3804c620e7d13..e07eacfdd0f4cb579e938a2de3b123fec8b18234 100644 (file)
--- a/vendor/assets/iD/iD/locales/da.json
+++ b/vendor/assets/iD/iD/locales/da.json
@@ -644,7 +644,11 @@
             },
             "electrified": {
                 "label": "Elektrificering",
             },
             "electrified": {
                 "label": "Elektrificering",

+                "placeholder": "Kontaktlinje, Elektrificeret jernbane",

                 "options": {
                 "options": {

+                    "contact_line": "Kontaktlinje",
+                    "rail": "Elektrificeret jernbane",
+                    "yes": "Ja (udspecificeret)",

                     "no": "Nej"
                 }
             },
                     "no": "Nej"
                 }
             },


@@ -879,12 +883,23 @@
                 }
             },
             "piste/grooming": {
                 }
             },
             "piste/grooming": {

-                "label": "Sikkerhed"
+                "label": "Sikkerhed",
+                "options": {
+                    "classic": "Klassisk",
+                    "mogul": "Pukkelpist",
+                    "backcountry": "Offpiste",
+                    "classic+skating": "Klassisk og skiløb",
+                    "scooter": "Snescooter",
+                    "skating": "Skøjteløb"
+                }

             },
             "piste/type": {
                 "label": "Type",
                 "options": {
             },
             "piste/type": {
                 "label": "Type",
                 "options": {

+                    "downhill": "Styrtløb",

                     "nordic": "Nordisk",
                     "nordic": "Nordisk",

+                    "sled": "Slæde",
+                    "hike": "Skivandretur",

                     "sleigh": "Kælk",
                     "playground": "Legeplads"
                 }
                     "sleigh": "Kælk",
                     "playground": "Legeplads"
                 }


@@ -935,6 +950,8 @@
                 "label": "Type"
             },
             "sac_scale": {
                 "label": "Type"
             },
             "sac_scale": {

+                "label": "Vandrings vanskelighedsniveau",
+                "placeholder": "Bjergvandring, Alpintvandring...",

                 "options": {
                     "hiking": "T1: Vandring",
                     "mountain_hiking": "T2: Bjergvandring",
                 "options": {
                     "hiking": "T1: Vandring",
                     "mountain_hiking": "T2: Bjergvandring",


@@ -969,6 +986,11 @@
                     "yes": "Tilladt alle steder"
                 }
             },
                     "yes": "Tilladt alle steder"
                 }
             },

+            "smoothness": {
+                "options": {
+                    "very_horrible": "Specialiseret off-road: traktor, ATV"
+                }
+            },

             "social_facility_for": {
                 "label": "Serviceret folk",
                 "placeholder": "Hjemmeløse, Handicappede, Børn osv"
             "social_facility_for": {
                 "label": "Serviceret folk",
                 "placeholder": "Hjemmeløse, Handicappede, Børn osv"


@@ -1008,6 +1030,9 @@
             "toilets/disposal": {
                 "label": "Bortskaffelse affald",
                 "options": {
             "toilets/disposal": {
                 "label": "Bortskaffelse affald",
                 "options": {

+                    "flush": "Træk & Slip",
+                    "pitlatrine": "Latrin",
+                    "chemical": "Kemisk",

                     "bucket": "Spand"
                 }
             },
                     "bucket": "Spand"
                 }
             },


@@ -1017,6 +1042,9 @@
             "towertype": {
                 "label": "Tårn type"
             },
             "towertype": {
                 "label": "Tårn type"
             },

+            "tracktype": {
+                "label": "Sportype"
+            },

             "trail_visibility": {
                 "label": "Spor synlighed"
             },
             "trail_visibility": {
                 "label": "Spor synlighed"
             },

diff --git a/vendor/assets/iD/iD/locales/de.json b/vendor/assets/iD/iD/locales/de.json
index 2638b0c2121544393e61c540ae643e382022111c..a7cee9b3a520ae870db089b569391aebdb58ef49 100644 (file)
--- a/vendor/assets/iD/iD/locales/de.json
+++ b/vendor/assets/iD/iD/locales/de.json
@@ -1367,7 +1367,7 @@
                 "terms": "Krankenhaus, Klinik, Klinikgelände, Hospital"
             },
             "amenity/kindergarten": {
                 "terms": "Krankenhaus, Klinik, Klinikgelände, Hospital"
             },
             "amenity/kindergarten": {

-                "name": "Kindergartengelände",
+                "name": "Kindergarten",

                 "terms": "Kindergarten, Spielplatz, Sandkasten"
             },
             "amenity/library": {
                 "terms": "Kindergarten, Spielplatz, Sandkasten"
             },
             "amenity/library": {


@@ -2687,8 +2687,8 @@
                 "terms": "Standseilbahn, Seilbahn, Drahtseilbahn, Kettenbahn"
             },
             "railway/halt": {
                 "terms": "Standseilbahn, Seilbahn, Drahtseilbahn, Kettenbahn"
             },
             "railway/halt": {

-                "name": "Bahn-Haltestelle",
-                "terms": "Bahn-Haltestelle, Zug-Haltestelle, Haltestelle"
+                "name": "Eisenbahn-Haltestelle",
+                "terms": "Bahn-Haltestelle, Zug-Haltestelle, Haltestelle, Haltepunkt"

             },
             "railway/level_crossing": {
                 "name": "Bahnübergang",
             },
             "railway/level_crossing": {
                 "name": "Bahnübergang",


@@ -2712,7 +2712,7 @@
             },
             "railway/station": {
                 "name": "Bahnhof",
             },
             "railway/station": {
                 "name": "Bahnhof",

-                "terms": "Bahnhof"
+                "terms": "Bahnhof, Haltepunkt, Haltestelle"

             },
             "railway/subway": {
                 "name": "U-Bahn",
             },
             "railway/subway": {
                 "name": "U-Bahn",


@@ -2808,7 +2808,7 @@
             },
             "shop/convenience": {
                 "name": "Gemischtwarenhandel",
             },
             "shop/convenience": {
                 "name": "Gemischtwarenhandel",

-                "terms": "Kaufgeschäft"
+                "terms": "Gemischtwarenladen, Kaufgeschäft"

             },
             "shop/deli": {
                 "name": "Feinkostladen",
             },
             "shop/deli": {
                 "name": "Feinkostladen",


@@ -2972,7 +2972,7 @@
             },
             "shop/variety_store": {
                 "name": "Gemischtwarenhandel",
             },
             "shop/variety_store": {
                 "name": "Gemischtwarenhandel",

-                "terms": "Gemischtwarenladen"
+                "terms": "Gemischtwarenladen, Kaufgeschäft"

             },
             "shop/video": {
                 "name": "Videothek",
             },
             "shop/video": {
                 "name": "Videothek",

diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json
index 6e86ab332c837b8147858410e5d89f4007f9f2e1..97f269ba2cffe4bf0a85363fc79afe9d1ece5c18 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -912,7 +912,7 @@
                     "advanced": "Advanced (black diamond)",
                     "expert": "Expert (double black diamond)",
                     "freeride": "Freeride (off-piste)",
                     "advanced": "Advanced (black diamond)",
                     "expert": "Expert (double black diamond)",
                     "freeride": "Freeride (off-piste)",

-                    "extreme": "Extreme (climing equipment required)"
+                    "extreme": "Extreme (climbing equipment required)"

                 }
             },
             "piste/grooming": {
                 }
             },
             "piste/grooming": {

diff --git a/vendor/assets/iD/iD/locales/es.json b/vendor/assets/iD/iD/locales/es.json
index a519000e2e1f7fbc5a8b8d005718e5127d99a1a4..4c41e294ac4b40ea12aa89423236e597b7fb1465 100644 (file)
--- a/vendor/assets/iD/iD/locales/es.json
+++ b/vendor/assets/iD/iD/locales/es.json
@@ -408,7 +408,7 @@
             "title": "Empezar a editar",
             "help": "Para ver más documentación y este tutorial pulse aquí.",
             "save": "¡No olvide guardar sus cambios regularmente!",
             "title": "Empezar a editar",
             "help": "Para ver más documentación y este tutorial pulse aquí.",
             "save": "¡No olvide guardar sus cambios regularmente!",

-            "start": "Empezar"
+            "start": "¡Empezar a editar el mapa!"

         }
     },
     "presets": {
         }
     },
     "presets": {


@@ -644,7 +644,10 @@
             },
             "electrified": {
                 "label": "Electrificación",
             },
             "electrified": {
                 "label": "Electrificación",

+                "placeholder": "Línea de contacto, Riel electrificada...",

                 "options": {
                 "options": {

+                    "contact_line": "Línea de contacto",
+                    "rail": "Riel electrificada",

                     "yes": "Sí (sin especificar)",
                     "no": "No"
                 }
                     "yes": "Sí (sin especificar)",
                     "no": "No"
                 }


@@ -669,7 +672,13 @@
                 "label": "De pago"
             },
             "fire_hydrant/type": {
                 "label": "De pago"
             },
             "fire_hydrant/type": {

-                "label": "Tipo"
+                "label": "Tipo",
+                "options": {
+                    "pillar": "Pilar/Sobre la tierra",
+                    "underground": "Subterráneo",
+                    "wall": "Pared",
+                    "pond": "Estanque"
+                }

             },
             "fixme": {
                 "label": "Arréglame"
             },
             "fixme": {
                 "label": "Arréglame"


@@ -792,6 +801,42 @@
                 "label": "Límite de velocidad",
                 "placeholder": "40, 50, 60..."
             },
                 "label": "Límite de velocidad",
                 "placeholder": "40, 50, 60..."
             },

+            "mtb/scale": {
+                "label": "Dificultad de bicicleta de montaña",
+                "placeholder": "0, 1, 2, 3...",
+                "options": {
+                    "0": "0: grava sólida/tierra apisonada, no hay obstáculos, curvas amplias",
+                    "1": "1: Poca superficie suleta, pequeños obstáculos, curvas amplias",
+                    "2": "2: Mucha superficie suelta, grandes obstáculos, giros en U fáciles",
+                    "3": "3: Superficie resbaladiza, grandes obstáculos, giros en U cerrados",
+                    "4": "4: Superficie suelta o rocosa, giros en U peligrosos",
+                    "5": "5: Dificultad máxima, campo rocoso, derrumbes",
+                    "6": "6: No manejable, excepto por los mejores ciclistas de montaña"
+                }
+            },
+            "mtb/scale/imba": {
+                "label": "Dificultad de pista IMBA",
+                "placeholder": "Fácil, Medio, Difícil...",
+                "options": {
+                    "0": "Más fácil (círculo blanco)",
+                    "1": "Fácil (círculo verde)",
+                    "2": "Medium (blue square)",
+                    "3": "Difficult (black diamond)",
+                    "4": "Extremadamente difícil (doble diamante negro)"
+                }
+            },
+            "mtb/scale/uphill": {
+                "label": "Dificultad de ciclismo de montaña cuesta arriba",
+                "placeholder": "0, 1, 2, 3...",
+                "options": {
+                    "0": "0: Promedio de inclinación <10%, grava/tierra apisonada, sin obstáculos",
+                    "1": "1: Promedio de inclinación <15%, grava/tierra apisonada, pocos objetos pequeños",
+                    "2": "2: Promedio de inclinación <20%, superficie estable, rocas del tamaño del puño/raíces",
+                    "3": "3: Promedio de inclinación <25%, superficie variable, rocas del tamaño del puño/ramas",
+                    "4": "4: Promedio de inclinación <30%, mal estado, rocas grandes/ramas",
+                    "5": "5: Muy empinado, la bicicleta generalmente necesita ser empujada o llevada"
+                }
+            },

             "name": {
                 "label": "Nombre",
                 "placeholder": "Nombre común (si existe)"
             "name": {
                 "label": "Nombre",
                 "placeholder": "Nombre común (si existe)"


@@ -838,20 +883,51 @@
                 "label": "Aparcamiento disuasorio"
             },
             "parking": {
                 "label": "Aparcamiento disuasorio"
             },
             "parking": {

-                "label": "Tipo"
+                "label": "Tipo",
+                "options": {
+                    "surface": "Superficie",
+                    "multi-storey": "Multinivel",
+                    "underground": "Subterráneo",
+                    "sheds": "Galpones",
+                    "carports": "Cocheras",
+                    "garage_boxes": "Garaje en cubículos",
+                    "lane": "Carril al borde del camino"
+                }

             },
             "phone": {
                 "label": "Teléfono",
                 "placeholder": "+31 42 123 4567"
             },
             "piste/difficulty": {
             },
             "phone": {
                 "label": "Teléfono",
                 "placeholder": "+31 42 123 4567"
             },
             "piste/difficulty": {

-                "label": "Dificultad"
+                "label": "Dificultad",
+                "placeholder": "Fácil, Intermedio, Avanzado...",
+                "options": {
+                    "novice": "Novato (instrucción)",
+                    "easy": "Fácil (círculo verde)",
+                    "intermediate": "Intermediate (blue square)",
+                    "advanced": "Avanzado (diamante negro)",
+                    "expert": "Experto (doble diamante negro)",
+                    "freeride": "Paseo libre (fuera de pista)",
+                    "extreme": "Extremo (necesario equipo de escalada)"
+                }

             },
             "piste/grooming": {
             },
             "piste/grooming": {

-                "label": "Adiestramiento"
+                "label": "Adiestramiento",
+                "options": {
+                    "classic": "Clásico",
+                    "classic+skating": "Clásico y patinaje",
+                    "scooter": "Ciclomotor/Motonieve",
+                    "skating": "Patinaje"
+                }

             },
             "piste/type": {
             },
             "piste/type": {

-                "label": "Tipo"
+                "label": "Tipo",
+                "options": {
+                    "downhill": "Cuesta abajo",
+                    "hike": "Caminata",
+                    "ice_skate": "Patín sobre hielo",
+                    "playground": "Jardín de juegos"
+                }

             },
             "place": {
                 "label": "Tipo"
             },
             "place": {
                 "label": "Tipo"


@@ -898,6 +974,10 @@
             "route_master": {
                 "label": "Tipo"
             },
             "route_master": {
                 "label": "Tipo"
             },

+            "sac_scale": {
+                "label": "Dificultad de senderismo",
+                "placeholder": "Caminata de montaña, Caminata Alpina..."
+            },

             "seasonal": {
                 "label": "Estacional"
             },
             "seasonal": {
                 "label": "Estacional"
             },


@@ -917,7 +997,22 @@
                 "label": "Bordillo inclinado"
             },
             "smoking": {
                 "label": "Bordillo inclinado"
             },
             "smoking": {

-                "label": "Fumar"
+                "label": "Fumar",
+                "placeholder": "No, Separado, Sí...",
+                "options": {
+                    "no": "No fumar en todas partes",
+                    "separated": "En zonas de fumadores, no físicamente aislado",
+                    "isolated": "En zonas de fumadores, físicamente aislados",
+                    "outside": "Permitido fuera",
+                    "yes": "Permitido en todas partes",
+                    "dedicated": "Dedicado a los fumadores (ej: el club de los fumadores)"
+                }
+            },
+            "smoothness": {
+                "options": {
+                    "good": "Ruedas finas: bicicletas de competición",
+                    "intermediate": "Ruedas: bicicleta urbana, silla de ruedas, ciclomotor"
+                }

             },
             "social_facility_for": {
                 "label": "Personas atendidas",
             },
             "social_facility_for": {
                 "label": "Personas atendidas",


@@ -956,7 +1051,13 @@
                 "label": "Pavimento táctil"
             },
             "toilets/disposal": {
                 "label": "Pavimento táctil"
             },
             "toilets/disposal": {

-                "label": "Disponible"
+                "label": "Disponible",
+                "options": {
+                    "flush": "Descarga",
+                    "pitlatrine": "Pozo/Letrina",
+                    "chemical": "Chemical",
+                    "bucket": "Bucket"
+                }

             },
             "tourism": {
                 "label": "Tipo"
             },
             "tourism": {
                 "label": "Tipo"


@@ -1116,11 +1217,14 @@
             },
             "amenity/bicycle_rental": {
                 "name": "Alquiler de bicicletas",
             },
             "amenity/bicycle_rental": {
                 "name": "Alquiler de bicicletas",

-                "terms": "bicicleta, bici, alquiler, rent"
+                "terms": "alquiler de bicicletas, préstamo de bicicletas, bici, bicicleta"

             },
             "amenity/boat_rental": {
                 "name": "Alquiler de barcos"
             },
             },
             "amenity/boat_rental": {
                 "name": "Alquiler de barcos"
             },

+            "amenity/bus_station": {
+                "name": "Estación de autobuses"
+            },

             "amenity/cafe": {
                 "name": "Cafetería",
                 "terms": "café, cafetería, té, salón de té, bar, restaurante"
             "amenity/cafe": {
                 "name": "Cafetería",
                 "terms": "café, cafetería, té, salón de té, bar, restaurante"


@@ -2535,7 +2639,7 @@
             },
             "shop/art": {
                 "name": "Tienda de arte",
             },
             "shop/art": {
                 "name": "Tienda de arte",

-                "terms": "Galería de arte"
+                "terms": "tienda de arte, galería de arte, sala de arte, arte, cultura, pintura, dibujo, escultura, cuadro, retrato, exposición"

             },
             "shop/bakery": {
                 "name": "Panadería",
             },
             "shop/bakery": {
                 "name": "Panadería",


@@ -2543,7 +2647,7 @@
             },
             "shop/beauty": {
                 "name": "Salón de belleza",
             },
             "shop/beauty": {
                 "name": "Salón de belleza",

-                "terms": "salón de belleza, estética"
+                "terms": "salón de belleza, estética, belleza, cuidado personal, embellecimiento"

             },
             "shop/beverages": {
                 "name": "Tienda de bebidas",
             },
             "shop/beverages": {
                 "name": "Tienda de bebidas",


@@ -2551,7 +2655,7 @@
             },
             "shop/bicycle": {
                 "name": "Tienda de bicicletas",
             },
             "shop/bicycle": {
                 "name": "Tienda de bicicletas",

-                "terms": "tienda de bicicletas, bici, bicicleta, taller de bicicletas"
+                "terms": "tienda de bicicletas, taller de bicicletas, reparación de bicicletas, bici, bicicleta"

             },
             "shop/bookmaker": {
                 "name": "Librero"
             },
             "shop/bookmaker": {
                 "name": "Librero"


@@ -2578,7 +2682,7 @@
             },
             "shop/car_repair": {
                 "name": "Taller de reparación de automóviles",
             },
             "shop/car_repair": {
                 "name": "Taller de reparación de automóviles",

-                "terms": "reparación, automóvil, vehículo, carro, coche, taller"
+                "terms": "taller mecánico, mecánico, chapero, reparación, automóvil, vehículo, carro, coche, taller"

             },
             "shop/chemist": {
                 "name": "Droguería",
             },
             "shop/chemist": {
                 "name": "Droguería",


@@ -2645,7 +2749,7 @@
             },
             "shop/gift": {
                 "name": "Tienda de regalos",
             },
             "shop/gift": {
                 "name": "Tienda de regalos",

-                "terms": "tienda, comercio, local, regalo, obsequio"
+                "terms": "tienda, comercio, local, regalo, obsequio, presentes"

             },
             "shop/greengrocer": {
                 "name": "Frutería",
             },
             "shop/greengrocer": {
                 "name": "Frutería",


@@ -2680,8 +2784,8 @@
                 "terms": "cerrajero, cerradura, candado"
             },
             "shop/lottery": {
                 "terms": "cerrajero, cerradura, candado"
             },
             "shop/lottery": {

-                "name": "Administración de Lotería",
-                "terms": "Administración de loterías, Venta de lotería"
+                "name": "Tienda de lotería",
+                "terms": "lotería, juego"

             },
             "shop/mall": {
                 "name": "Centro comercial",
             },
             "shop/mall": {
                 "name": "Centro comercial",


@@ -2719,7 +2823,7 @@
                 "terms": "fotografía, tienda , establecimiento, fotógrafo, cámara, retratista, revelado"
             },
             "shop/seafood": {
                 "terms": "fotografía, tienda , establecimiento, fotógrafo, cámara, retratista, revelado"
             },
             "shop/seafood": {

-                "name": "Tienda de Mariscos"
+                "name": "Tienda de frutos de mar"

             },
             "shop/shoes": {
                 "name": "Zapatería",
             },
             "shop/shoes": {
                 "name": "Zapatería",


@@ -2762,7 +2866,7 @@
                 "terms": "tienda, alquiler, renta, tienda de vídeos, videoclub, alquiler de vídeos, renta de vídeos"
             },
             "shop/wine": {
                 "terms": "tienda, alquiler, renta, tienda de vídeos, videoclub, alquiler de vídeos, renta de vídeos"
             },
             "shop/wine": {

-                "name": "Vinoteca, Tienda de vinos",
+                "name": "Tienda de vinos",

                 "terms": "vinatería, vinos, espirituosos, licorería, bebidas"
             },
             "tourism": {
                 "terms": "vinatería, vinos, espirituosos, licorería, bebidas"
             },
             "tourism": {

diff --git a/vendor/assets/iD/iD/locales/fr.json b/vendor/assets/iD/iD/locales/fr.json
index 1b4e4a556e708dfd15d1bc1c06d743f854c39d6b..9ed05cd0ee768d60b6736dc69293d5a93cfcea25 100644 (file)
--- a/vendor/assets/iD/iD/locales/fr.json
+++ b/vendor/assets/iD/iD/locales/fr.json
@@ -150,7 +150,8 @@
                 "area": "Polygone déplacé.",
                 "multiple": "Plusieurs objets déplacés"
             },
                 "area": "Polygone déplacé.",
                 "multiple": "Plusieurs objets déplacés"
             },

-            "incomplete_relation": "Cet élément ne peut pas être déplacé car il n'a pas été téléchargé dans son intégralité."
+            "incomplete_relation": "Cet élément ne peut pas être déplacé car il n'a pas été téléchargé dans son intégralité.",
+            "too_large": "Ne peut être déplacé parce que n'est pas suffisamment visible dans la fenêtre."

         },
         "rotate": {
             "title": "Rotation",
         },
         "rotate": {
             "title": "Rotation",


@@ -159,7 +160,8 @@
             "annotation": {
                 "line": "Pivoter la ligne.",
                 "area": "Pivoter un polyone."
             "annotation": {
                 "line": "Pivoter la ligne.",
                 "area": "Pivoter un polyone."

-            }
+            },
+            "too_large": "Ne peut être pivoté parce que n'est pas suffisamment visible dans la fenêtre."

         },
         "reverse": {
             "title": "Inverser",
         },
         "reverse": {
             "title": "Inverser",


@@ -481,7 +483,8 @@
                 }
             },
             "access_simple": {
                 }
             },
             "access_simple": {

-                "label": "Accès"
+                "label": "Accès",
+                "placeholder": "oui"

             },
             "access_toilets": {
                 "label": "Accès"
             },
             "access_toilets": {
                 "label": "Accès"


@@ -569,7 +572,25 @@
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {

-                "label": "Sens"
+                "label": "Sens",
+                "options": {
+                    "N": "Nord",
+                    "E": "Est",
+                    "S": "Sud",
+                    "W": "Ouest",
+                    "NE": "Nord-Est",
+                    "SE": "Sud-Est",
+                    "SW": "Sud-Ouest",
+                    "NW": "Nord-Ouest",
+                    "NNE": "Nord-Nord-Est",
+                    "ENE": "Est-Nord-Est",
+                    "ESE": "Est-Sud-Est",
+                    "SSE": "Sud-Sud-Est",
+                    "SSW": "Sud-Sud-Ouest",
+                    "WSW": "Ouest-Sud-Ouest",
+                    "WNW": "Ouest-Nord-Ouest",
+                    "NNW": "Nord-Nord-Ouest"
+                }

             },
             "clock_direction": {
                 "label": "Sens",
             },
             "clock_direction": {
                 "label": "Sens",


@@ -609,7 +630,12 @@
                 "label": "Description"
             },
             "electrified": {
                 "label": "Description"
             },
             "electrified": {

-                "label": "Électrification"
+                "label": "Électrification",
+                "options": {
+                    "rail": "Rails électrifiés",
+                    "yes": "Oui (non spécifié)",
+                    "no": "Non"
+                }

             },
             "elevation": {
                 "label": "Altitude"
             },
             "elevation": {
                 "label": "Altitude"


@@ -631,7 +657,12 @@
                 "label": "Prix"
             },
             "fire_hydrant/type": {
                 "label": "Prix"
             },
             "fire_hydrant/type": {

-                "label": "Type"
+                "label": "Type",
+                "options": {
+                    "underground": "Sous-terrain",
+                    "wall": "Mur",
+                    "pond": "Étang"
+                }

             },
             "fixme": {
                 "label": "À corriger"
             },
             "fixme": {
                 "label": "À corriger"


@@ -654,6 +685,21 @@
             "fuel/lpg": {
                 "label": "Vente de gaz propane"
             },
             "fuel/lpg": {
                 "label": "Vente de gaz propane"
             },

+            "fuel/octane_100": {
+                "label": "Vente d'Octane 100"
+            },
+            "fuel/octane_91": {
+                "label": "Vente de carburant Ordinaire"
+            },
+            "fuel/octane_95": {
+                "label": "Vente de Super 95"
+            },
+            "fuel/octane_98": {
+                "label": "Vente de Super 98"
+            },
+            "gauge": {
+                "label": "Écartement"
+            },

             "generator/method": {
                 "label": "Méthode"
             },
             "generator/method": {
                 "label": "Méthode"
             },


@@ -695,6 +741,8 @@
             "internet_access": {
                 "label": "Accès internet",
                 "options": {
             "internet_access": {
                 "label": "Accès internet",
                 "options": {

+                    "yes": "Oui",
+                    "no": "Non",

                     "wlan": "Wifi",
                     "wired": "Par câble",
                     "terminal": "Ordinateur"
                     "wlan": "Wifi",
                     "wired": "Par câble",
                     "terminal": "Ordinateur"


@@ -736,6 +784,31 @@
                 "label": "Vitesse maximale autorisée",
                 "placeholder": "50, 70, 90..."
             },
                 "label": "Vitesse maximale autorisée",
                 "placeholder": "50, 70, 90..."
             },

+            "mtb/scale": {
+                "label": "Difficulté VTT",
+                "placeholder": "0, 1, 2, 3..."
+            },
+            "mtb/scale/imba": {
+                "placeholder": "Facile, Intermédiaire, Difficile...",
+                "options": {
+                    "0": "Simplissime (ronds blancs)",
+                    "1": "Facile (ronds verts)",
+                    "2": "Intermédiaire (carrés bleus)",
+                    "3": "Difficile (losanges noirs)",
+                    "4": "Extrèmement difficile (doubles losanges noirs)"
+                }
+            },
+            "mtb/scale/uphill": {
+                "placeholder": "0, 1, 2, 3...",
+                "options": {
+                    "0": "0: Inclinaison <10% , sol consistent, pas d'obstacles",
+                    "1": "1: Inclinaison < 15%, sol consistant, quelques menus obstacles",
+                    "2": "2: Inclinaison <20%, surface stable, pierres/racines",
+                    "3": "3: Inclinaison <25%, différents types de terrains, pierres/branches",
+                    "4": "4: Inclinaison <30%, conditions difficiles, rochers/branches",
+                    "5": "5: Abrupt, le vélo doit généralement être porté ou poussé"
+                }
+            },

             "name": {
                 "label": "Nom",
                 "placeholder": "Nom courant (si existant)"
             "name": {
                 "label": "Nom",
                 "placeholder": "Nom courant (si existant)"


@@ -753,10 +826,20 @@
                 "label": "Type"
             },
             "oneway": {
                 "label": "Type"
             },
             "oneway": {

-                "label": "Sens unique"
+                "label": "Sens unique",
+                "options": {
+                    "undefined": "Supposément Non",
+                    "yes": "Oui",
+                    "no": "Non"
+                }

             },
             "oneway_yes": {
             },
             "oneway_yes": {

-                "label": "Sens unique"
+                "label": "Sens unique",
+                "options": {
+                    "undefined": "Supposément Oui",
+                    "yes": "Oui",
+                    "no": "Non"
+                }

             },
             "opening_hours": {
                 "label": "Heures"
             },
             "opening_hours": {
                 "label": "Heures"


@@ -779,7 +862,16 @@
                 "placeholder": "+33 1 23 45 67 89"
             },
             "piste/difficulty": {
                 "placeholder": "+33 1 23 45 67 89"
             },
             "piste/difficulty": {

-                "label": "Difficulté"
+                "label": "Difficulté",
+                "placeholder": "Facile, Intermédiaire, Avancé...",
+                "options": {
+                    "easy": "Facile (ronds verts)",
+                    "intermediate": "Intermédiaire (carrés bleus)",
+                    "advanced": "Avancé (losanges noirs)",
+                    "expert": "Expert (doubles losanges noirs)",
+                    "freeride": "Freeride (hors piste)",
+                    "extreme": "Extrème (matériel d'escalade requis)"
+                }

             },
             "piste/grooming": {
                 "label": "Damage"
             },
             "piste/grooming": {
                 "label": "Damage"


@@ -886,7 +978,16 @@
                 "label": "Type de tour"
             },
             "trail_visibility": {
                 "label": "Type de tour"
             },
             "trail_visibility": {

-                "label": "Visibilité du sentier"
+                "label": "Visibilité du sentier",
+                "placeholder": "Excellent, Bon, Mauvais...",
+                "options": {
+                    "excellent": "Excellent: chemin clairement identifiable ou balisage fréquent",
+                    "good": "Bon: balisage globalement visible",
+                    "intermediate": "Intermédiaire: peu de balisage, sentier identifiable",
+                    "bad": "Mauvais: pas de balisage, sentier inconsistent",
+                    "horrible": "Horrible: sentier disaraît fréquemment, nécessite de s'orienter",
+                    "no": "Non: sans sentier, nécessite de bonnes compétences d'orientation"
+                }

             },
             "tree_type": {
                 "label": "Type"
             },
             "tree_type": {
                 "label": "Type"


@@ -959,7 +1060,8 @@
                 "terms": "Pylône de remontée mécanique"
             },
             "aerialway/rope_tow": {
                 "terms": "Pylône de remontée mécanique"
             },
             "aerialway/rope_tow": {

-                "name": "Télécorde"
+                "name": "Télécorde",
+                "terms": "Téléski, Tire-fesse, Télécorde"

             },
             "aerialway/station": {
                 "name": "Gare de remontée mécanique",
             },
             "aerialway/station": {
                 "name": "Gare de remontée mécanique",


@@ -1064,6 +1166,10 @@
                 "name": "Lavage de voiture, Lave auto",
                 "terms": "Lavage de voiture, lave auto"
             },
                 "name": "Lavage de voiture, Lave auto",
                 "terms": "Lavage de voiture, lave auto"
             },

+            "amenity/charging_station": {
+                "name": "Borne de recharge",
+                "terms": "Station de recharge, Borne de recharge"
+            },

             "amenity/childcare": {
                 "name": "Garderie",
                 "terms": "Garderie, nurserie, école des devoirs"
             "amenity/childcare": {
                 "name": "Garderie",
                 "terms": "Garderie, nurserie, école des devoirs"


@@ -1485,7 +1591,8 @@
                 "name": "Confiserie"
             },
             "craft/dressmaker": {
                 "name": "Confiserie"
             },
             "craft/dressmaker": {

-                "name": "Couturier"
+                "name": "Couturier",
+                "terms": "Couturier, Tailleur, Designer textile"

             },
             "craft/electrician": {
                 "name": "Electricien",
             },
             "craft/electrician": {
                 "name": "Electricien",


@@ -2323,7 +2430,7 @@
                 "terms": "Quai"
             },
             "public_transport/stop_position": {
                 "terms": "Quai"
             },
             "public_transport/stop_position": {

-                "name": "Position d’arrêt sur une route de transport en commun",
+                "name": "Position exacte d’arrêt du vehicule sur le « way » d’une route de transport en commun",

                 "terms": "Arrêt"
             },
             "railway": {
                 "terms": "Arrêt"
             },
             "railway": {


@@ -2358,7 +2465,7 @@
             },
             "railway/platform": {
                 "name": "Quai de gare ferroviaire",
             },
             "railway/platform": {
                 "name": "Quai de gare ferroviaire",

-                "terms": "Quai de gare"
+                "terms": "Quai de gare, Quai"

             },
             "railway/rail": {
                 "name": "Voie ferrée",
             },
             "railway/rail": {
                 "name": "Voie ferrée",


@@ -2456,8 +2563,8 @@
                 "terms": "Confiserie"
             },
             "shop/convenience": {
                 "terms": "Confiserie"
             },
             "shop/convenience": {

-                "name": "Magasin d'appoint",
-                "terms": "Dépanneur"
+                "name": "Petite épicerie du coin",
+                "terms": "Supérette, Petite épicerie du coin"

             },
             "shop/deli": {
                 "name": "Épicerie de luxe",
             },
             "shop/deli": {
                 "name": "Épicerie de luxe",


@@ -2592,7 +2699,7 @@
             },
             "shop/supermarket": {
                 "name": "Supermarché",
             },
             "shop/supermarket": {
                 "name": "Supermarché",

-                "terms": "Supermarché, épicerie"
+                "terms": "Supermarché"

             },
             "shop/tailor": {
                 "name": "Tailleur"
             },
             "shop/tailor": {
                 "name": "Tailleur"


@@ -2614,8 +2721,8 @@
                 "terms": "Espace vacant, lot vacant"
             },
             "shop/variety_store": {
                 "terms": "Espace vacant, lot vacant"
             },
             "shop/variety_store": {

-                "name": "Magasin à prix unique",
-                "terms": "Magasin à 1$, magasin à un dollar"
+                "name": "Supérette, Petite épicerie du coin",
+                "terms": "Épicerie"

             },
             "shop/video": {
                 "name": "Vidéo-club",
             },
             "shop/video": {
                 "name": "Vidéo-club",

diff --git a/vendor/assets/iD/iD/locales/is.json b/vendor/assets/iD/iD/locales/is.json
index 79e47ebd5a22d7da92b7f1dd00ab533357c0ffd2..63844bb64255b4b70f55e359985b6f61601f78c2 100644 (file)
--- a/vendor/assets/iD/iD/locales/is.json
+++ b/vendor/assets/iD/iD/locales/is.json
@@ -71,6 +71,9 @@
         },
         "orthogonalize": {
             "title": "Ferhyrningur",
         },
         "orthogonalize": {
             "title": "Ferhyrningur",

+            "description": {
+                "area": "Rétta horn þessa svæðis."
+            },

             "key": "S",
             "annotation": {
                 "line": "Réttaði horn á línu.",
             "key": "S",
             "annotation": {
                 "line": "Réttaði horn á línu.",


@@ -79,6 +82,7 @@
             "not_squarish": "Það er ekki hægt að hornrétta þetta því að það er ekki kassalaga"
         },
         "straighten": {
             "not_squarish": "Það er ekki hægt að hornrétta þetta því að það er ekki kassalaga"
         },
         "straighten": {

+            "title": "Slétta",

             "annotation": "Slétti úr línu",
             "too_bendy": "Það er ekki hægt að slétta úr þessu því að það beygir of skarplega"
         },
             "annotation": "Slétti úr línu",
             "too_bendy": "Það er ekki hægt að slétta úr þessu því að það beygir of skarplega"
         },


@@ -167,6 +171,11 @@
             },
             "not_eligible": "Ekki er hægt að aðskilja línur við upphaf þeirra eða endi.",
             "multiple_ways": "Of margar línur hér til að hægt sé að aðskilja."
             },
             "not_eligible": "Ekki er hægt að aðskilja línur við upphaf þeirra eða endi.",
             "multiple_ways": "Of margar línur hér til að hægt sé að aðskilja."

+        },
+        "restriction": {
+            "help": {
+                "select": "Smelltu til að velja veghluta"
+            }

         }
     },
     "undo": {
         }
     },
     "undo": {


@@ -242,6 +251,8 @@
         "edit": "Breyta eigindi",
         "none": "Ekkert",
         "node": "Hnútur",
         "edit": "Breyta eigindi",
         "none": "Ekkert",
         "node": "Hnútur",

+        "way": "Ferill",
+        "relation": "Vensl",

         "location": "Staðsetning"
     },
     "background": {
         "location": "Staðsetning"
     },
     "background": {

diff --git a/vendor/assets/iD/iD/locales/it.json b/vendor/assets/iD/iD/locales/it.json
index af25fe1a29f0547c38af4996a36c0fd76d6dd0c0..653698274eaa394509601e30e26e2e1c529d976d 100644 (file)
--- a/vendor/assets/iD/iD/locales/it.json
+++ b/vendor/assets/iD/iD/locales/it.json
@@ -848,8 +848,7 @@
                     "intermediate": "Media (rossa)",
                     "advanced": "Avanzata (nera)",
                     "expert": "Esperto (arancione)",
                     "intermediate": "Media (rossa)",
                     "advanced": "Avanzata (nera)",
                     "expert": "Esperto (arancione)",

-                    "freeride": "Fuoripista (gialla)",
-                    "extreme": "Estrema (equipaggiamento da scalata richiesto)"
+                    "freeride": "Fuoripista (gialla)"

                 }
             },
             "piste/grooming": {
                 }
             },
             "piste/grooming": {

diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json
index 2399727e7deda7d7dbabaf3989e0c41047ea19d5..40da35a94edd51e394c11f8f3c6dc7ee4be525d4 100644 (file)
--- a/vendor/assets/iD/iD/locales/ja.json
+++ b/vendor/assets/iD/iD/locales/ja.json
@@ -867,10 +867,22 @@
                 "label": "難易度"
             },
             "piste/grooming": {
                 "label": "難易度"
             },
             "piste/grooming": {

-                "label": "整備状況"
+                "label": "整備状況",
+                "options": {
+                    "classic": "クラシック",
+                    "mogul": "モーグル",
+                    "backcountry": "バックカントリー",
+                    "scooter": "スクーター/スノーモービル",
+                    "skating": "スケーティング"
+                }

             },
             "piste/type": {
             },
             "piste/type": {

-                "label": "種別"
+                "label": "種別",
+                "options": {
+                    "downhill": "ダウンヒル",
+                    "nordic": "ノルディック",
+                    "skitour": "スキーツアー"
+                }

             },
             "place": {
                 "label": "タイプ"
             },
             "place": {
                 "label": "タイプ"

diff --git a/vendor/assets/iD/iD/locales/ko.json b/vendor/assets/iD/iD/locales/ko.json
index 7182e5f28b6fd75c8470f775270bdcc190d03372..92fcd93742107690fecf215e1840d804b93e27d1 100644 (file)
--- a/vendor/assets/iD/iD/locales/ko.json
+++ b/vendor/assets/iD/iD/locales/ko.json
@@ -428,6 +428,9 @@
             "category-rail": {
                 "name": "선로"
             },
             "category-rail": {
                 "name": "선로"
             },

+            "category-restriction": {
+                "name": "제한"
+            },

             "category-road": {
                 "name": "도로"
             },
             "category-road": {
                 "name": "도로"
             },


@@ -486,8 +489,14 @@
             "address": {
                 "label": "주소",
                 "placeholders": {
             "address": {
                 "label": "주소",
                 "placeholders": {

+                    "housename": "집이름",
+                    "housenumber": "123",

                     "street": "거리",
                     "street": "거리",

-                    "city": "도시"
+                    "city": "도시",
+                    "postcode": "우편 번호",
+                    "place": "장소",
+                    "hamlet": "작은 마을",
+                    "country": "국가"

                 }
             },
             "admin_level": {
                 }
             },
             "admin_level": {


@@ -496,6 +505,12 @@
             "aerialway": {
                 "label": "유형"
             },
             "aerialway": {
                 "label": "유형"
             },

+            "aerialway/access": {
+                "options": {
+                    "exit": "출구",
+                    "both": "둘 다"
+                }
+            },

             "aerialway/capacity": {
                 "label": "수용자 수 (시간당)",
                 "placeholder": "500, 2500, 5000..."
             "aerialway/capacity": {
                 "label": "수용자 수 (시간당)",
                 "placeholder": "500, 2500, 5000..."


@@ -508,6 +523,11 @@
                 "label": "무게",
                 "placeholder": "2, 4, 8..."
             },
                 "label": "무게",
                 "placeholder": "2, 4, 8..."
             },

+            "aerialway/summer/access": {
+                "options": {
+                    "exit": "출구"
+                }
+            },

             "aeroway": {
                 "label": "유형"
             },
             "aeroway": {
                 "label": "유형"
             },


@@ -549,8 +569,21 @@
                 "label": "방향",
                 "options": {
                     "N": "북",
                 "label": "방향",
                 "options": {
                     "N": "북",

+                    "E": "동",
+                    "S": "남",
+                    "W": "서",

                     "NE": "북동",
                     "NE": "북동",

-                    "NW": "북서"
+                    "SE": "남동",
+                    "SW": "남서",
+                    "NW": "북서",
+                    "NNE": "북북동",
+                    "ENE": "동북동",
+                    "ESE": "동남동",
+                    "SSE": "남남동",
+                    "SSW": "남남서",
+                    "WSW": "서남서",
+                    "WNW": "서북서",
+                    "NNW": "북북서"

                 }
             },
             "clock_direction": {
                 }
             },
             "clock_direction": {


@@ -586,6 +619,7 @@
             },
             "electrified": {
                 "options": {
             },
             "electrified": {
                 "options": {

+                    "yes": "예 (지정되지 않음)",

                     "no": "아니오"
                 }
             },
                     "no": "아니오"
                 }
             },


@@ -611,6 +645,36 @@
             "fixme": {
                 "label": "고치기"
             },
             "fixme": {
                 "label": "고치기"
             },

+            "fuel": {
+                "label": "주유소"
+            },
+            "fuel/biodiesel": {
+                "label": "바이오디젤 판매"
+            },
+            "fuel/diesel": {
+                "label": "디젤 판매"
+            },
+            "fuel/e10": {
+                "label": "E10 판매"
+            },
+            "fuel/e85": {
+                "label": "E85 판매"
+            },
+            "fuel/lpg": {
+                "label": "프로판 판매; LPG"
+            },
+            "fuel/octane_100": {
+                "label": "경주용 휘발유 판매"
+            },
+            "fuel/octane_91": {
+                "label": "보통 휘발유 판매"
+            },
+            "fuel/octane_95": {
+                "label": "중급 휘발유 판매"
+            },
+            "fuel/octane_98": {
+                "label": "고급 휘발유 판매"
+            },

             "generator/method": {
                 "label": "방식"
             },
             "generator/method": {
                 "label": "방식"
             },


@@ -658,6 +722,9 @@
                     "terminal": "단말기"
                 }
             },
                     "terminal": "단말기"
                 }
             },

+            "lamp_type": {
+                "label": "유형"
+            },

             "landuse": {
                 "label": "유형"
             },
             "landuse": {
                 "label": "유형"
             },


@@ -671,6 +738,9 @@
             "leisure": {
                 "label": "유형"
             },
             "leisure": {
                 "label": "유형"
             },

+            "length": {
+                "label": "길이 (미터)"
+            },

             "levels": {
                 "label": "수준",
                 "placeholder": "2, 4, 6..."
             "levels": {
                 "label": "수준",
                 "placeholder": "2, 4, 6..."


@@ -688,6 +758,22 @@
                 "label": "제한 속도",
                 "placeholder": "40, 50, 60..."
             },
                 "label": "제한 속도",
                 "placeholder": "40, 50, 60..."
             },

+            "mtb/scale": {
+                "placeholder": "0, 1, 2, 3..."
+            },
+            "mtb/scale/imba": {
+                "placeholder": "쉬움, 중간, 어려움...",
+                "options": {
+                    "0": "매우 쉬움 (하얀 동그라미)",
+                    "1": "쉬움 (초록 동그라미)",
+                    "2": "중간 (파란 네모)",
+                    "3": "어려움 (검은 마름모)",
+                    "4": "매우 어려움 (두 검은 마름모)"
+                }
+            },
+            "mtb/scale/uphill": {
+                "placeholder": "0, 1, 2, 3..."
+            },

             "name": {
                 "label": "이름",
                 "placeholder": "일반적인 이름 (있으면)"
             "name": {
                 "label": "이름",
                 "placeholder": "일반적인 이름 (있으면)"


@@ -707,6 +793,7 @@
             "oneway": {
                 "label": "일방통행",
                 "options": {
             "oneway": {
                 "label": "일방통행",
                 "options": {

+                    "undefined": "아니오로 간주",

                     "yes": "예",
                     "no": "아니오"
                 }
                     "yes": "예",
                     "no": "아니오"
                 }


@@ -714,6 +801,7 @@
             "oneway_yes": {
                 "label": "일방통행",
                 "options": {
             "oneway_yes": {
                 "label": "일방통행",
                 "options": {

+                    "undefined": "예로 간주",

                     "yes": "예",
                     "no": "아니오"
                 }
                     "yes": "예",
                     "no": "아니오"
                 }


@@ -737,8 +825,25 @@
                 "label": "전화",
                 "placeholder": "+31 42 123 4567"
             },
                 "label": "전화",
                 "placeholder": "+31 42 123 4567"
             },

+            "piste/difficulty": {
+                "label": "어려움",
+                "placeholder": "초급, 중급, 고급...",
+                "options": {
+                    "novice": "새내기 (교육용)",
+                    "easy": "초급 (초록 동그라미)",
+                    "intermediate": "중급 (파란 네모)",
+                    "advanced": "고급 (검은 마름모)",
+                    "expert": "숙련자 (두 검은 마름모)",
+                    "freeride": "프리라이드 (off-piste)"
+                }
+            },

             "piste/type": {
             "piste/type": {

-                "label": "유형"
+                "label": "유형",
+                "options": {
+                    "ice_skate": "아이스 스케이트",
+                    "snow_park": "스노우 파크",
+                    "playground": "놀이터"
+                }

             },
             "place": {
                 "label": "유형"
             },
             "place": {
                 "label": "유형"


@@ -767,6 +872,18 @@
             "route_master": {
                 "label": "유형"
             },
             "route_master": {
                 "label": "유형"
             },

+            "sac_scale": {
+                "label": "하이킹 어려움",
+                "placeholder": "등산, 알파인 하이킹...",
+                "options": {
+                    "hiking": "T1: 하이킹",
+                    "mountain_hiking": "T2: 등산",
+                    "demanding_mountain_hiking": "T3: 까다로운 등산",
+                    "alpine_hiking": "T4: 알파인 하이킹",
+                    "demanding_alpine_hiking": "T5: 까다로운 알파인 하이킹",
+                    "difficult_alpine_hiking": "T6: 어려운 알파인 하이킹"
+                }
+            },

             "service": {
                 "label": "유형"
             },
             "service": {
                 "label": "유형"
             },


@@ -779,6 +896,14 @@
             "shop": {
                 "label": "유형"
             },
             "shop": {
                 "label": "유형"
             },

+            "smoking": {
+                "label": "흡연",
+                "options": {
+                    "no": "이디서든 금연",
+                    "separated": "흡연 구역이나, 격리되지 않음",
+                    "isolated": "흡연 구역이고, 격리됨"
+                }
+            },

             "source": {
                 "label": "참조 정보"
             },
             "source": {
                 "label": "참조 정보"
             },


@@ -792,7 +917,8 @@
                     "bridge": "다리",
                     "tunnel": "터널",
                     "embankment": "둑",
                     "bridge": "다리",
                     "tunnel": "터널",
                     "embankment": "둑",

-                    "cutting": "절토"
+                    "cutting": "절토",
+                    "ford": "여울"

                 }
             },
             "studio_type": {
                 }
             },
             "studio_type": {


@@ -813,6 +939,9 @@
             "towertype": {
                 "label": "탑 용도"
             },
             "towertype": {
                 "label": "탑 용도"
             },

+            "tracktype": {
+                "label": "트랙 유형"
+            },

             "trail_visibility": {
                 "label": "도로의 가시성"
             },
             "trail_visibility": {
                 "label": "도로의 가시성"
             },


@@ -838,6 +967,9 @@
             "wheelchair": {
                 "label": "휠체어 접근"
             },
             "wheelchair": {
                 "label": "휠체어 접근"
             },

+            "width": {
+                "label": "폭 (미터)"
+            },

             "wikipedia": {
                 "label": "위키백과"
             },
             "wikipedia": {
                 "label": "위키백과"
             },


@@ -849,6 +981,15 @@
             "address": {
                 "name": "주소"
             },
             "address": {
                 "name": "주소"
             },

+            "aerialway/cable_car": {
+                "name": "케이블 카"
+            },
+            "aerialway/chair_lift": {
+                "name": "체어 리프트"
+            },
+            "aerialway/magic_carpet": {
+                "name": "매직 카펫 리프트"
+            },

             "aeroway": {
                 "name": "항공 시설"
             },
             "aeroway": {
                 "name": "항공 시설"
             },


@@ -905,6 +1046,9 @@
                 "name": "보트 대여",
                 "terms": "보트 대여소,보트 렌탈"
             },
                 "name": "보트 대여",
                 "terms": "보트 대여소,보트 렌탈"
             },

+            "amenity/bus_station": {
+                "name": "버스 정류장"
+            },

             "amenity/cafe": {
                 "name": "카페"
             },
             "amenity/cafe": {
                 "name": "카페"
             },


@@ -932,6 +1076,12 @@
             "amenity/courthouse": {
                 "name": "법원"
             },
             "amenity/courthouse": {
                 "name": "법원"
             },

+            "amenity/dentist": {
+                "name": "치과 의원"
+            },
+            "amenity/doctor": {
+                "name": "의원"
+            },

             "amenity/drinking_water": {
                 "name": "식수"
             },
             "amenity/drinking_water": {
                 "name": "식수"
             },


@@ -953,12 +1103,21 @@
             "amenity/grave_yard": {
                 "name": "묘지"
             },
             "amenity/grave_yard": {
                 "name": "묘지"
             },

+            "amenity/hospital": {
+                "name": "병원 부지"
+            },
+            "amenity/kindergarten": {
+                "name": "유치원 부지"
+            },

             "amenity/library": {
                 "name": "도서관"
             },
             "amenity/marketplace": {
                 "name": "시장"
             },
             "amenity/library": {
                 "name": "도서관"
             },
             "amenity/marketplace": {
                 "name": "시장"
             },

+            "amenity/nightclub": {
+                "name": "나이트클럽"
+            },

             "amenity/parking": {
                 "name": "자동차 주차장"
             },
             "amenity/parking": {
                 "name": "자동차 주차장"
             },


@@ -1009,6 +1168,9 @@
             "amenity/shelter": {
                 "name": "피난처"
             },
             "amenity/shelter": {
                 "name": "피난처"
             },

+            "amenity/social_facility/food_bank": {
+                "name": "푸드 뱅크"
+            },

             "amenity/swimming_pool": {
                 "name": "수영장"
             },
             "amenity/swimming_pool": {
                 "name": "수영장"
             },


@@ -1103,9 +1265,18 @@
             "building/commercial": {
                 "name": "상업 건물"
             },
             "building/commercial": {
                 "name": "상업 건물"
             },

+            "building/entrance": {
+                "name": "입구/출구"
+            },

             "building/garage": {
                 "name": "차고"
             },
             "building/garage": {
                 "name": "차고"
             },

+            "building/hospital": {
+                "name": "병원 건물"
+            },
+            "building/hotel": {
+                "name": "호텔 건물"
+            },

             "building/house": {
                 "name": "주택"
             },
             "building/house": {
                 "name": "주택"
             },


@@ -1115,12 +1286,24 @@
             "building/industrial": {
                 "name": "산업 건물"
             },
             "building/industrial": {
                 "name": "산업 건물"
             },

+            "building/public": {
+                "name": "공공 건물"
+            },

             "building/residential": {
                 "name": "주거 건물"
             },
             "building/residential": {
                 "name": "주거 건물"
             },

+            "building/retail": {
+                "name": "소매 건물"
+            },

             "building/school": {
                 "name": "학교 건물"
             },
             "building/school": {
                 "name": "학교 건물"
             },

+            "building/train_station": {
+                "name": "기차역"
+            },
+            "craft/tailor": {
+                "name": "양복점"
+            },

             "embankment": {
                 "name": "둑",
                 "terms": "제방"
             "embankment": {
                 "name": "둑",
                 "terms": "제방"


@@ -1135,12 +1318,21 @@
             "emergency/phone": {
                 "name": "긴급 전화"
             },
             "emergency/phone": {
                 "name": "긴급 전화"
             },

+            "entrance": {
+                "name": "입구/출구"
+            },

             "footway/crossing": {
                 "name": "횡단보도"
             },
             "footway/crossing": {
                 "name": "횡단보도"
             },

+            "footway/crosswalk": {
+                "name": "횡단 보도"
+            },

             "footway/sidewalk": {
                 "name": "보도"
             },
             "footway/sidewalk": {
                 "name": "보도"
             },

+            "ford": {
+                "name": "여울"
+            },

             "golf/bunker": {
                 "name": "샌드 트랩",
                 "terms": "모래 함정"
             "golf/bunker": {
                 "name": "샌드 트랩",
                 "terms": "모래 함정"


@@ -1179,6 +1371,9 @@
             "highway/crossing": {
                 "name": "교차"
             },
             "highway/crossing": {
                 "name": "교차"
             },

+            "highway/crosswalk": {
+                "name": "횡단 보도"
+            },

             "highway/cycleway": {
                 "name": "자전거로"
             },
             "highway/cycleway": {
                 "name": "자전거로"
             },


@@ -1194,6 +1389,9 @@
             "highway/motorway": {
                 "name": "고속도로"
             },
             "highway/motorway": {
                 "name": "고속도로"
             },

+            "highway/motorway_junction": {
+                "name": "고속도로 분기점 / 출구"
+            },

             "highway/motorway_link": {
                 "name": "고속도로 연결도"
             },
             "highway/motorway_link": {
                 "name": "고속도로 연결도"
             },


@@ -1213,6 +1411,9 @@
             "highway/residential": {
                 "name": "주거 도로"
             },
             "highway/residential": {
                 "name": "주거 도로"
             },

+            "highway/rest_area": {
+                "name": "휴게소"
+            },

             "highway/road": {
                 "name": "알 수 없는 도로"
             },
             "highway/road": {
                 "name": "알 수 없는 도로"
             },


@@ -1336,9 +1537,15 @@
             "landuse/industrial": {
                 "name": "산업"
             },
             "landuse/industrial": {
                 "name": "산업"
             },

+            "landuse/landfill": {
+                "name": "매립지"
+            },

             "landuse/meadow": {
                 "name": "목초지"
             },
             "landuse/meadow": {
                 "name": "목초지"
             },

+            "landuse/military": {
+                "name": "군사지"
+            },

             "landuse/orchard": {
                 "name": "과수원"
             },
             "landuse/orchard": {
                 "name": "과수원"
             },


@@ -1364,6 +1571,9 @@
             "leisure/dog_park": {
                 "name": "개 공원"
             },
             "leisure/dog_park": {
                 "name": "개 공원"
             },

+            "leisure/firepit": {
+                "name": "불구덩이"
+            },

             "leisure/garden": {
                 "name": "정원"
             },
             "leisure/garden": {
                 "name": "정원"
             },


@@ -1413,6 +1623,9 @@
             "leisure/slipway": {
                 "name": "슬립 웨이"
             },
             "leisure/slipway": {
                 "name": "슬립 웨이"
             },

+            "leisure/sports_center": {
+                "name": "스포츠 센터 / 체육관"
+            },

             "leisure/stadium": {
                 "name": "경기장"
             },
             "leisure/stadium": {
                 "name": "경기장"
             },


@@ -1728,6 +1941,9 @@
             "shop/alcohol": {
                 "name": "주류 상점"
             },
             "shop/alcohol": {
                 "name": "주류 상점"
             },

+            "shop/art": {
+                "name": "예술 상점"
+            },

             "shop/bakery": {
                 "name": "제과점"
             },
             "shop/bakery": {
                 "name": "제과점"
             },


@@ -1740,6 +1956,9 @@
             "shop/bicycle": {
                 "name": "자전거 가게"
             },
             "shop/bicycle": {
                 "name": "자전거 가게"
             },

+            "shop/bookmaker": {
+                "name": "마권업자"
+            },

             "shop/books": {
                 "name": "서점"
             },
             "shop/books": {
                 "name": "서점"
             },


@@ -1797,6 +2016,9 @@
             "shop/florist": {
                 "name": "꽃집"
             },
             "shop/florist": {
                 "name": "꽃집"
             },

+            "shop/funeral_directors": {
+                "name": "장례식장"
+            },

             "shop/furniture": {
                 "name": "가구점"
             },
             "shop/furniture": {
                 "name": "가구점"
             },


@@ -1831,6 +2053,10 @@
                 "name": "열쇠 제조공",
                 "terms": "자물쇠 제조공"
             },
                 "name": "열쇠 제조공",
                 "terms": "자물쇠 제조공"
             },

+            "shop/lottery": {
+                "name": "복권 가게",
+                "terms": "복덕방"
+            },

             "shop/mall": {
                 "name": "쇼핑몰"
             },
             "shop/mall": {
                 "name": "쇼핑몰"
             },


@@ -1858,6 +2084,10 @@
             "shop/photo": {
                 "name": "사진 가게"
             },
             "shop/photo": {
                 "name": "사진 가게"
             },

+            "shop/seafood": {
+                "name": "해산물 가게",
+                "terms": "씨푸드 가게"
+            },

             "shop/shoes": {
                 "name": "신발 가게"
             },
             "shop/shoes": {
                 "name": "신발 가게"
             },


@@ -1870,6 +2100,9 @@
             "shop/supermarket": {
                 "name": "수퍼마켓"
             },
             "shop/supermarket": {
                 "name": "수퍼마켓"
             },

+            "shop/tailor": {
+                "name": "양복점"
+            },

             "shop/toys": {
                 "name": "완구점"
             },
             "shop/toys": {
                 "name": "완구점"
             },


@@ -1888,6 +2121,10 @@
             "shop/video": {
                 "name": "비디오 가게"
             },
             "shop/video": {
                 "name": "비디오 가게"
             },

+            "shop/wine": {
+                "name": "와인 가게",
+                "terms": "포도주 가게"
+            },

             "tourism": {
                 "name": "관광",
                 "terms": "관광 여행"
             "tourism": {
                 "name": "관광",
                 "terms": "관광 여행"


@@ -1953,6 +2190,27 @@
             "type/restriction": {
                 "name": "제한"
             },
             "type/restriction": {
                 "name": "제한"
             },

+            "type/restriction/no_left_turn": {
+                "name": "좌회전 없음"
+            },
+            "type/restriction/no_right_turn": {
+                "name": "우회전 없음"
+            },
+            "type/restriction/no_straight_on": {
+                "name": "직진 없음"
+            },
+            "type/restriction/no_u_turn": {
+                "name": "유턴 없음"
+            },
+            "type/restriction/only_left_turn": {
+                "name": "좌회전만"
+            },
+            "type/restriction/only_right_turn": {
+                "name": "우회전만"
+            },
+            "type/restriction/only_straight_on": {
+                "name": "회전 없음"
+            },

             "type/route": {
                 "name": "노선"
             },
             "type/route": {
                 "name": "노선"
             },

diff --git a/vendor/assets/iD/iD/locales/pl.json b/vendor/assets/iD/iD/locales/pl.json
index 8b9bc92ca42f3f51262a82909745c4783497a29f..380a64526d1ee844ad313306a8ca51d064089402 100644 (file)
--- a/vendor/assets/iD/iD/locales/pl.json
+++ b/vendor/assets/iD/iD/locales/pl.json
@@ -718,7 +718,7 @@
                 "label": "Długość (w metrach)"
             },
             "levels": {
                 "label": "Długość (w metrach)"
             },
             "levels": {

-                "label": "Poziomy",
+                "label": "Liczba kondygnacji",

                 "placeholder": "2, 4, 6..."
             },
             "lit": {
                 "placeholder": "2, 4, 6..."
             },
             "lit": {


@@ -734,6 +734,17 @@
                 "label": "Ograniczenie prędkości",
                 "placeholder": "40, 50, 60..."
             },
                 "label": "Ograniczenie prędkości",
                 "placeholder": "40, 50, 60..."
             },

+            "mtb/scale/uphill": {
+                "placeholder": "0, 1, 2, 3...",
+                "options": {
+                    "0": "0: Śr. nachylenie <10%, żwir/ubita ziemia, brak przeszkód",
+                    "1": "1: Śr. nachylenie <15%, żwir/ubita ziemia, kilka mniejszych obiektów",
+                    "2": "2: Śr. nachylenie <20%, stabilne podłoże, kamienie wielkości pięści/korzenie",
+                    "3": "3: Śr. nachylenie <25%, zróżnicowane podłoże, kamienie wielkości pięści/gałęzie",
+                    "4": "4: Śr. nachylenie <30%, zły stan, duże kamienie/gałęzie",
+                    "5": "5: Bardzo strome, rower zwykle musi być wprowadzony"
+                }
+            },

             "name": {
                 "label": "Nazwa",
                 "placeholder": "Nazwa zwyczajowa (jeśli występuje)"
             "name": {
                 "label": "Nazwa",
                 "placeholder": "Nazwa zwyczajowa (jeśli występuje)"


@@ -779,7 +790,16 @@
                 "label": "Parkuj i jedź"
             },
             "parking": {
                 "label": "Parkuj i jedź"
             },
             "parking": {

-                "label": "Typ"
+                "label": "Typ",
+                "options": {
+                    "surface": "Naziemny",
+                    "multi-storey": "Wielopoziomowy",
+                    "underground": "Podziemny",
+                    "sheds": "Garaże",
+                    "carports": "Wiaty",
+                    "garage_boxes": "Boksy garażowe",
+                    "lane": "Pas na jezdni"
+                }

             },
             "phone": {
                 "label": "Telefon",
             },
             "phone": {
                 "label": "Telefon",


@@ -861,7 +881,12 @@
                 "label": "Dla palących",
                 "placeholder": "Nie, Wydzielone, Tak...",
                 "options": {
                 "label": "Dla palących",
                 "placeholder": "Nie, Wydzielone, Tak...",
                 "options": {

-                    "no": "Całkowity zakaz palenia"
+                    "no": "Całkowity zakaz palenia",
+                    "separated": "W miejscach dla palących, nieoddzielonych fizycznie",
+                    "isolated": "W miejscach dla palących, fizycznie oddzielonych",
+                    "outside": "Dozwolone na zewnątrz",
+                    "yes": "Dozwolone wszędzie",
+                    "dedicated": "Miejsce dla palących (np. klub palaczy)"

                 }
             },
             "smoothness": {
                 }
             },
             "smoothness": {


@@ -915,6 +940,17 @@
             "towertype": {
                 "label": "Typ wieży"
             },
             "towertype": {
                 "label": "Typ wieży"
             },

+            "tracktype": {
+                "label": "Typ drogi nieutwardzonej",
+                "placeholder": "Utwardzona, nieubita...",
+                "options": {
+                    "grade1": "Utwardzona lub mocna ubita powierzchnia",
+                    "grade2": "Żwirowa z niewielką domieszką piasku, mułu lub gliny",
+                    "grade3": "Składająca się z równej ilości twardych i miękkich materiałów",
+                    "grade4": "Ziemia/piasek/trawa z domieszką twardych materiałów",
+                    "grade5": "Ziemia/piasek/trawa, bez dodatku materiałów utwardzonych, słabo widoczna"
+                }
+            },

             "trail_visibility": {
                 "label": "Widoczność szlaku",
                 "placeholder": "Doskonała, Dobra, Zła..."
             "trail_visibility": {
                 "label": "Widoczność szlaku",
                 "placeholder": "Doskonała, Dobra, Zła..."


@@ -1748,7 +1784,7 @@
             },
             "highway/service": {
                 "name": "Droga wewnętrzna",
             },
             "highway/service": {
                 "name": "Droga wewnętrzna",

-                "terms": "droga dojazdowa, podjazd"
+                "terms": "droga dojazdowa, podjazd, serwisowa"

             },
             "highway/service/alley": {
                 "name": "Alejka",
             },
             "highway/service/alley": {
                 "name": "Alejka",

diff --git a/vendor/assets/iD/iD/locales/pt.json b/vendor/assets/iD/iD/locales/pt.json
index 395a1365f7023c83800d74b66c7fa5afe65ccad3..5df00b4b7a97b29b27084974578a9ae2568602ce 100644 (file)
--- a/vendor/assets/iD/iD/locales/pt.json
+++ b/vendor/assets/iD/iD/locales/pt.json
@@ -1092,11 +1092,11 @@
                 "label": "Qualidade da Superfície ",
                 "placeholder": "Sólido, Intermédio, Macio...",
                 "options": {
                 "label": "Qualidade da Superfície ",
                 "placeholder": "Sólido, Intermédio, Macio...",
                 "options": {

-                    "grade1": "Sólida: pavimentada ou com material fortemente compactado",
-                    "grade2": "Sobretudo sólida: cascalho ou pedras misturadas com algum material macio",
-                    "grade3": "Intermédia: Mistura de materiais sólidos e macios",
-                    "grade4": "Sobretudo macia: terra, erva ou areia misturadas com algum material sólido",
-                    "grade5": "Macia: Terra, erva ou areia"
+                    "grade1": "1 - Sólida: pavimentada ou com material fortemente compactado",
+                    "grade2": "2 - Sobretudo sólida: cascalho ou pedras misturadas com algum material macio",
+                    "grade3": "3 - Intermédia, mistura de materiais sólidos e macios",
+                    "grade4": "4 - Sobretudo macia: terra, erva ou areia misturadas com algum material sólido",
+                    "grade5": "5 - Macia: Terra, erva ou areia"

                 }
             },
             "trail_visibility": {
                 }
             },
             "trail_visibility": {

diff --git a/vendor/assets/iD/iD/locales/ru.json b/vendor/assets/iD/iD/locales/ru.json
index 222144ae9715e64f3c56aa9a4a3d8afdea1114a1..e5ef11be0ad8e993f2afb6459bef45198ef809fc 100644 (file)
--- a/vendor/assets/iD/iD/locales/ru.json
+++ b/vendor/assets/iD/iD/locales/ru.json
@@ -782,6 +782,9 @@
             "mtb/scale": {
                 "placeholder": "0, 1, 2, 3…"
             },
             "mtb/scale": {
                 "placeholder": "0, 1, 2, 3…"
             },

+            "mtb/scale/uphill": {
+                "placeholder": "0, 1, 2, 3…"
+            },

             "name": {
                 "label": "Название",
                 "placeholder": "Разговорное название (если есть)"
             "name": {
                 "label": "Название",
                 "placeholder": "Разговорное название (если есть)"


@@ -827,7 +830,10 @@
                 "label": "Перехватывающая парковка"
             },
             "parking": {
                 "label": "Перехватывающая парковка"
             },
             "parking": {

-                "label": "Тип"
+                "label": "Тип",
+                "options": {
+                    "surface": "Покрытие"
+                }

             },
             "phone": {
                 "label": "Телефон",
             },
             "phone": {
                 "label": "Телефон",

diff --git a/vendor/assets/iD/iD/locales/sl.json b/vendor/assets/iD/iD/locales/sl.json
index 64c59fd960d004a4cd536844dc5bf2b385d4e37b..94dda4f1d26be7714f66484417817ca48956acef 100644 (file)
--- a/vendor/assets/iD/iD/locales/sl.json
+++ b/vendor/assets/iD/iD/locales/sl.json
@@ -340,8 +340,8 @@
         "deprecated_tags": "Zastarele oznake: {tags}"
     },
     "zoom": {
         "deprecated_tags": "Zastarele oznake: {tags}"
     },
     "zoom": {

-        "in": "Povečaj",
-        "out": "Pomanjšaj"
+        "in": "Približaj",
+        "out": "Oddalji"

     },
     "cannot_zoom": "Nadaljnje oddaljevanje v trenutnem načinu ni več mogoče.",
     "gpx": {
     },
     "cannot_zoom": "Nadaljnje oddaljevanje v trenutnem načinu ni več mogoče.",
     "gpx": {


@@ -802,11 +802,16 @@
                 "placeholder": "30, 50, 60..."
             },
             "mtb/scale": {
                 "placeholder": "30, 50, 60..."
             },
             "mtb/scale": {

-                "label": "Gorsko-kolesarska težavnost",
+                "label": "Gorsko-kolesarska zahtevnost",

                 "placeholder": "0, 1, 2, 3...",
                 "options": {
                     "0": "0: Trden konglomerat (prodniki)/zbita prst, brez ovir, široki zavoji",
                 "placeholder": "0, 1, 2, 3...",
                 "options": {
                     "0": "0: Trden konglomerat (prodniki)/zbita prst, brez ovir, široki zavoji",

-                    "1": "1: Ponekod nestabilna podlaga, majhne ovire, široki zavoji"
+                    "1": "1: Ponekod nestabilna podlaga, majhne ovire, široki zavoji",
+                    "2": "2: Več nestabilne podlage, velike ovire, preprosto obračanje na prednjem kolesu",
+                    "3": "3: Spolzka podlaga, velike ovire, tesno obračanje na prednjem kolesu",
+                    "4": "4: Nestabilna podlaga ali večje skale, tvegano obračanje na prednjem kolesu",
+                    "5": "5: Največja zahtevnost, večja območja skal, zemeljski plazovi, usadi",
+                    "6": "6: Ni mogoče premagati na kolesu, razen za najbolj izurjene gorske kolesarje"

                 }
             },
             "mtb/scale/imba": {
                 }
             },
             "mtb/scale/imba": {


@@ -815,7 +820,9 @@
                 "options": {
                     "0": "Najlažje (bel krogec)",
                     "1": "Lahko (zelen krogec)",
                 "options": {
                     "0": "Najlažje (bel krogec)",
                     "1": "Lahko (zelen krogec)",

-                    "2": "Srednje zahtevno (moder kvadratek)"
+                    "2": "Srednje zahtevno (moder kvadratek)",
+                    "3": "Zahtevno (črn karo)",
+                    "4": "Izjemno zahtevno (dvojni črn karo)"

                 }
             },
             "mtb/scale/uphill": {
                 }
             },
             "mtb/scale/uphill": {


@@ -892,16 +899,16 @@
                 "placeholder": "+386 31 123 4567"
             },
             "piste/difficulty": {
                 "placeholder": "+386 31 123 4567"
             },
             "piste/difficulty": {

-                "label": "Težavnost",
-                "placeholder": "Lahke, srednje težke, težke",
+                "label": "Zahtevnost",
+                "placeholder": "Lahke, srednje zahtevne, zahtevne...",

                 "options": {
                     "novice": "Za začetnike",
                     "easy": "Lahka",
                 "options": {
                     "novice": "Za začetnike",
                     "easy": "Lahka",

-                    "intermediate": "Srednje težka",
-                    "advanced": "Težka",
-                    "expert": "Zelo težka",
+                    "intermediate": "Srednje zahtevna",
+                    "advanced": "Zahtevna",
+                    "expert": "Zelo zahtevna",

                     "freeride": "Variantno smučanje - neteptana",
                     "freeride": "Variantno smučanje - neteptana",

-                    "extreme": "Alpinistično smučanje"
+                    "extreme": "Izjemno zahtevna (za vzpon nujna uporaba plezalnih pripomočkov)"

                 }
             },
             "piste/grooming": {
                 }
             },
             "piste/grooming": {

diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json
index 674a3d9f2d3b5b992691bc13883fb7cdf73a7641..e341e36f204f197cc37c3dd41f3a5dace30b993c 100644 (file)
--- a/vendor/assets/iD/iD/locales/sv.json
+++ b/vendor/assets/iD/iD/locales/sv.json
@@ -406,6 +406,9 @@
     },
     "presets": {
         "categories": {
     },
     "presets": {
         "categories": {

+            "category-building": {
+                "name": "Byggnad"
+            },

             "category-golf": {
                 "name": "Golf"
             },
             "category-golf": {
                 "name": "Golf"
             },


@@ -426,6 +429,12 @@
             },
             "category-route": {
                 "name": "Rutt"
             },
             "category-route": {
                 "name": "Rutt"

+            },
+            "category-water-area": {
+                "name": "Vatten"
+            },
+            "category-water-line": {
+                "name": "Vatten"

             }
         },
         "fields": {
             }
         },
         "fields": {


@@ -466,6 +475,13 @@
                     }
                 }
             },
                     }
                 }
             },

+            "access_simple": {
+                "label": "Tillgång",
+                "placeholder": "ja"
+            },
+            "access_toilets": {
+                "label": "Tillgång"
+            },

             "address": {
                 "label": "Adress",
                 "placeholders": {
             "address": {
                 "label": "Adress",
                 "placeholders": {


@@ -473,6 +489,7 @@
                     "housenumber": "123",
                     "street": "Gata",
                     "city": "Stad",
                     "housenumber": "123",
                     "street": "Gata",
                     "city": "Stad",

+                    "postcode": "Postnummer",

                     "place": "Plats",
                     "hamlet": "Småort",
                     "suburb": "Stadsdel",
                     "place": "Plats",
                     "hamlet": "Småort",
                     "suburb": "Stadsdel",


@@ -486,6 +503,17 @@
             "admin_level": {
                 "label": "Administrativ nivå"
             },
             "admin_level": {
                 "label": "Administrativ nivå"
             },

+            "aerialway": {
+                "label": "Typ"
+            },
+            "aerialway/access": {
+                "label": "Tillgång",
+                "options": {
+                    "entry": "Ingång",
+                    "exit": "Utgång",
+                    "both": "Båda"
+                }
+            },

             "aerialway/capacity": {
                 "label": "Kapacitet (per timme)",
                 "placeholder": "500, 2500, 5000..."
             "aerialway/capacity": {
                 "label": "Kapacitet (per timme)",
                 "placeholder": "500, 2500, 5000..."


@@ -495,17 +523,35 @@
                 "placeholder": "1, 2, 3..."
             },
             "aerialway/occupancy": {
                 "placeholder": "1, 2, 3..."
             },
             "aerialway/occupancy": {

+                "label": "Antal personer",

                 "placeholder": "2, 4, 8..."
             },
                 "placeholder": "2, 4, 8..."
             },

+            "aerialway/summer/access": {
+                "label": "Tillgång (sommar)",
+                "options": {
+                    "entry": "Ingång",
+                    "exit": "Utgång",
+                    "both": "Båda"
+                }
+            },

             "aeroway": {
                 "label": "Typ"
             },
             "amenity": {
                 "label": "Typ"
             },
             "aeroway": {
                 "label": "Typ"
             },
             "amenity": {
                 "label": "Typ"
             },

+            "artist": {
+                "label": "Konstnär"
+            },
+            "artwork_type": {
+                "label": "Typ"
+            },

             "atm": {
                 "label": "Uttagsautomat"
             },
             "atm": {
                 "label": "Uttagsautomat"
             },

+            "backrest": {
+                "label": "Ryggstöd"
+            },

             "barrier": {
                 "label": "Typ"
             },
             "barrier": {
                 "label": "Typ"
             },


@@ -522,10 +568,29 @@
                 "label": "Byggnad"
             },
             "capacity": {
                 "label": "Byggnad"
             },
             "capacity": {

-                "label": "Kapacitet"
+                "label": "Kapacitet",
+                "placeholder": "50, 100, 200..."

             },
             "cardinal_direction": {
             },
             "cardinal_direction": {

-                "label": "Riktning"
+                "label": "Riktning",
+                "options": {
+                    "N": "Norr",
+                    "E": "Öster",
+                    "S": "Söder",
+                    "W": "Väster",
+                    "NE": "Nordost",
+                    "SE": "Sydost",
+                    "SW": "Sydväst",
+                    "NW": "Nordväst",
+                    "NNE": "Nordnordost",
+                    "ENE": "Ostnordost",
+                    "ESE": "Ostsydost",
+                    "SSE": "Sydsydost",
+                    "SSW": "Sydsydväst",
+                    "WSW": "Västsydväst",
+                    "WNW": "Västnordväst",
+                    "NNW": "Nordnordväst"
+                }

             },
             "clock_direction": {
                 "label": "Riktning",
             },
             "clock_direction": {
                 "label": "Riktning",


@@ -543,6 +608,12 @@
             "country": {
                 "label": "Land"
             },
             "country": {
                 "label": "Land"
             },

+            "covered": {
+                "label": "Övertäckt"
+            },
+            "crop": {
+                "label": "Gröda"
+            },

             "crossing": {
                 "label": "Typ"
             },
             "crossing": {
                 "label": "Typ"
             },


@@ -558,6 +629,16 @@
             "description": {
                 "label": "Beskrivning"
             },
             "description": {
                 "label": "Beskrivning"
             },

+            "electrified": {
+                "label": "Elförsörjning",
+                "placeholder": "Kontaktledning, elektrifierad räls...",
+                "options": {
+                    "contact_line": "Kontaktledning",
+                    "rail": "Elektrifierad räls",
+                    "yes": "Ja (ospecificerad)",
+                    "no": "Nej"
+                }
+            },

             "elevation": {
                 "label": "Höjd"
             },
             "elevation": {
                 "label": "Höjd"
             },


@@ -577,9 +658,21 @@
             "fee": {
                 "label": "Avgift"
             },
             "fee": {
                 "label": "Avgift"
             },

+            "fire_hydrant/type": {
+                "label": "Typ",
+                "options": {
+                    "pillar": "Stolpe/Ovan jord",
+                    "underground": "Underjordisk",
+                    "wall": "Vägg",
+                    "pond": "Damm"
+                }
+            },

             "fixme": {
                 "label": "Ordna mig"
             },
             "fixme": {
                 "label": "Ordna mig"
             },

+            "fuel": {
+                "label": "Bränsle"
+            },

             "fuel/biodiesel": {
                 "label": "Säljer Biodiesel"
             },
             "fuel/biodiesel": {
                 "label": "Säljer Biodiesel"
             },


@@ -607,7 +700,20 @@
             "fuel/octane_98": {
                 "label": "Säljer E98"
             },
             "fuel/octane_98": {
                 "label": "Säljer E98"
             },

+            "gauge": {
+                "label": "Spårvidd"
+            },
+            "generator/method": {
+                "label": "Metod"
+            },
+            "generator/source": {
+                "label": "Källa"
+            },
+            "generator/type": {
+                "label": "Typ"
+            },

             "golf_hole": {
             "golf_hole": {

+                "label": "Referens",

                 "placeholder": "Hålnummer (1-18)"
             },
             "handicap": {
                 "placeholder": "Hålnummer (1-18)"
             },
             "handicap": {


@@ -635,11 +741,16 @@
             "internet_access": {
                 "label": "Internetaccess",
                 "options": {
             "internet_access": {
                 "label": "Internetaccess",
                 "options": {

+                    "yes": "Ja",
+                    "no": "Nej",

                     "wlan": "Wifi",
                     "wired": "Trådbunden",
                     "terminal": "Terminal"
                 }
             },
                     "wlan": "Wifi",
                     "wired": "Trådbunden",
                     "terminal": "Terminal"
                 }
             },

+            "lamp_type": {
+                "label": "Typ"
+            },

             "landuse": {
                 "label": "Typ"
             },
             "landuse": {
                 "label": "Typ"
             },


@@ -660,6 +771,9 @@
                 "label": "Våningar",
                 "placeholder": "2, 4, 6..."
             },
                 "label": "Våningar",
                 "placeholder": "2, 4, 6..."
             },

+            "lit": {
+                "label": "Lutning"
+            },

             "location": {
                 "label": "Lokalisering"
             },
             "location": {
                 "label": "Lokalisering"
             },


@@ -670,6 +784,42 @@
                 "label": "Hastighetsbegränsning",
                 "placeholder": "50, 70, 90..."
             },
                 "label": "Hastighetsbegränsning",
                 "placeholder": "50, 70, 90..."
             },

+            "mtb/scale": {
+                "label": "Mountainbike-svårighet",
+                "placeholder": "0, 1, 2, 3...",
+                "options": {
+                    "0": "0: Fast grus/packad jord, inga hinder, breda kurvor",
+                    "1": "1: Delvis löst underlag, små hinder, breda kurvor",
+                    "2": "2: Mycket löst underlag, stora hinder, enkla hårnålar",
+                    "3": "3: Halt underlag, stora hinder, snäva hårnålar",
+                    "4": "4: löst underlag eller stenblock, farliga hårnålar",
+                    "5": "5: Maximal svårighet, blockfält, jordskred",
+                    "6": "6: Inte körbar förutom för de allra bästa mountainbikecyklisterna"
+                }
+            },
+            "mtb/scale/imba": {
+                "label": "Svårighetsgrad enligt IMBA",
+                "placeholder": "Enkel, medel, svår...",
+                "options": {
+                    "0": "Enklast (vita cirkel)",
+                    "1": "Enkel (gröna cirkel)",
+                    "2": "Medium (blå fyrkant)",
+                    "3": "Svår (svart diamant)",
+                    "4": "Extremt svårt (dubbel svart diamant)"
+                }
+            },
+            "mtb/scale/uphill": {
+                "label": "Mountainbike svårighetsgrad uppför",
+                "placeholder": "0, 1, 2, 3...",
+                "options": {
+                    "0": "0: Genomsnittlig lutning <10%, grus/packad jord, inga hinder",
+                    "1": "1: Genomsnittlig lutning <15%, grus/packad jord, få små hinder",
+                    "2": "2: Genomsnittlig lutning <20%, stabilt underlag, stena/rötter stora som en knytnäve",
+                    "3": "3: Genomsnittlig lutning <25%, varierande underlag, stena/grenar stora som en knytnäve",
+                    "4": "4: Genomsnittlig lutning <30%, dåliga förutsättningar, stora stena/grenar",
+                    "5": "5: Mycket brant, cykel måste i regel skjutas eller bäras"
+                }
+            },

             "name": {
                 "label": "Namn",
                 "placeholder": "Vanligt namn (om något)"
             "name": {
                 "label": "Namn",
                 "placeholder": "Vanligt namn (om något)"


@@ -689,13 +839,17 @@
             "oneway": {
                 "label": "Enkelriktat",
                 "options": {
             "oneway": {
                 "label": "Enkelriktat",
                 "options": {

-                    "undefined": "Förväntas vara Nej"
+                    "undefined": "Förväntas vara Nej",
+                    "yes": "Ja",
+                    "no": "Nej"

                 }
             },
             "oneway_yes": {
                 "label": "Enkelriktat",
                 "options": {
                 }
             },
             "oneway_yes": {
                 "label": "Enkelriktat",
                 "options": {

-                    "undefined": "Förväntas vara Ja"
+                    "undefined": "Förväntas vara Ja",
+                    "yes": "Ja",
+                    "no": "Nej"

                 }
             },
             "opening_hours": {
                 }
             },
             "opening_hours": {


@@ -712,12 +866,59 @@
                 "label": "Pendelparkering"
             },
             "parking": {
                 "label": "Pendelparkering"
             },
             "parking": {

-                "label": "Typ"
+                "label": "Typ",
+                "options": {
+                    "surface": "Yta",
+                    "multi-storey": "Flera våningar",
+                    "underground": "Underjordisk",
+                    "sheds": "Skjul",
+                    "carports": "Carportar",
+                    "garage_boxes": "Garageboxar",
+                    "lane": "Fickparkering"
+                }

             },
             "phone": {
                 "label": "Telefon",
                 "placeholder": "+46 31 123 4567"
             },
             },
             "phone": {
                 "label": "Telefon",
                 "placeholder": "+46 31 123 4567"
             },

+            "piste/difficulty": {
+                "label": "Svårighetsgrad",
+                "placeholder": "Lätt, Medel, Avancerad...",
+                "options": {
+                    "novice": "Nybörjare (undervisning)",
+                    "easy": "Enkel (grön cirkel)",
+                    "intermediate": "Medel (blå fyrkant)",
+                    "advanced": "Avancerad (svart diamant)",
+                    "expert": "Expert (dubbel svart diamant)",
+                    "freeride": "Friåkning (offpist)",
+                    "extreme": "Extrem (klättringsutrustning krävs)"
+                }
+            },
+            "piste/grooming": {
+                "label": "Stil",
+                "options": {
+                    "classic": "Klassisk",
+                    "mogul": "Puckelpist",
+                    "backcountry": "Off-pist",
+                    "classic+skating": "Klassisk och skating",
+                    "scooter": "Scooter/Snöskoter",
+                    "skating": "Skating"
+                }
+            },
+            "piste/type": {
+                "label": "Typ",
+                "options": {
+                    "downhill": "Utförsåkning",
+                    "nordic": "Längdskidåkning",
+                    "skitour": "Turåkning",
+                    "sled": "Pulkabacke",
+                    "hike": "Vandringsled",
+                    "sleigh": "Slädåkning ",
+                    "ice_skate": "Skridskoåkning",
+                    "snow_park": "Snöpark",
+                    "playground": "Lekplats"
+                }
+            },

             "place": {
                 "label": "Typ"
             },
             "place": {
                 "label": "Typ"
             },


@@ -763,21 +964,75 @@
             "route_master": {
                 "label": "Typ"
             },
             "route_master": {
                 "label": "Typ"
             },

+            "sac_scale": {
+                "label": "Svårighetsgrad",
+                "placeholder": "Bergsvandring, alpin vandring",
+                "options": {
+                    "hiking": "T1: Vandring",
+                    "mountain_hiking": "T2: Bergsvandring",
+                    "demanding_mountain_hiking": "T3: Krävande bergsvandring",
+                    "alpine_hiking": "T4: Alpin vandring",
+                    "demanding_alpine_hiking": "T5: Krävande alpin vandring",
+                    "difficult_alpine_hiking": "T6: Svår alpin vandring"
+                }
+            },
+            "seasonal": {
+                "label": "Säsongsöppen"
+            },

             "service": {
                 "label": "Typ"
             },
             "shelter": {
                 "label": "Shelter"
             },
             "service": {
                 "label": "Typ"
             },
             "shelter": {
                 "label": "Shelter"
             },

+            "shelter_type": {
+                "label": "Typ"
+            },

             "shop": {
                 "label": "Typ"
             },
             "shop": {
                 "label": "Typ"
             },

+            "sloped_curb": {
+                "label": "Avfasad trottoar"
+            },
+            "smoking": {
+                "label": "Rökning",
+                "placeholder": "Nej, separat, ja...",
+                "options": {
+                    "no": "Rökning ej tillåtet",
+                    "separated": "I rökområde, ej fysiskt separerat",
+                    "isolated": "I rökområde, fysiskt separerat",
+                    "outside": "Tillåtet utomhus",
+                    "yes": "Tillåtet överallt",
+                    "dedicated": "Dedikerat för rökare (t.ex. rökklubb)"
+                }
+            },
+            "smoothness": {
+                "label": "Jämnhet",
+                "placeholder": "Tunna hjul, hjul, terräng...",
+                "options": {
+                    "excellent": "Tunna rullar: rollerblade, skateboard",
+                    "good": "Tunna Hjul: racercykel",
+                    "intermediate": "Hjul: cykel, rullstol, scooter",
+                    "bad": "Robusta hjul: trekkingcykel, bil, riksha",
+                    "very_bad": "Hög frigång: lätta terrängfordon",
+                    "horrible": "Terräng: tunga terrängfordon",
+                    "very_horrible": "Specialiserade för terräng: traktor, fyrhjuling",
+                    "impassible": "Ogenomträngliga / Ej hjulbaserade fordon"
+                }
+            },
+            "social_facility_for": {
+                "label": "Människohjälp",
+                "placeholder": "Hemlösa, funktionshindrade, barn, etc."
+            },

             "source": {
                 "label": "Källa"
             },
             "sport": {
                 "label": "Sport"
             },
             "source": {
                 "label": "Källa"
             },
             "sport": {
                 "label": "Sport"
             },

+            "sport_ice": {
+                "label": "Sport"
+            },

             "structure": {
                 "label": "Struktur",
                 "placeholder": "Okänt",
             "structure": {
                 "label": "Struktur",
                 "placeholder": "Okänt",


@@ -785,27 +1040,72 @@
                     "bridge": "Bro",
                     "tunnel": "Tunnel",
                     "embankment": "Vägbank",
                     "bridge": "Bro",
                     "tunnel": "Tunnel",
                     "embankment": "Vägbank",

-                    "cutting": "Vägsnitt"
+                    "cutting": "Vägsnitt",
+                    "ford": "Vadställe"

                 }
             },
                 }
             },

+            "studio_type": {
+                "label": "Typ"
+            },

             "supervised": {
                 "label": "Övervakad"
             },
             "surface": {
                 "label": "Beläggning"
             },
             "supervised": {
                 "label": "Övervakad"
             },
             "surface": {
                 "label": "Beläggning"
             },

+            "tactile_paving": {
+                "label": "Ledstråk"
+            },
+            "toilets/disposal": {
+                "label": "Omhändertagande",
+                "options": {
+                    "flush": "Spola",
+                    "pitlatrine": "Grop/Latrin",
+                    "chemical": "Kemisk",
+                    "bucket": "Behållare"
+                }
+            },

             "tourism": {
                 "label": "Typ"
             },
             "towertype": {
                 "label": "Typ av torn"
             },
             "tourism": {
                 "label": "Typ"
             },
             "towertype": {
                 "label": "Typ av torn"
             },

+            "tracktype": {
+                "label": "Typ av bruksväg",
+                "placeholder": "Fast, Mestadels fast, Mjuk ...",
+                "options": {
+                    "grade1": "Fast: asfalterad eller kraftigt packad hård yta",
+                    "grade2": "Mestadels fast: grus/sten med inslag av mjukt material",
+                    "grade3": "Jämn blandning av hårda och mjuka material",
+                    "grade4": "Mestadels mjukt: jord/sand/gräs med inslag av hårt material",
+                    "grade5": "Mjukt: jord/sand/gräs"
+                }
+            },

             "trail_visibility": {
             "trail_visibility": {

-                "label": "Synlighet"
+                "label": "Synlighet",
+                "placeholder": "Utmärkt, bra, dåligt...",
+                "options": {
+                    "excellent": "Utmärkt: Tydlig väg eller markörer överallt",
+                    "good": "Bra: markörer synliga men ibland svåra att hitta",
+                    "intermediate": "Medel: få markörer, stig mestadels synliga",
+                    "bad": "Dåligt: inga markörer, stig ibland osynlig/stiglös",
+                    "horrible": "Hemsk: ofta stiglös, en del orienteringskunskaper krävs",
+                    "no": "Ingen: stiglös, utmärkta orienteringskunskaper krävs"
+                }
+            },
+            "tree_type": {
+                "label": "Typ"
+            },
+            "trees": {
+                "label": "Träd"

             },
             "tunnel": {
                 "label": "Tunnel"
             },
             },
             "tunnel": {
                 "label": "Tunnel"
             },

+            "vending": {
+                "label": "Typ av varor"
+            },

             "water": {
                 "label": "Typ"
             },
             "water": {
                 "label": "Typ"
             },


@@ -835,10 +1135,50 @@
         "presets": {
             "address": {
                 "name": "Adress",
         "presets": {
             "address": {
                 "name": "Adress",

-                "terms": "Adress, husnummer, destination, gatuadress, postnummer, postort"
+                "terms": "Adress, husnummer, destination, gatuadress, postnummer, postort, postadress"
+            },
+            "aerialway": {
+                "name": "Linbana",
+                "terms": "Linbana, lift, skidlift"
+            },
+            "aerialway/cable_car": {
+                "name": "Kabinbana",
+                "terms": "Kabinbana, pendelbana, linbana"
+            },
+            "aerialway/chair_lift": {
+                "name": "Stollift",
+                "terms": "Stollift, stolslift, linbana, skidlift, lift, Expresslift"
+            },
+            "aerialway/gondola": {
+                "name": "Gondol",
+                "terms": "Gondol, Gondolbana, lift, linbana, skidlift, lift"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Rullband",
+                "terms": "Rullband, släplift, skidliften, lift, magisk matta"
+            },
+            "aerialway/platter": {
+                "name": "Knapplift",
+                "terms": "Knapplift, skidlift, släplift, lift, linbana, knapp, tallrik, tallrikslift"
+            },
+            "aerialway/pylon": {
+                "name": "Linbanestolpe",
+                "terms": "pylon, stötta, stolpe, pelare"
+            },
+            "aerialway/rope_tow": {
+                "name": "Replift",
+                "terms": "Replift, släplift, skidlift, linbana, lift"
+            },
+            "aerialway/station": {
+                "name": "Linbanestation",
+                "terms": "Linbanestation, station, linbana"
+            },
+            "aerialway/t-bar": {
+                "name": "Ankarlift",
+                "terms": "Ankarlift, T-bygellift, T-lift, släplift, skidlift, lift, linbana"

             },
             "aeroway": {
             },
             "aeroway": {

-                "name": "Flyg",
+                "name": "Flygtrafik",

                 "terms": "Flygväg, flygplatsväg, flyg, flygplats, flygtrafik, helikoptertrafik,luftfart, luftfartstrafik"
             },
             "aeroway/aerodrome": {
                 "terms": "Flygväg, flygplatsväg, flyg, flygplats, flygtrafik, helikoptertrafik,luftfart, luftfartstrafik"
             },
             "aeroway/aerodrome": {


@@ -868,7 +1208,12 @@
                 "name": "Flygterminal"
             },
             "amenity": {
                 "name": "Flygterminal"
             },
             "amenity": {

-                "name": "Facilitet"
+                "name": "Facilitet",
+                "terms": "Facilitet, anordning, hjälpmedel, bekvämlighet, anläggning, inrättning"
+            },
+            "amenity/arts_centre": {
+                "name": "Konstcenter",
+                "terms": "Konstcenter, kulturhus, konst, kultur, museum, tavlor, kulturcenter"

             },
             "amenity/atm": {
                 "name": "Uttagsautomat",
             },
             "amenity/atm": {
                 "name": "Uttagsautomat",


@@ -883,32 +1228,48 @@
                 "terms": "Bar, krog, servering, matställe, pub, cocktailsalong, saloon"
             },
             "amenity/bbq": {
                 "terms": "Bar, krog, servering, matställe, pub, cocktailsalong, saloon"
             },
             "amenity/bbq": {

-                "name": "Grillplats/Grill"
+                "name": "Grillplats/Grill",
+                "terms": "Grill, Barbecue, eldplats, eldstad, grillplats, grillning, eldning"

             },
             "amenity/bench": {
             },
             "amenity/bench": {

-                "name": "Bänk"
+                "name": "Bänk",
+                "terms": "soffa, sittmöbel, sittbräde, sits, bänk"

             },
             "amenity/bicycle_parking": {
             },
             "amenity/bicycle_parking": {

-                "name": "Cykelparkering"
+                "name": "Cykelparkering",
+                "terms": "Cykelparkering, ställplats, cykelställ, Parkering"

             },
             "amenity/bicycle_rental": {
             },
             "amenity/bicycle_rental": {

-                "name": "Cykeluthyrning"
+                "name": "Cykeluthyrning",
+                "terms": "Cykeluthyrning, cykellån, cykelleasing, lånecykel, hyrcykel"
+            },
+            "amenity/boat_rental": {
+                "name": "Båtuthyrning",
+                "terms": "Båtuthyrning, båtlån, båtleasing, lånebåt, hyrbåt"
+            },
+            "amenity/bus_station": {
+                "name": "Busstation",
+                "terms": "Busstation, bussterminal, terminal, Busshållplats, resecenter, buss"

             },
             "amenity/cafe": {
                 "name": "Café",
                 "terms": "kaffeservering, kaffestuga, kafeteria, cafeteria, servering, konditori, kondis, fik"
             },
             "amenity/car_rental": {
             },
             "amenity/cafe": {
                 "name": "Café",
                 "terms": "kaffeservering, kaffestuga, kafeteria, cafeteria, servering, konditori, kondis, fik"
             },
             "amenity/car_rental": {

-                "name": "Biluthyrning"
+                "name": "Biluthyrning",
+                "terms": "Biluthyrning, billån, billeasing, lånebil, hyrbil"

             },
             "amenity/car_sharing": {
             },
             "amenity/car_sharing": {

-                "name": "Bilpool"
+                "name": "Bilpool",
+                "terms": "Bilpool, bildelning"

             },
             "amenity/car_wash": {
             },
             "amenity/car_wash": {

-                "name": "Biltvätt"
+                "name": "Biltvätt",
+                "terms": "Biltvätt, portaltvätt, tvättgata, biltvättanläggning, tvätt-tunnel"

             },
             "amenity/charging_station": {
             },
             "amenity/charging_station": {

-                "name": "Laddstation"
+                "name": "Laddstation",
+                "terms": "Laddstation, elbil, snabbladdning, el, eluttag"

             },
             "amenity/childcare": {
                 "name": "Barnomsorg",
             },
             "amenity/childcare": {
                 "name": "Barnomsorg",


@@ -918,52 +1279,93 @@
                 "name": "Biograf",
                 "terms": "Bio, Biograf, Biografteater"
             },
                 "name": "Biograf",
                 "terms": "Bio, Biograf, Biografteater"
             },

+            "amenity/clinic": {
+                "name": "Vårdcentral",
+                "terms": "Klinik, vårdcentral, primärvård, distriktsläkare, distriktssköterska, sjukhus"
+            },

             "amenity/clock": {
             "amenity/clock": {

-                "name": "Klocka"
+                "name": "Klocka",
+                "terms": "Klocka, ur, urtavla, kyrkklocka, tidur, solur, väggur, väggklocka"
+            },
+            "amenity/compressed_air": {
+                "name": "Tryckluft",
+                "terms": "Tryckluft, pumpstation, komprimerad luft"

             },
             "amenity/courthouse": {
             },
             "amenity/courthouse": {

-                "name": "Domstol"
+                "name": "Domstol",
+                "terms": "Domstol, rättskipare, rätt, ting, tribunal, instans, juridik, lag, lagbok"
+            },
+            "amenity/dentist": {
+                "name": "Tandläkare",
+                "terms": "Tandläkare, tanddoktor, odontolog, tandhygienist, "
+            },
+            "amenity/doctor": {
+                "name": "Doktor",
+                "terms": "Doktor, vårdcentral, sjukhus, klinik, vårdinrättning, läkare"
+            },
+            "amenity/dojo": {
+                "name": "Dojo / Akademi för kampsport",
+                "terms": "Dojo, kampsport, träningslokal, budo, japansk konst, japan, kampkonst"

             },
             "amenity/drinking_water": {
                 "name": "Dricksvatten ",
                 "terms": "Dricksvatten, källa, vatten"
             },
             "amenity/embassy": {
             },
             "amenity/drinking_water": {
                 "name": "Dricksvatten ",
                 "terms": "Dricksvatten, källa, vatten"
             },
             "amenity/embassy": {

-                "name": "Embassad"
+                "name": "Embassad",
+                "terms": "ambassad, diplomatisk beskickning, beskickning, legation, utlandsrepresentation"

             },
             "amenity/fast_food": {
             },
             "amenity/fast_food": {

-                "name": "Snabbmat"
+                "name": "Snabbmat",
+                "terms": "Snabbmat, skräpmat, gatuköksmat, bukfylla, junk-food, gatukök"

             },
             "amenity/fire_station": {
             },
             "amenity/fire_station": {

-                "name": "Brandstation"
+                "name": "Brandstation",
+                "terms": "Brandstation, räddningstjänsten, brandbil, brandstång, brandtorn"

             },
             "amenity/fountain": {
             },
             "amenity/fountain": {

-                "name": "Fontän"
+                "name": "Fontän",
+                "terms": "Fontän, springbrunn, vattenkonst"

             },
             "amenity/fuel": {
             },
             "amenity/fuel": {

-                "name": "Bensinstation"
+                "name": "Bensinstation",
+                "terms": "Bensinstation, tapp, mack, bränsle, tankstation"

             },
             "amenity/grave_yard": {
             },
             "amenity/grave_yard": {

-                "name": "Gravplats"
+                "name": "Kyrkogård",
+                "terms": "Gravplats, kyrkogård, begravningsplats, kyrkogård, urnlund, minneslund, griftegård"

             },
             "amenity/hospital": {
                 "name": "Sjukhusområde",
                 "terms": "Sjukhusområde, lasarett, sjukhus"
             },
             },
             "amenity/hospital": {
                 "name": "Sjukhusområde",
                 "terms": "Sjukhusområde, lasarett, sjukhus"
             },

+            "amenity/kindergarten": {
+                "name": "Förskoleområde",
+                "terms": "Förskola, dagis, daghem, lekskola, kindergarten, lekis, lekplats"
+            },

             "amenity/library": {
             "amenity/library": {

-                "name": "Bibliotek"
+                "name": "Bibliotek",
+                "terms": "Bibliotek, boksamling, bokskatt, bokrum, läsesal, bibbla"

             },
             "amenity/marketplace": {
             },
             "amenity/marketplace": {

-                "name": "Maknadsplats"
+                "name": "Maknadsplats",
+                "terms": "Saluhall, torg, marknad, salutorg"
+            },
+            "amenity/nightclub": {
+                "name": "Nattklubb",
+                "terms": "Nattklubb, disko, diskotek, klubb, nöjeslokal, dansställe, bar"

             },
             "amenity/parking": {
             },
             "amenity/parking": {

-                "name": "Bilparkering"
+                "name": "Bilparkering",
+                "terms": "Parkering, parkeringsplats, p-plats, parkeringsområde"

             },
             "amenity/parking_entrance": {
             },
             "amenity/parking_entrance": {

-                "name": "In- och utfart parkeringsgarage"
+                "name": "In- och utfart parkeringsgarage",
+                "terms": "garage, parkeringshus, infart, utfart"

             },
             "amenity/pharmacy": {
             },
             "amenity/pharmacy": {

-                "name": "Läkemedel"
+                "name": "Läkemedel",
+                "terms": "Läkemedel, apotek,  läkemedelsaffär, farmaceut, droghandel"

             },
             "amenity/place_of_worship": {
                 "name": "Plats för tillbedjan",
             },
             "amenity/place_of_worship": {
                 "name": "Plats för tillbedjan",


@@ -994,10 +1396,16 @@
                 "terms": "Brevlåda, postlåda, brevinkast"
             },
             "amenity/post_office": {
                 "terms": "Brevlåda, postlåda, brevinkast"
             },
             "amenity/post_office": {

-                "name": "Postkontor"
+                "name": "Postkontor",
+                "terms": "Postkontor, post, posten, postverk, postväsende, brev, paket, försändelser, postgång"

             },
             "amenity/pub": {
             },
             "amenity/pub": {

-                "name": "Pub"
+                "name": "Pub",
+                "terms": "Pub, bar, ölservering, ölstuga, krog, nattklubb"
+            },
+            "amenity/ranger_station": {
+                "name": "Friluftsanläggningen",
+                "terms": "Friluftsanläggningen, friluftsområde, park, friluftsliv, infocenter, informationscenter "

             },
             "amenity/recycling": {
                 "name": "Återvinning",
             },
             "amenity/recycling": {
                 "name": "Återvinning",


@@ -1011,15 +1419,41 @@
                 "name": "Skolområde",
                 "terms": "Skolgård, skolområde, Campus, universitetsområde, högskoleområde, universitet, högskola"
             },
                 "name": "Skolområde",
                 "terms": "Skolgård, skolområde, Campus, universitetsområde, högskoleområde, universitet, högskola"
             },

+            "amenity/shelter": {
+                "name": "Skydd",
+                "terms": "Skydd, tak över huvudet, hydda, vindskydd, koja, väntkur, grotta, väderskydd"
+            },
+            "amenity/social_facility": {
+                "name": "Social inrättning",
+                "terms": "Social inrättning, social hjälp, social, socialen, uteliggare, hjälparbete, välgörenhetsorganisationer, välgörenhet"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Matbank",
+                "terms": "matbank, välgörenhetsorganisation, matutdelning, matpaket"
+            },
+            "amenity/social_facility/group_home": {
+                "name": "Gruppboende",
+                "terms": "Gruppboende, grupphem, kollektiv, hjälparbete, välgörenhetsorganisationer, välgörenhet"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Härbärge",
+                "terms": "Härbärge, hemlös, bostadslös, sovsal"
+            },
+            "amenity/studio": {
+                "name": "Studio",
+                "terms": "Studio, inspelningslokal, utsändningslokal, filmstudio, radiostudio, TV-studio, TV, radio"
+            },

             "amenity/swimming_pool": {
             "amenity/swimming_pool": {

-                "name": "Simbassäng"
+                "name": "Simbassäng",
+                "terms": "Simbassäng, bassäng, swimmingpool, pool"

             },
             "amenity/taxi": {
                 "name": "Taxihållplats",
                 "terms": "Taxihållplats, taxificka, taxistation"
             },
             "amenity/telephone": {
             },
             "amenity/taxi": {
                 "name": "Taxihållplats",
                 "terms": "Taxihållplats, taxificka, taxistation"
             },
             "amenity/telephone": {

-                "name": "Telefon"
+                "name": "Telefon",
+                "terms": "Telefon, telefonkiosk, telefonkur, telefonhytt, telefonautomat"

             },
             "amenity/theatre": {
                 "name": "Teater",
             },
             "amenity/theatre": {
                 "name": "Teater",


@@ -1036,85 +1470,149 @@
             "amenity/university": {
                 "name": "Universitet"
             },
             "amenity/university": {
                 "name": "Universitet"
             },

+            "amenity/vending_machine": {
+                "name": "Varuautomat",
+                "terms": "Varuautomat, varumaskin, godisautomat, tuggummiautomater"
+            },

             "amenity/veterinary": {
                 "name": "Veterinär ",
                 "terms": "Veterinär, djurläkare, djurdoktor"
             },
             "amenity/waste_basket": {
             "amenity/veterinary": {
                 "name": "Veterinär ",
                 "terms": "Veterinär, djurläkare, djurdoktor"
             },
             "amenity/waste_basket": {

-                "name": "Soptunna"
+                "name": "Soptunna",
+                "terms": "Soptunna, papperskorg, sopkärl, papperskärl, skräpkorg, avfallskorg"

             },
             "area": {
             },
             "area": {

-                "name": "Yta"
+                "name": "Yta",
+                "terms": "Yta, areal, område, plan, utrymme, fällt, mark"

             },
             "barrier": {
             },
             "barrier": {

-                "name": "Barriär"
+                "name": "Barriär",
+                "terms": "barriär, räcke, spärr, bom, mur, vall, skydd, hinder, avspärrning, stopp, blockering"

             },
             "barrier/block": {
             },
             "barrier/block": {

-                "name": "Block"
+                "name": "Block",
+                "terms": "Block, betongsugga, sugga, avspärrare, trafikbarriärer, Trafikhinder "

             },
             "barrier/bollard": {
             },
             "barrier/bollard": {

-                "name": "Pollare"
+                "name": "Stolpe",
+                "terms": "Pollare, stolpe"

             },
             "barrier/cattle_grid": {
             },
             "barrier/cattle_grid": {

-                "name": "Färist"
+                "name": "Färist",
+                "terms": "Färist, rist, galler"

             },
             "barrier/city_wall": {
             },
             "barrier/city_wall": {

-                "name": "Stadsmur"
+                "name": "Stadsmur",
+                "terms": "Stadsmur, befästningsverk, skans, fort, vallar, barrikad, mur, ringmur"

             },
             "barrier/cycle_barrier": {
             },
             "barrier/cycle_barrier": {

-                "name": "Cykelbarriär "
+                "name": "Cykelbarriär ",
+                "terms": "Cykelbarriär, hinder, barriär,  "

             },
             "barrier/ditch": {
             },
             "barrier/ditch": {

-                "name": "Dike"
+                "name": "Dike",
+                "terms": "Dike, vallgrav, ränna"

             },
             "barrier/entrance": {
             },
             "barrier/entrance": {

-                "name": "Entré"
+                "name": "Entré",
+                "terms": "Entré, ingång, inträde, port, dörr"

             },
             "barrier/fence": {
             },
             "barrier/fence": {

-                "name": "Staket"
+                "name": "Staket",
+                "terms": "Staket, stängsel, inhägnad, gärdsgård"

             },
             "barrier/gate": {
             },
             "barrier/gate": {

-                "name": "Grind"
+                "name": "Grind",
+                "terms": "Grind"

             },
             "barrier/hedge": {
             },
             "barrier/hedge": {

-                "name": "Häck"
+                "name": "Häck",
+                "terms": "Häck, buskar"

             },
             "barrier/kissing_gate": {
             },
             "barrier/kissing_gate": {

-                "name": "Grind vid betesmark"
+                "name": "Grind vid betesmark",
+                "terms": "Grind vid betesmark, Kryssgrind"

             },
             "barrier/lift_gate": {
             },
             "barrier/lift_gate": {

-                "name": "Bom"
+                "name": "Bom",
+                "terms": "Bom, lyftbom, spärr, avspärrning"

             },
             "barrier/retaining_wall": {
             },
             "barrier/retaining_wall": {

-                "name": "Stödmur"
+                "name": "Stödmur",
+                "terms": "Stödmur, nivåskillnad "

             },
             "barrier/stile": {
             },
             "barrier/stile": {

-                "name": "Övergång"
+                "name": "Övergång",
+                "terms": "Övergång, trappa"

             },
             "barrier/toll_booth": {
             },
             "barrier/toll_booth": {

-                "name": "Tullstation"
+                "name": "Tullstation",
+                "terms": "Tullstation, införselavgift, importavgift, skatt,  tullhus, tullmyndighet, gränstull, tullkontroll, tullvisitation, vägavgift"

             },
             "barrier/wall": {
             },
             "barrier/wall": {

-                "name": "Vägg"
+                "name": "Mur",
+                "terms": "Mur, vägg, murverk, skyddsvärn, befästning, hinder, barriär"

             },
             "boundary/administrative": {
             },
             "boundary/administrative": {

-                "name": "Administrativ gräns"
+                "name": "Administrativ gräns",
+                "terms": "Gräns, administrativ gräns, gränslinje"

             },
             "building": {
             },
             "building": {

-                "name": "Byggnad"
+                "name": "Byggnad",
+                "terms": "Byggnad, hus, konstruktion, byggnadsverk, bygge, anläggning, fastighet, kåk"

             },
             "building/apartments": {
             },
             "building/apartments": {

-                "name": "Lägenheter"
+                "name": "Lägenheter",
+                "terms": "Bostad, lägenheter, lägenhet, hyreshus, bostadshus"
+            },
+            "building/barn": {
+                "name": "Lada",
+                "terms": "Lada, ladugård, loge, magasin, skjul, skulle, lagård"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker, stridsvärn, värn, försvarsanläggning, skyddsrum"
+            },
+            "building/cabin": {
+                "name": "Stuga",
+                "terms": "Stuga, hus, torp, koja, kåk, fritidshus, sommarstuga, landställe"
+            },
+            "building/cathedral": {
+                "name": "Katedral/domkyrka",
+                "terms": "Katedral, domkyrka, biskop, kyrka"
+            },
+            "building/chapel": {
+                "name": "Kapell",
+                "terms": "Kapell, kyrkobyggnad, kyrka, bönhus, gudstjänstlokal, kyrkorum, andaktsrum "
+            },
+            "building/church": {
+                "name": "Kyrka",
+                "terms": "Kyrka, kyrkobyggnad, gudshus, tempel, kapell, bönehus, böneplats, missionshus, gudstjänstlokal"
+            },
+            "building/commercial": {
+                "name": "Kommersiell byggnad",
+                "terms": "Kommersiell byggnad, kommersiellt, affärsbyggnad, handelsbyggnad"

             },
             "building/construction": {
                 "name": "Byggnad under konstruktion",
                 "terms": "Byggnad under konstruktion, Byggnad under uppförande, byggarbete, bygge, byggarbetsplats, byggnation, byggnadsplats"
             },
             },
             "building/construction": {
                 "name": "Byggnad under konstruktion",
                 "terms": "Byggnad under konstruktion, Byggnad under uppförande, byggarbete, bygge, byggarbetsplats, byggnation, byggnadsplats"
             },

+            "building/detached": {
+                "name": "Fristående villa",
+                "terms": "Villa, hus, småhus, enfamiljshus, enbostadshus, kåk, egnahem, fristående hus, friliggande hus, envåningshus"
+            },
+            "building/dormitory": {
+                "name": "Elevhem",
+                "terms": "Elevhem, internatskola, internat, sovsal, kollektiv, Korridorboende, studentkorridor, korridorboende"
+            },

             "building/entrance": {
             "building/entrance": {

-                "name": "Entré/utgång"
+                "name": "Entré/utgång",
+                "terms": "entré, ingång, port, dörr, inträde, exit, utgång, huvudentré, bakväg"

             },
             "building/garage": {
             },
             "building/garage": {

-                "name": "Garage"
+                "name": "Garage",
+                "terms": "garage, bilstall, bilskjul, carport, parkeringshus, varmgarage, kallgarage"

             },
             "building/garages": {
                 "name": "Garage",
             },
             "building/garages": {
                 "name": "Garage",


@@ -1124,21 +1622,317 @@
                 "name": "Växthus",
                 "terms": "växthus, drivhus, orangeri, driveri, vinterträdgård, växtodling, blomsterhus, odlingshus"
             },
                 "name": "Växthus",
                 "terms": "växthus, drivhus, orangeri, driveri, vinterträdgård, växtodling, blomsterhus, odlingshus"
             },

+            "building/hospital": {
+                "name": "Sjukhusbyggnad",
+                "terms": "Sjukhusbyggnad, sjukhus, lasarett, sjukvårdsinrättning, klinik, sjukhem, sjukstuga, vårdhem, vårdanstalt, hospital"
+            },
+            "building/hotel": {
+                "name": "Hotellbyggnad",
+                "terms": "Hotellbyggnad, hotell, motell, värdshus, pensionat, , härbärge, gästhem, vandrarhem"
+            },

             "building/house": {
             "building/house": {

-                "name": "Hus"
+                "name": "Rad-/Parhus",
+                "terms": "Villa, hus, småhus, enfamiljshus, enbostadshus, kåk, egnahem, radhus, parhus"
+            },
+            "building/hut": {
+                "name": "Koja",
+                "terms": "Koja, stuga, skydd, hydda, kyffe, barack"

             },
             "building/industrial": {
             },
             "building/industrial": {

-                "name": "Industribyggnad"
+                "name": "Industribyggnad",
+                "terms": "Industribyggnad, fabrik, industri, lager"
+            },
+            "building/public": {
+                "name": "Publik byggnad",
+                "terms": "Publik byggnad, allmän byggnad, offentlig byggnad"

             },
             "building/residential": {
                 "name": "Bostadshus",
                 "terms": "Bostadshus, Boningshus, Flerfamiljshus, Hyreshus"
             },
             },
             "building/residential": {
                 "name": "Bostadshus",
                 "terms": "Bostadshus, Boningshus, Flerfamiljshus, Hyreshus"
             },

+            "building/retail": {
+                "name": "Affärsbyggnad",
+                "terms": "Affärsbyggnad, affärer, detaljhandel, butik, kiosk, försäljningsställe, varuhus, affärshus"
+            },
+            "building/roof": {
+                "name": "Tak",
+                "terms": "Tak, övertäckning, valv, överbyggnad, regnskydd"
+            },
+            "building/school": {
+                "name": "Skolbyggnad",
+                "terms": "Skolbyggnad, skola, läroanstalt, undervisningsanstalt, lärosäte, grundskola, gymnasium, folkhögskola, läroverk, skolhus, skolväsen, undervisning, utbildning"
+            },
+            "building/shed": {
+                "name": "Skjul",
+                "terms": "Skjul, friggebod, uthus, bod, barack, förråd, förvaringsskjul, visthusbod, visthus, hobbyhus, förvaring, verkstad, hobbyrum"
+            },
+            "building/stable": {
+                "name": "Stall",
+                "terms": "Stall, hästar, häst, stallbyggnad, ridhus, ridhusanläggning"
+            },
+            "building/static_caravan": {
+                "name": "Villavagn",
+                "terms": "Villavagn, husvagn, campingvagn"
+            },
+            "building/terrace": {
+                "name": "Terrasshus",
+                "terms": "Terrasshus"
+            },
+            "building/train_station": {
+                "name": "Järnvägsstation",
+                "terms": "Järnvägsstation, centralstation, central, huvudbangård, tågstation, järnvägshållplats, tåghållplats"
+            },
+            "building/warehouse": {
+                "name": "Lagerhus",
+                "terms": "Lagerhus, lager, upplag, magasin, depå, packhus, lada"
+            },
+            "craft/basket_maker": {
+                "name": "Korgtillverkare",
+                "terms": "Korgtillverkare, korg, korgtillverkning, korgflätning, Korgslöjd"
+            },
+            "craft/beekeeper": {
+                "name": "Biodlare",
+                "terms": "Biodlare, bi, honung, honungstillverkning, biodling"
+            },
+            "craft/blacksmith": {
+                "name": "Smed",
+                "terms": "Smed, smida, smide, konsthantverk, smidesverkstad"
+            },
+            "craft/boatbuilder": {
+                "name": "Båtbyggare",
+                "terms": "båtbyggare, båtbyggeri, varv"
+            },
+            "craft/bookbinder": {
+                "name": "Bokbindare",
+                "terms": "Bokbindare, bokbindning, bok, böcker, bindning, bokbinderi"
+            },
+            "craft/brewery": {
+                "name": "Bryggeri",
+                "terms": "Bryggeri, ölframställning, öltillverkning, öl"
+            },
+            "craft/carpenter": {
+                "name": "Snickare",
+                "terms": "Snickare, byggnadssnickare, timmerman, träarbetare,  grovsnickare"
+            },
+            "craft/carpet_layer": {
+                "name": "Mattläggare",
+                "terms": "Mattläggare, mattläggning, matta, golv, golvläggare"
+            },
+            "craft/caterer": {
+                "name": "Catering",
+                "terms": "catering, cateringfirma, matleverantör, matleverans, , "
+            },
+            "craft/clockmaker": {
+                "name": "Urmakare (väggur)",
+                "terms": "Urmakare, klockmakare"
+            },
+            "craft/confectionary": {
+                "name": "Konditori",
+                "terms": "konfektyr, godis, godsaker, choklad, Konditori, kondis, sockerbageri, finbageri"
+            },
+            "craft/dressmaker": {
+                "name": "Sömmerska",
+                "terms": "Sömmerska, skräddare, Dressmaker, Klädsömmare, sömmnad, sy, kvinnokläder, kläder, klädtillverkning, klänning"
+            },
+            "craft/electrician": {
+                "name": "Elektriker",
+                "terms": "Elektriker, elmontör, elreparatör, montör, el, elmontör, starkströmsmontör, systembyggare"
+            },
+            "craft/gardener": {
+                "name": "Trädgårdsmästare",
+                "terms": "Trädgårdsmästare, trädgård, handelsträdgård"
+            },
+            "craft/glaziery": {
+                "name": "Glasmästare",
+                "terms": "glasblåsare, fönster, solskydd, glaskonst, glas"
+            },
+            "craft/handicraft": {
+                "name": "Hantverk",
+                "terms": "Hantverkare, hantverk, konsthantverk, slöjd, handarbete, hantverk, snideri, sömnad, hemslöjd, vävning, textil, vävstuga, snickeri"
+            },
+            "craft/hvac": {
+                "name": "VVS",
+                "terms": "VVS, rörmokare, värme, ventilation, sanitet, avlopp, vatten, vattenförsörjning, styrsystem, övervakningssystem, inomhusklimat, energiförsörjning, tryckluft, gas, sprinkler, uppvärmning, installationsteknik, kyla, luftkonditionering, air condition"
+            },
+            "craft/insulator": {
+                "name": "Isolering",
+                "terms": "Isolering, isolerare, isolationsmaterial, värmeisolering, ljudisolering"
+            },
+            "craft/jeweler": {
+                "name": "Smycken",
+                "terms": "Smycken, juvelerare, juveler, ädelstenar, guld, silver, guldsmed, halsband, örhänge, ring, ringar"
+            },
+            "craft/key_cutter": {
+                "name": "Nyckeltillverkning",
+                "terms": "Nyckeltillverkning, nyckel, nycklar, nyckelkopiering, nyckelring, nyckelringar, hänglås"
+            },
+            "craft/locksmith": {
+                "name": "Låssmed",
+                "terms": "Låssmed, lås, nyckel, nycklar, låscylinder, låscylindrar, motorlås, passagesystem, larmsystem, vapenskåp, säkerhetsdörr, dyrk"
+            },
+            "craft/metal_construction": {
+                "name": "Metalarbete",
+                "terms": "Metallarbete, metallarbetare,  kallbearbetning, metallindustri, svets, svetsare, svetsning "
+            },
+            "craft/optician": {
+                "name": "Optiker",
+                "terms": "Optiker, syn, synundersökning, glasögon, linser, optometrist, optik"
+            },
+            "craft/painter": {
+                "name": "Målare",
+                "terms": "Målare, färg, målarmästare, måleri, måleriarbetare, lackering, penslar, tapeter, tapetserare, tapetsering"
+            },
+            "craft/photographer": {
+                "name": "Fotograf",
+                "terms": "Fotograf, fotografering, kamera, bildkonst, porträtt, porträttfotografering, bild"
+            },
+            "craft/photographic_laboratory": {
+                "name": "Fotoframkallning",
+                "terms": "Filmframkallning, mörkrum, film, framkallning, fotoframkallning, foto, utskrift, kanvas"
+            },
+            "craft/plasterer": {
+                "name": "Putsare",
+                "terms": "Putsare, puts, gips, cement, väggputs"
+            },
+            "craft/plumber": {
+                "name": "Rörmokare",
+                "terms": "Rörmokare, vatten, avlopp, dränering, rör, rörmontör, rörläggare"
+            },
+            "craft/pottery": {
+                "name": "Krukmakeri",
+                "terms": "Krukmakare, krukmakeri, drejare, drejning, lergods, stengods, porslin, keramik, lera, glasering, keramiker, krukgods, lerkärl"
+            },
+            "craft/rigger": {
+                "name": "Riggare",
+                "terms": "Riggare, tackling, rigg, segel, segelfartyg, mast, tågvirke, segelbåt"
+            },
+            "craft/roofer": {
+                "name": "Takläggare, takläggning, tak, takpannor, yttertak, Taktegel, tegel",
+                "terms": "Takläggare"
+            },
+            "craft/saddler": {
+                "name": "Sadelmakare",
+                "terms": "Sadelmakare, sadelmakeri, sadel, säte, läder"
+            },
+            "craft/sailmaker": {
+                "name": "Segelmakare",
+                "terms": "Segelmakare, segelmakeri, segel, segelsömnad"
+            },
+            "craft/sawmill": {
+                "name": "Sågverk",
+                "terms": "Sågverk, timmer, virke, brädor, bräda, plank, trä"
+            },
+            "craft/scaffolder": {
+                "name": "Ställningsbyggare",
+                "terms": "Ställningsbyggare, byggnadsställning, ställning"
+            },
+            "craft/sculpter": {
+                "name": "Skulptör",
+                "terms": "Skulptör, staty, skulptur, stenskulptör, bildhuggare, bildsnidare"
+            },
+            "craft/shoemaker": {
+                "name": "Skomakare",
+                "terms": "Skomakare, skor"
+            },
+            "craft/stonemason": {
+                "name": "Stenhuggare",
+                "terms": "Stenhuggare, stenbrott"
+            },
+            "craft/sweep": {
+                "name": "Sotare",
+                "terms": "Sotare, skorstensfejare"
+            },
+            "craft/tailor": {
+                "name": "Skräddare",
+                "terms": "Skräddare, kläder"
+            },
+            "craft/tiler": {
+                "name": "Plattläggare",
+                "terms": "Plattläggare, golvläggare"
+            },
+            "craft/tinsmith": {
+                "name": "Tennsmed ",
+                "terms": "Tennsmed, förtennare, Tunnplåtslagare, tenn, plåtslagare"
+            },
+            "craft/upholsterer": {
+                "name": "Möbelstoppare",
+                "terms": "Möbelstoppare, tapetserare, stoppning, möbler"
+            },
+            "craft/watchmaker": {
+                "name": "Urmakare (små klockor)",
+                "terms": "Urmakare, armbandsur, fickur, klockreparatör"
+            },
+            "craft/window_construction": {
+                "name": "Fönstertillverkare",
+                "terms": "Fönstertillverkare, dörrtillverkare, fönsterinstallatör, dörrinstallatör, dörr, dörrar, fönster, fönsterleverantör, dörrleverantör, fönstermontör, dörrmontör"
+            },
+            "embankment": {
+                "name": "Vägbank",
+                "terms": "Upphöjning, barnvall, vall, bank, Vägbank"
+            },
+            "emergency/ambulance_station": {
+                "name": "Ambulansstation",
+                "terms": "Ambulansstation, räddningstjänst, ambulans"
+            },
+            "emergency/fire_hydrant": {
+                "name": "Brandpost",
+                "terms": "Brandpost, vattenpost, brandsläckning, vattenpost, brandslang"
+            },

             "emergency/phone": {
             "emergency/phone": {

-                "name": "Nödtelefon"
+                "name": "Nödtelefon",
+                "terms": "Nödtelefon, alarmeringscentral, nödnummer, larmtelefon, alarmtelefon"

             },
             "entrance": {
             },
             "entrance": {

-                "name": "In-/Utgång"
+                "name": "In-/Utgång",
+                "terms": "Ingång, utgång, entré, dörr, huvudentré "
+            },
+            "footway/crossing": {
+                "name": "Korsning",
+                "terms": "Korsning, övergångsställe, övergång, passage, vad, gångpassage"
+            },
+            "footway/crosswalk": {
+                "name": "Övergångsställe",
+                "terms": "Övergångsställe, gångpassage"
+            },
+            "footway/sidewalk": {
+                "name": "Trottoar",
+                "terms": "Trottoar, gångbana, gångväg"
+            },
+            "ford": {
+                "name": "Vadställe",
+                "terms": "Vadställe, vad, övergångsställe "
+            },
+            "golf/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker, sandfälla, sandgrop, sandhål, hinder, golf"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": "Fairway, golf"
+            },
+            "golf/green": {
+                "name": "Green",
+                "terms": "puttinggreen, green, hål, golf"
+            },
+            "golf/hole": {
+                "name": "Golfhål",
+                "terms": "Golfhål, hål, golf"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Sidovattenhinder",
+                "terms": "Sidovattenhinder, vattenhinder, vattenhål, dam, sjö, dike"
+            },
+            "golf/rough": {
+                "name": "Ruff",
+                "terms": "ruff, ruffen, gräs"
+            },
+            "golf/tee": {
+                "name": "Tee",
+                "terms": "Tee, utslagsplats, golf"
+            },
+            "golf/water_hazard": {
+                "name": "Vattenhinder",
+                "terms": "Vattenhinder, vattenhål, dam, sjö, dike"

             },
             "highway": {
                 "name": "Väg",
             },
             "highway": {
                 "name": "Väg",


@@ -1156,6 +1950,10 @@
                 "name": "Korsning",
                 "terms": "Korsning, kryss, mot, plankorsning"
             },
                 "name": "Korsning",
                 "terms": "Korsning, kryss, mot, plankorsning"
             },

+            "highway/crosswalk": {
+                "name": "Övergångsställe",
+                "terms": "Övergångsställe, gångpassage"
+            },

             "highway/cycleway": {
                 "name": "Cykelväg",
                 "terms": "cykelväg, cykelled, gc-väg, gång- och cykelväg"
             "highway/cycleway": {
                 "name": "Cykelväg",
                 "terms": "cykelväg, cykelled, gc-väg, gång- och cykelväg"


@@ -1165,285 +1963,453 @@
                 "terms": "gångväg, gc-väg, gång- och cykelväg, stig"
             },
             "highway/living_street": {
                 "terms": "gångväg, gc-väg, gång- och cykelväg, stig"
             },
             "highway/living_street": {

-                "name": "Gångfartsområde"
+                "name": "Gångfartsområde",
+                "terms": "Gångfartsområde, gårdsgata, torg"

             },
             "highway/mini_roundabout": {
             },
             "highway/mini_roundabout": {

-                "name": "Minirondell"
+                "name": "Minirondell",
+                "terms": "Minirondell, rondell, cirkulationsplats, trafikrondell"

             },
             "highway/motorway": {
             },
             "highway/motorway": {

-                "name": "Motorväg"
+                "name": "Motorväg",
+                "terms": "Motorväg, snabbled, stadsmotorväg"
+            },
+            "highway/motorway_junction": {
+                "name": "Motorvägspåfart / -avfart",
+                "terms": "Påfart, avfart, motorvägspåfart, motorvägsavfart, mot, trafikplats, vägkorsning"

             },
             "highway/motorway_link": {
             },
             "highway/motorway_link": {

-                "name": "Anslutning, motorväg"
+                "name": "Anslutning, motorväg",
+                "terms": "Anslutning, motorvägsanslutning, påfart, avfart, trafikplats"

             },
             "highway/path": {
             },
             "highway/path": {

-                "name": "Stig"
+                "name": "Stig",
+                "terms": "Stig, gång, led, spår, gångväg, vandringsled"

             },
             "highway/pedestrian": {
             },
             "highway/pedestrian": {

-                "name": "Gågata"
+                "name": "Gågata",
+                "terms": "Gångbana, gående, fotgängare"

             },
             "highway/primary": {
             },
             "highway/primary": {

-                "name": "Primär väg"
+                "name": "Primär väg",
+                "terms": "Primär väg, primärväg, riksväg, huvudväg, länsväg"

             },
             "highway/primary_link": {
             },
             "highway/primary_link": {

-                "name": "Anslutning, primär väg"
+                "name": "Anslutning, primär väg",
+                "terms": "Anslutning, påfart, avfart, huvudväg, riksväg, primär väg, primärväg"

             },
             "highway/residential": {
             },
             "highway/residential": {

-                "name": "Bostadsgata"
+                "name": "Bostadsgata",
+                "terms": "Bostadsgata, gata, bostadsområde, villaväg, villagata"

             },
             "highway/rest_area": {
             },
             "highway/rest_area": {

-                "name": "Rastplats"
+                "name": "Rastplats",
+                "terms": "Rastplats, bensinstation"

             },
             "highway/road": {
             },
             "highway/road": {

-                "name": "Okänd väg"
+                "name": "Okänd väg",
+                "terms": "okänd väg, ospecificerad, okänd, obekant, främmande, outforskad"

             },
             "highway/secondary": {
             },
             "highway/secondary": {

-                "name": "Sekundär väg"
+                "name": "Sekundär väg",
+                "terms": "Sekundär väg, sekundärväg, länsväg, huvudväg"

             },
             "highway/secondary_link": {
             },
             "highway/secondary_link": {

-                "name": "Anslutning, sekundär väg"
+                "name": "Anslutning, sekundär väg",
+                "terms": "Anslutning, påfart, avfart, huvudväg, länsväg, sekundär väg, sekundärväg"

             },
             "highway/service": {
             },
             "highway/service": {

-                "name": "Serviceväg"
+                "name": "Serviceväg",
+                "terms": "Uppfart, industriväg, bakgård, parkeringsväg, campinggata, "

             },
             "highway/service/alley": {
             },
             "highway/service/alley": {

-                "name": "Gränd"
+                "name": "Gränd",
+                "terms": "gränd, sidogata, bigata, bakgata"

             },
             "highway/service/drive-through": {
             },
             "highway/service/drive-through": {

-                "name": "Drive-through"
+                "name": "Drive-through",
+                "terms": "Drive-through, Genomkörning, hämtmat, McDrive"

             },
             "highway/service/driveway": {
             },
             "highway/service/driveway": {

-                "name": "Uppfart"
+                "name": "Uppfart",
+                "terms": "Uppfart, privat väg, garageinfart, villaväg, infart"

             },
             "highway/service/emergency_access": {
             },
             "highway/service/emergency_access": {

-                "name": "Utryckningsfordon"
+                "name": "Utryckningsfordon",
+                "terms": "Utryckningsfordon, Räddningsväg, brandväg"

             },
             "highway/service/parking_aisle": {
             },
             "highway/service/parking_aisle": {

-                "name": "Parkeringsväg"
+                "name": "Parkeringsväg",
+                "terms": "Parkeringsväg, parkeringsplats, parkeringsgata"

             },
             "highway/services": {
             },
             "highway/services": {

-                "name": "Rastplats med försäljning"
+                "name": "Rastplats med försäljning",
+                "terms": "Rastplats, restaurang, bensinstation, vägmat, snabbmat"

             },
             "highway/steps": {
                 "name": "Trappa",
             },
             "highway/steps": {
                 "name": "Trappa",

-                "terms": "Trappa, trapp, rulltrappa"
+                "terms": "Trappa, trapp, rulltrappa, trappsteg"

             },
             "highway/stop": {
             },
             "highway/stop": {

-                "name": "Stoppskylt"
+                "name": "Stoppskylt",
+                "terms": "Stoppskylt, stopp, lämna företräde"
+            },
+            "highway/street_lamp": {
+                "name": "Gatlampa ",
+                "terms": "Gatlampa, Gatubelysning, lampa, belysning, lyktstolpe"

             },
             "highway/tertiary": {
             },
             "highway/tertiary": {

-                "name": "Tertiär väg"
+                "name": "Tertiär väg",
+                "terms": "Tertiär väg, allmän väg, sekundära länsväg, länsväg, huvudgata"

             },
             "highway/tertiary_link": {
             },
             "highway/tertiary_link": {

-                "name": "Anslutning, tertiär väg"
+                "name": "Anslutning, tertiär väg",
+                "terms": "Anslutning, påfart, avfart, länsväg, huvudgata, tertiär väg"

             },
             "highway/track": {
             },
             "highway/track": {

-                "name": "Bruksväg"
+                "name": "Bruksväg",
+                "terms": "Bruksväg, traktorväg, skogsväg, åkerväg, virkesväg, timmerväg, traktor, skogsmaskin, åker, timmer, jordbruk"

             },
             "highway/traffic_signals": {
                 "name": "Trafiksignaler",
                 "terms": "Trafikljus, trafiksignal, stoppljus, signalljus"
             },
             "highway/trunk": {
             },
             "highway/traffic_signals": {
                 "name": "Trafiksignaler",
                 "terms": "Trafikljus, trafiksignal, stoppljus, signalljus"
             },
             "highway/trunk": {

-                "name": "Huvudväg"
+                "name": "Huvudväg",
+                "terms": "Huvudväg, Europaväg, riksväg, motortrafikled"

             },
             "highway/trunk_link": {
             },
             "highway/trunk_link": {

-                "name": "Anslutning, huvudväg"
+                "name": "Anslutning, huvudväg",
+                "terms": "Anslutning, påfart, avfart, huvudväg, Europaväg"

             },
             "highway/turning_circle": {
             },
             "highway/turning_circle": {

-                "name": "Vändplan"
+                "name": "Vändplats",
+                "terms": "Vändplan, vändplats, återvändsgata"

             },
             "highway/unclassified": {
             },
             "highway/unclassified": {

-                "name": "Oklassificerad väg"
+                "name": "Oklassificerad väg",
+                "terms": "Oklassificerad väg, mindre väg, liten väg, enskild väg, skogsväg, övrig väg, industriväg, industrigata"

             },
             "historic": {
             },
             "historic": {

-                "name": "Historisk plats"
+                "name": "Historisk plats",
+                "terms": "Historisk plats, historia, arv, historik"

             },
             "historic/archaeological_site": {
             },
             "historic/archaeological_site": {

-                "name": "Arkeologisk plats"
+                "name": "Arkeologisk plats",
+                "terms": "Arkeologisk plats, arkeologi, utgrävning, historisk plats, historia, ruin"

             },
             "historic/boundary_stone": {
             },
             "historic/boundary_stone": {

-                "name": "Gränssten"
+                "name": "Gränssten",
+                "terms": "Gränssten, milsten, Gränsmärke, råmärke, gränsröse"

             },
             "historic/castle": {
             },
             "historic/castle": {

-                "name": "Slott"
+                "name": "Slott",
+                "terms": "Slott, borg, palats, resident, herrsäte, fästning"

             },
             "historic/memorial": {
             },
             "historic/memorial": {

-                "name": "Monument"
+                "name": "Minnesmärke",
+                "terms": "Minnesmärke, minnessten, minnestavla, monument"

             },
             "historic/monument": {
             },
             "historic/monument": {

-                "name": "Monument"
+                "name": "Monument",
+                "terms": "monument, Minnesmärke, monument"

             },
             "historic/ruins": {
             },
             "historic/ruins": {

-                "name": "Ruiner"
+                "name": "Ruiner",
+                "terms": "Ruin, lämning, rest, husras, förfallen byggnad, ödehus"

             },
             "historic/wayside_cross": {
             },
             "historic/wayside_cross": {

-                "name": "Vägkors"
+                "name": "Kors vid väg",
+                "terms": "Vägkors, kors vid väg, krucifix, pilgim"

             },
             "historic/wayside_shrine": {
             },
             "historic/wayside_shrine": {

-                "name": "Helgedom längs väg"
+                "name": "Helgedom vid väg",
+                "terms": "Helgedom längs väg, helgedom vid väg, helgedom, pilgrim"

             },
             "landuse": {
             },
             "landuse": {

-                "name": "Markanvändning"
+                "name": "Markanvändning",
+                "terms": "Markanvändning, Översiktsplan"

             },
             "landuse/allotments": {
             },
             "landuse/allotments": {

-                "name": "Kolonilotter"
+                "name": "Kolonilotter",
+                "terms": "Kolonilott, lott, täppa, koloniträdgård, odlingslott, "

             },
             "landuse/basin": {
             },
             "landuse/basin": {

-                "name": "Avrinningsområde"
+                "name": "Avrinningsområde",
+                "terms": "avrinning, avrinningsområde, bassäng, infiltration, infiltrering, dagvatten, dagvattenbassäng"

             },
             "landuse/cemetery": {
             },
             "landuse/cemetery": {

-                "name": "Kyrkogård"
+                "name": "Gravfällt",
+                "terms": "Kyrkogård, begravningsplats, gravfält, griftegård, grav"
+            },
+            "landuse/churchyard": {
+                "name": "Kyrkogård (utan gravar)",
+                "terms": "Kyrkogård, kyrka, kyrkområde"

             },
             "landuse/commercial": {
             },
             "landuse/commercial": {

-                "name": "Kommersiell"
+                "name": "Kommersiell",
+                "terms": "Kommersiell, kommersiellt, affärsområde, handelsområde, shoppingområde"

             },
             "landuse/construction": {
             },
             "landuse/construction": {

-                "name": "Konstruktion"
+                "name": "Byggarbetsplats",
+                "terms": "Byggarbetsplats, bygge, Byggnad under konstruktion, Byggnad under uppförande, byggarbete,  byggnation, byggnadsplats"

             },
             "landuse/farm": {
             },
             "landuse/farm": {

-                "name": "Åker"
+                "name": "Åker",
+                "terms": "Åker, åkerjord, åkerfält, fält, gärde, teg, åkerlapp, inäga, odling, odlingsfält, lantbruk"
+            },
+            "landuse/farmland": {
+                "name": "Åker",
+                "terms": "Åker, åkerjord, åkerfält, fält, gärde, teg, åkerlapp, inäga, odling, odlingsfält, lantbruk"

             },
             "landuse/farmyard": {
             },
             "landuse/farmyard": {

-                "name": "Bondgård"
+                "name": "Bondgård",
+                "terms": "Bondgård, gård, jordbruk, lantbruk, lantegendom, lantgård"

             },
             "landuse/forest": {
             },
             "landuse/forest": {

-                "name": "Skog"
+                "name": "Skog (brukad)",
+                "terms": "Skog, skogsvård, skogsområde, skogstrakt, träd, skogsdunge, dunge, lund, skogsplantering"

             },
             "landuse/grass": {
             },
             "landuse/grass": {

-                "name": "Gräs"
+                "name": "Gräs",
+                "terms": "Gräs, klippt gräs, refug, rondell, mittremsa"

             },
             "landuse/industrial": {
             },
             "landuse/industrial": {

-                "name": "Industriell"
+                "name": "Industriell",
+                "terms": "Industriell, industriområde, fabriksområde, fabrik"
+            },
+            "landuse/landfill": {
+                "name": "Soptipp",
+                "terms": "Soptipp, återvinningscentral, avskrädeshög, avfallsanläggning, tipp"

             },
             "landuse/meadow": {
             },
             "landuse/meadow": {

-                "name": "Äng"
+                "name": "Äng",
+                "terms": "Äng, slåttermark"
+            },
+            "landuse/military": {
+                "name": "Militärt",
+                "terms": "Militärt, militärt område, regemente, övningsområde, försvar, krigsmakt"

             },
             "landuse/orchard": {
             },
             "landuse/orchard": {

-                "name": "Fruktträdgård"
+                "name": "Fruktodling",
+                "terms": "Fruktodling, fruktträdgård, fruktträd, äppelträd"

             },
             "landuse/quarry": {
             },
             "landuse/quarry": {

-                "name": "Täkt"
+                "name": "Stenbrott/Sandtag",
+                "terms": "täkt, gruva, utgrävning, stenbrott, sand, stenbrytning, sten, sandtäckt, sandtag"

             },
             "landuse/residential": {
             },
             "landuse/residential": {

-                "name": "Bostadsområde"
+                "name": "Bostadsområde",
+                "terms": "Bostadsområde, villaområde, lägenhetsområde, getto, miljonområde, förort"

             },
             "landuse/retail": {
             },
             "landuse/retail": {

-                "name": "Detaljhandel"
+                "name": "Detaljhandel",
+                "terms": "Detaljhandel, affärsområde, försäljningsområde, affärer, försäljning, shoppingcenter, shoppingområde, shopping, handel, handelsområde"

             },
             "landuse/vineyard": {
             },
             "landuse/vineyard": {

-                "name": "Vingård"
+                "name": "Vingård",
+                "terms": "Vingård, château, vin, vinodling, vinframställning, vinfält, vineri, druvor, vindruvor"

             },
             "leisure": {
             },
             "leisure": {

-                "name": "Nöje"
+                "name": "Fritid",
+                "terms": "Nöje, fritid, ledighet, förströelse, tidsfördriv"
+            },
+            "leisure/common": {
+                "name": "Allmänning",
+                "terms": "Allmänning, allmän mark, fritt tillträde"

             },
             "leisure/dog_park": {
             },
             "leisure/dog_park": {

-                "name": "Hundpark"
+                "name": "Hundpark",
+                "terms": "Hundpark, hundrastgård, hund, rastgård, hundgård, kennel"
+            },
+            "leisure/firepit": {
+                "name": "Eldstad",
+                "terms": "Eldstad, eldgrop, lägerplats, lägereld, brasa, grill, grillplats, grillning, eldning"

             },
             "leisure/garden": {
             },
             "leisure/garden": {

-                "name": "Trädgård"
+                "name": "Trädgård",
+                "terms": "Trädgård, park, plantering, örtgård, odlingslott, botanisk trädgård, botanisk, botanik, zoologisk trädgård"

             },
             "leisure/golf_course": {
             },
             "leisure/golf_course": {

-                "name": "Golfbana"
+                "name": "Golfbana",
+                "terms": "Golfbana, golf, golfanläggning, golfcenter"
+            },
+            "leisure/ice_rink": {
+                "name": "Skridskobana ",
+                "terms": "Skridskobana, ishall, ishockey, ishockeybana, isrink, konstisbana, isbana, skridsko, skridskohall, ishockeyhall"

             },
             "leisure/marina": {
             },
             "leisure/marina": {

-                "name": "Marina"
+                "name": "Marina",
+                "terms": "Marina, småbårtshamn, hamn, småbåt, segelbåt, yacht, fritidsbåt, gästhamn"

             },
             "leisure/park": {
                 "name": "Park",
                 "terms": "rekreationsområde, friluftsområde, trädgård, plantering, grönområde, lund, stadsoas, oas "
             },
             "leisure/picnic_table": {
             },
             "leisure/park": {
                 "name": "Park",
                 "terms": "rekreationsområde, friluftsområde, trädgård, plantering, grönområde, lund, stadsoas, oas "
             },
             "leisure/picnic_table": {

-                "name": "Picknickbord"
+                "name": "Picknickbord",
+                "terms": "Picknickbord, bord, Picknick, matbord, utflyktsbord, utebord"

             },
             "leisure/pitch": {
             },
             "leisure/pitch": {

-                "name": "Idrottsplats"
+                "name": "Idrottsplats",
+                "terms": "Idrottsplats,  idrottsplan, plan,  idrottsanläggning, arena, stadion, sportplats"

             },
             "leisure/pitch/american_football": {
             },
             "leisure/pitch/american_football": {

-                "name": "Amerikansk fotbollsplan"
+                "name": "Plan för amerikansk fotboll",
+                "terms": "Amerikansk fotboll, Amerikansk fotbollsplan, football"

             },
             "leisure/pitch/baseball": {
             },
             "leisure/pitch/baseball": {

-                "name": "Baseball-plan"
+                "name": "Baseballplan",
+                "terms": "Baseball, baseballplan, baseball-plan"

             },
             "leisure/pitch/basketball": {
             },
             "leisure/pitch/basketball": {

-                "name": "Basketplan"
+                "name": "Basketplan",
+                "terms": "Basketplan, basket, korgboll"
+            },
+            "leisure/pitch/skateboard": {
+                "name": "Skateboardpark",
+                "terms": "Skateboardpark, Skate Park, skateboard, skateboardramp, halfpipe "

             },
             "leisure/pitch/soccer": {
             },
             "leisure/pitch/soccer": {

-                "name": "Fotbollsplan"
+                "name": "Fotbollsplan",
+                "terms": "Fotboll, fotbollsplan"

             },
             "leisure/pitch/tennis": {
             },
             "leisure/pitch/tennis": {

-                "name": "Tennisplan"
+                "name": "Tennisbana",
+                "terms": "Tennisbana, tennisplan, tennis"

             },
             "leisure/pitch/volleyball": {
             },
             "leisure/pitch/volleyball": {

-                "name": "Volleybollplan"
+                "name": "Volleybollplan",
+                "terms": "Volleybollplan, volleyboll, beachvolleyboll"

             },
             "leisure/playground": {
             },
             "leisure/playground": {

-                "name": "Lekplats"
+                "name": "Lekplats",
+                "terms": "Lekplats, lekområde, lekpark"

             },
             "leisure/slipway": {
             },
             "leisure/slipway": {

-                "name": "Sjösättningsplats"
+                "name": "Stapelbädd",
+                "terms": "Stapelbädd, Sjösättningsplats, staplar, varv, docka, fartygsdocka, torrdocka, båtramp"
+            },
+            "leisure/sports_center": {
+                "name": "Sportcenter / Gym",
+                "terms": "Sportcenter, gym,  sportanläggning, idrottshall, träning"

             },
             "leisure/stadium": {
             },
             "leisure/stadium": {

-                "name": "Stadium"
+                "name": "Stadium",
+                "terms": "Stadium, arena"

             },
             "leisure/swimming_pool": {
             },
             "leisure/swimming_pool": {

-                "name": "Simbassäng"
+                "name": "Simbassäng",
+                "terms": "Simbassäng, bassäng, swimmingpool, pool, simning, simma"
+            },
+            "leisure/track": {
+                "name": "Tävlingsbana",
+                "terms": "Tävlingsbana, kapplöpningsbana, springbana, springning, cykling, travbana, galoppbana, hundkapplöpning, hästkapplöpning"

             },
             "line": {
             },
             "line": {

-                "name": "Linje"
+                "name": "Linje",
+                "terms": "Linje, streck, sträcka, utsträckning"

             },
             "man_made": {
             },
             "man_made": {

-                "name": "Människoskapad"
+                "name": "Människoskapad",
+                "terms": "Människoskapat, konstgjort, onaturlig, syntetisk, artificiell"

             },
             "man_made/breakwater": {
             },
             "man_made/breakwater": {

-                "name": "Vågbrytare"
+                "name": "Vågbrytare",
+                "terms": "Vågbrytare, pir, hamnarm, vågskydd, fördämning, hamnpir"

             },
             "man_made/cutline": {
             },
             "man_made/cutline": {

-                "name": "Snittlinje"
+                "name": "Snittlinje i skog",
+                "terms": "Snittlinje, skiljelinje, rågång, gränslinje, gräns, brandgata, skogssektion, skidspår, pipeline, rörgata, pipelinegata, jaktgata,  skogsområde, domän"
+            },
+            "man_made/embankment": {
+                "name": "Vägbank",
+                "terms": "Upphöjning, barnvall, vall, bank, Vägbank"
+            },
+            "man_made/flagpole": {
+                "name": "Flaggstolpe",
+                "terms": "Flaggstång, flagga"

             },
             "man_made/lighthouse": {
             },
             "man_made/lighthouse": {

-                "name": "Fyr"
+                "name": "Fyr",
+                "terms": "Fyr, fyrtorn, fyrskepp"
+            },
+            "man_made/observation": {
+                "name": "Utkikstorn",
+                "terms": "Utkikstorn, utsiktstorn, observationstorn, utsiktspost, observationspost"

             },
             "man_made/pier": {
             },
             "man_made/pier": {

-                "name": "Pir"
+                "name": "Pir",
+                "terms": "Pir , vågbrytare, hamnarm, hamnpir, kaj"

             },
             "man_made/pipeline": {
             },
             "man_made/pipeline": {

-                "name": "Pipeline"
+                "name": "Pipeline",
+                "terms": "Pipeline, rörledning, ledning, oljeledning, avloppsledning, vattenledning"

             },
             "man_made/survey_point": {
             },
             "man_made/survey_point": {

-                "name": "Trianguleringspunkt"
+                "name": "Trianguleringspunkt",
+                "terms": "Trianguleringspunkt, triangulering, kartritning, fixpunkt"

             },
             "man_made/tower": {
             },
             "man_made/tower": {

-                "name": "Torn"
+                "name": "Torn",
+                "terms": "torn, radiotorn"

             },
             "man_made/wastewater_plant": {
             },
             "man_made/wastewater_plant": {

-                "name": "Avloppsreningsverk"
+                "name": "Avloppsreningsverk",
+                "terms": "Avloppsreningsverk, reningsverk, avloppsverk"

             },
             "man_made/water_tower": {
             },
             "man_made/water_tower": {

-                "name": "Vattentorn"
+                "name": "Vattentorn",
+                "terms": "Vattentorn, vattenreservoar, vatten"

             },
             "man_made/water_well": {
             },
             "man_made/water_well": {

-                "name": "Brunn"
+                "name": "Brunn",
+                "terms": "Brunn, vattenbrunn, vattenhål, källa, grundvatten"

             },
             "man_made/water_works": {
             },
             "man_made/water_works": {

-                "name": "Vattenverk"
+                "name": "Vattenverk",
+                "terms": "Vattenverk, vattenreningsanläggning, vattenreningsverk,\nvattenanläggning, vatten"
+            },
+            "military/airfield": {
+                "name": "Flygfält",
+                "terms": "Flygfält, flygplats, landningsbana, startbana, flyg, hangar"
+            },
+            "military/barracks": {
+                "name": "Baracker",
+                "terms": "Baracker, barack, militärbarack, inkvartering, förläggning, kersern "
+            },
+            "military/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker, skyddsrum, stridsvärn, värn"
+            },
+            "military/range": {
+                "name": "Militärt övningsområde",
+                "terms": "Militärt övningsområde, övningsområde, skjutbana"

             },
             "natural": {
             },
             "natural": {

-                "name": "Naturlig"
+                "name": "Naturlig",
+                "terms": "Naturligt, naturlig, natur, skyddsområde, naturanvändning, geologi"

             },
             "natural/bay": {
             },
             "natural/bay": {

-                "name": "Vik"
+                "name": "Vik",
+                "terms": "Vik, bukt"

             },
             "natural/beach": {
             },
             "natural/beach": {

-                "name": "Strand"
+                "name": "Strand",
+                "terms": "Strand, sandstrand, badstrand, grusstrand,  badplats, strandlinje, badställe, flodstrand"

             },
             "natural/cliff": {
             },
             "natural/cliff": {

-                "name": "Klippa"
+                "name": "Klippa",
+                "terms": "klippa, brant, klippavsats, stup, bergskam, terrass, platå"

             },
             "natural/coastline": {
                 "name": "Kustlinje",
                 "terms": "kustlinje, kustremsa, kust, hav, ö, strand"
             },
             },
             "natural/coastline": {
                 "name": "Kustlinje",
                 "terms": "kustlinje, kustremsa, kust, hav, ö, strand"
             },

+            "natural/fell": {
+                "name": "Fjäll",
+                "terms": "Fjäll, trädgräns, högfjäll, fjällanskap"
+            },

             "natural/glacier": {
                 "name": "Glassiär"
             },
             "natural/glacier": {
                 "name": "Glassiär"
             },

diff --git a/vendor/assets/iD/iD/locales/uk.json b/vendor/assets/iD/iD/locales/uk.json
index 78d0a11ba9079e6e60618db6c9cfa2e6e0837774..306086a4ad870675a03ca5ef3baa55565489cbe9 100644 (file)
--- a/vendor/assets/iD/iD/locales/uk.json
+++ b/vendor/assets/iD/iD/locales/uk.json
@@ -518,6 +518,9 @@
                     "both": "Вхід/Вихід"
                 }
             },
                     "both": "Вхід/Вихід"
                 }
             },

+            "aerialway/bubble": {
+                "label": "Захисний екран"
+            },

             "aerialway/capacity": {
                 "label": "Пропускна здатність (на годину)",
                 "placeholder": "500, 2500, 5000..."
             "aerialway/capacity": {
                 "label": "Пропускна здатність (на годину)",
                 "placeholder": "500, 2500, 5000..."


@@ -771,6 +774,12 @@
                 "label": "Обмеження швидкості",
                 "placeholder": "40, 50, 60…"
             },
                 "label": "Обмеження швидкості",
                 "placeholder": "40, 50, 60…"
             },

+            "mtb/scale": {
+                "placeholder": "0, 1, 2, 3..."
+            },
+            "mtb/scale/uphill": {
+                "placeholder": "0, 1, 2, 3..."
+            },

             "name": {
                 "label": "Назва",
                 "placeholder": "Власна назва (якщо є)"
             "name": {
                 "label": "Назва",
                 "placeholder": "Власна назва (якщо є)"


@@ -1261,6 +1270,10 @@
             "amenity/shelter": {
                 "name": "Притулок"
             },
             "amenity/shelter": {
                 "name": "Притулок"
             },

+            "amenity/social_facility": {
+                "name": "Соціальний центр",
+                "terms": "Social facility, cjwsfkmybq wtynh"
+            },

             "amenity/social_facility/homeless_shelter": {
                 "name": "Притулок для бездомних",
                 "terms": "Homeless shelter, ghbnekjr lkz tpljvyb"
             "amenity/social_facility/homeless_shelter": {
                 "name": "Притулок для бездомних",
                 "terms": "Homeless shelter, ghbnekjr lkz tpljvyb"


@@ -1375,7 +1388,7 @@
             },
             "barrier/wall": {
                 "name": "Стіна",
             },
             "barrier/wall": {
                 "name": "Стіна",

-                "terms": "Wall,cnsyf"
+                "terms": "wall, cnsyf"

             },
             "boundary/administrative": {
                 "name": "Адміністративний кордон",
             },
             "boundary/administrative": {
                 "name": "Адміністративний кордон",


@@ -1480,9 +1493,21 @@
             "craft/blacksmith": {
                 "name": "Коваль"
             },
             "craft/blacksmith": {
                 "name": "Коваль"
             },

+            "craft/boatbuilder": {
+                "name": "Корабельня",
+                "terms": "Boat builder, rjhffkmyz"
+            },

             "craft/electrician": {
                 "name": "Електрик"
             },
             "craft/electrician": {
                 "name": "Електрик"
             },

+            "craft/hvac": {
+                "name": "Опалення, вентиляція та кондиціювання повітря",
+                "terms": "HVAC, jgfktyyz, dbynbkzwsz, rjylbwsdfyyz gjdsnhz"
+            },
+            "craft/optician": {
+                "name": "Окуліст",
+                "terms": "Optician, jrekscn"
+            },

             "craft/photographer": {
                 "name": "Фотограф"
             },
             "craft/photographer": {
                 "name": "Фотограф"
             },

diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json
index d56863270f4cc1fbb3cf74b7ba8ba1341a89e4ba..f0d78a563998abc0c87db5527b015c5e17e1b05d 100644 (file)
--- a/vendor/assets/iD/iD/locales/vi.json
+++ b/vendor/assets/iD/iD/locales/vi.json
@@ -514,7 +514,12 @@
                 "label": "Kiểu"
             },
             "aerialway/access": {
                 "label": "Kiểu"
             },
             "aerialway/access": {

-                "label": "Quyền Truy cập"
+                "label": "Quyền Truy cập",
+                "options": {
+                    "entry": "Vào",
+                    "exit": "Ra",
+                    "both": "Ra vào"
+                }

             },
             "aerialway/bubble": {
                 "label": "Mái vòm"
             },
             "aerialway/bubble": {
                 "label": "Mái vòm"


@@ -535,7 +540,12 @@
                 "placeholder": "2, 4, 8…"
             },
             "aerialway/summer/access": {
                 "placeholder": "2, 4, 8…"
             },
             "aerialway/summer/access": {

-                "label": "Quyền Truy cập (Mùa hè)"
+                "label": "Quyền Truy cập (Mùa hè)",
+                "options": {
+                    "entry": "Vào",
+                    "exit": "Ra",
+                    "both": "Ra vào"
+                }

             },
             "aeroway": {
                 "label": "Loại"
             },
             "aeroway": {
                 "label": "Loại"


@@ -575,7 +585,25 @@
                 "placeholder": "50, 100, 200…"
             },
             "cardinal_direction": {
                 "placeholder": "50, 100, 200…"
             },
             "cardinal_direction": {

-                "label": "Chiều"
+                "label": "Chiều",
+                "options": {
+                    "N": "Bắc",
+                    "E": "Đông",
+                    "S": "Nam",
+                    "W": "Tây",
+                    "NE": "Đông Bắc",
+                    "SE": "Đông Nam",
+                    "SW": "Tây Nam",
+                    "NW": "Tây Bắc",
+                    "NNE": "Bắc Đông Bắc",
+                    "ENE": "Đông Đông Bắc",
+                    "ESE": "Đông Đông Nam",
+                    "SSE": "Nam Đông Nam",
+                    "SSW": "Nam Tây Nam",
+                    "WSW": "Tây Tây Nam",
+                    "WNW": "Tây Tây Bắc",
+                    "NNW": "Bắc Tây Bắc"
+                }

             },
             "clock_direction": {
                 "label": "Chiều",
             },
             "clock_direction": {
                 "label": "Chiều",


@@ -615,7 +643,14 @@
                 "label": "Miêu tả"
             },
             "electrified": {
                 "label": "Miêu tả"
             },
             "electrified": {

-                "label": "Điện khí hóa"
+                "label": "Điện khí hóa",
+                "placeholder": "Dây điện Bên trên, Đường ray Điện…",
+                "options": {
+                    "contact_line": "Dây điện Bên trên",
+                    "rail": "Đường ray Điện",
+                    "yes": "Có (không xác định)",
+                    "no": "Không có"
+                }

             },
             "elevation": {
                 "label": "Cao độ"
             },
             "elevation": {
                 "label": "Cao độ"


@@ -637,7 +672,13 @@
                 "label": "Phí"
             },
             "fire_hydrant/type": {
                 "label": "Phí"
             },
             "fire_hydrant/type": {

-                "label": "Kiểu"
+                "label": "Kiểu",
+                "options": {
+                    "pillar": "Cột",
+                    "underground": "Dưới đất",
+                    "wall": "Tường",
+                    "pond": "Ao"
+                }

             },
             "fixme": {
                 "label": "Cần Sửa chữa"
             },
             "fixme": {
                 "label": "Cần Sửa chữa"


@@ -760,6 +801,42 @@
                 "label": "Tốc độ Tối đa",
                 "placeholder": "40, 50, 60…"
             },
                 "label": "Tốc độ Tối đa",
                 "placeholder": "40, 50, 60…"
             },

+            "mtb/scale": {
+                "label": "Độ hiểm trở Đạp xe Leo núi",
+                "placeholder": "0, 1, 2, 3…",
+                "options": {
+                    "0": "0: Sỏi/đất chắc, không có trở ngại, uốn từ từ",
+                    "1": "1: Mặt có một tí phần không chặt, trở ngại nhỏ, uốn từ từ",
+                    "2": "2: Mặt có nhiều phần không chặt, trở ngại lớn, chữ chi dễ dàng",
+                    "3": "3. Mặt trơn, trở ngại lớn, chữ chi đột ngột",
+                    "4": "4. Mặt không chặt hoặc hòn đá, chữ chi nguy hiểm",
+                    "5": "5. Cực hiểm trở, sân đầy hòn đá, lở đất",
+                    "6": "6. Không thể đạp xe trừ những người lão luyện nhất"
+                }
+            },
+            "mtb/scale/imba": {
+                "label": "Độ hiểm trở Đường mòn IMBA",
+                "placeholder": "Dễ, Trung bình, Khó…",
+                "options": {
+                    "0": "Dễ nhất (hình tròn màu trắng)",
+                    "1": "Dễ (hình tròn màu xanh lục)",
+                    "2": "Trung bình (hình vuông màu xanh lam)",
+                    "3": "Khó (hình thoi màu đen)",
+                    "4": "Cực Khó (2 hình thoi màu đen)"
+                }
+            },
+            "mtb/scale/uphill": {
+                "label": "Độ hiểm trở Đạp xe Leo lên núi",
+                "placeholder": "0, 1, 2, 3…",
+                "options": {
+                    "0": "0: Độ dốc trung bình <10%, sỏi/đất chắc, không có trở ngại",
+                    "1": "1: Độ dốc trung bình <15%, sỏi/đất chắc, vài thứ nhỏ",
+                    "2": "2: Độ dốc trung bình <20%, mặt vững, đá/rễ bằng cỡ tay",
+                    "3": "3: Độ dốc trung bình <25%, mặt thay đổi, đá/rễ bằng cỡ tay",
+                    "4": "4: Độ dốc trung bình <30%, phẩm chất kém, đá/rễ lớn",
+                    "5": "5: Rất dốc, thường phải đẩy hoặc vác xe đạp"
+                }
+            },

             "name": {
                 "label": "Tên",
                 "placeholder": "Tên phổ biến (nếu có)"
             "name": {
                 "label": "Tên",
                 "placeholder": "Tên phổ biến (nếu có)"


@@ -779,7 +856,7 @@
             "oneway": {
                 "label": "Một chiều",
                 "options": {
             "oneway": {
                 "label": "Một chiều",
                 "options": {

-                    "undefined": "Có lẽ Phải",
+                    "undefined": "Có lẽ Không phải",

                     "yes": "Phải",
                     "no": "Không phải"
                 }
                     "yes": "Phải",
                     "no": "Không phải"
                 }


@@ -787,7 +864,7 @@
             "oneway_yes": {
                 "label": "Một chiều",
                 "options": {
             "oneway_yes": {
                 "label": "Một chiều",
                 "options": {

-                    "undefined": "Có lẽ Không phải",
+                    "undefined": "Có lẽ Phải",

                     "yes": "Phải",
                     "no": "Không phải"
                 }
                     "yes": "Phải",
                     "no": "Không phải"
                 }


@@ -806,20 +883,58 @@
                 "label": "Trung chuyển"
             },
             "parking": {
                 "label": "Trung chuyển"
             },
             "parking": {

-                "label": "Kiểu"
+                "label": "Kiểu",
+                "options": {
+                    "surface": "Ngoài trời",
+                    "multi-storey": "Cao tầng",
+                    "underground": "Ngầm",
+                    "sheds": "Lán",
+                    "carports": "Nhà xe",
+                    "garage_boxes": "Ga ra",
+                    "lane": "Làn đường"
+                }

             },
             "phone": {
                 "label": "Số Điện thoại",
                 "placeholder": "+84 1 234 5678"
             },
             "piste/difficulty": {
             },
             "phone": {
                 "label": "Số Điện thoại",
                 "placeholder": "+84 1 234 5678"
             },
             "piste/difficulty": {

-                "label": "Độ Hiểm trở"
+                "label": "Độ Hiểm trở",
+                "placeholder": "Dễ, Trung bình, Nâng cao…",
+                "options": {
+                    "novice": "Tập",
+                    "easy": "Dễ (Mỹ: tròn lục; Âu: xanh lục; Nhật: lục)",
+                    "intermediate": "Trung bình (Mỹ: vuông lam; Âu: đỏ; Nhật: đỏ)",
+                    "advanced": "Nâng cao (Mỹ: thoi đen; Âu: đen; Nhật: đen)",
+                    "expert": "Lão luyện (Mỹ: 2 thoi đen; Âu: cam)",
+                    "freeride": "Tự do (xa đường; Âu: vàng)",
+                    "extreme": "Cực độ (cần thiết bị leo núi)"
+                }

             },
             "piste/grooming": {
             },
             "piste/grooming": {

-                "label": "Kiểu Ủi Tuyết"
+                "label": "Kiểu Ủi Tuyết",
+                "options": {
+                    "classic": "Cổ điển",
+                    "mogul": "Mogul",
+                    "backcountry": "Hẻo lánh",
+                    "classic+skating": "Cổ điển và Trượt băng",
+                    "scooter": "Xe máy Trượt tuyết",
+                    "skating": "Trượt băng"
+                }

             },
             "piste/type": {
             },
             "piste/type": {

-                "label": "Kiểu"
+                "label": "Kiểu",
+                "options": {
+                    "downhill": "Xuống dốc",
+                    "nordic": "Trượt tuyết Bắc Âu",
+                    "skitour": "Skitour",
+                    "sled": "Xe Trượt tuyết",
+                    "hike": "Đi bộ đường dài",
+                    "sleigh": "Xe trượt tuyết",
+                    "ice_skate": "Trượt băng",
+                    "snow_park": "Vườn Tuyết",
+                    "playground": "Vui chơi"
+                }

             },
             "place": {
                 "label": "Kiểu"
             },
             "place": {
                 "label": "Kiểu"


@@ -866,6 +981,18 @@
             "route_master": {
                 "label": "Kiểu"
             },
             "route_master": {
                 "label": "Kiểu"
             },

+            "sac_scale": {
+                "label": "Độ hiểm trở Đi bộ Đường dài",
+                "placeholder": "Đi bộ Đường dài Núi, Đi bộ Đường dài Anpơ…",
+                "options": {
+                    "hiking": "T1: Đi bộ Đường dài",
+                    "mountain_hiking": "T2: Đi bộ Đường dài Núi",
+                    "demanding_mountain_hiking": "T3: Đi bộ Đường dài Núi Rán sức",
+                    "alpine_hiking": "T4: Đi bộ Đường dài Anpơ",
+                    "demanding_alpine_hiking": "T5: Đi bộ Đường dài Anpơ Rán sức",
+                    "difficult_alpine_hiking": "T6: Đi bộ Đường dài Anpơ Khó"
+                }
+            },

             "seasonal": {
                 "label": "Tùy Mùa"
             },
             "seasonal": {
                 "label": "Tùy Mùa"
             },


@@ -885,7 +1012,30 @@
                 "label": "Lề đường Dốc"
             },
             "smoking": {
                 "label": "Lề đường Dốc"
             },
             "smoking": {

-                "label": "Hút thuốc"
+                "label": "Hút thuốc",
+                "placeholder": "Cấm, Nơi dành riêng, Cho phép…",
+                "options": {
+                    "no": "Hoàn toàn cấm hút thuốc",
+                    "separated": "Ở nơi hút thuốc không có tường",
+                    "isolated": "Ở nơi hút thuốc có tường",
+                    "outside": "Cho phép ở ngoài trời",
+                    "yes": "Cho phép ở bất cứ nơi nào",
+                    "dedicated": "Dành riêng cho người hút thuốc (ví dụ quán hút thuốc)"
+                }
+            },
+            "smoothness": {
+                "label": "Độ nhẵn",
+                "placeholder": "Bánh xe Trượt, Bánh xe, Xa đường…",
+                "options": {
+                    "excellent": "Bánh xe Trượt: Giày patanh, ván trượt",
+                    "good": "Bánh xe Mỏng: Xe đạp đua",
+                    "intermediate": "Bánh xe: Xe đạp lai, xe lăn, vét pa",
+                    "bad": "Bánh xe Bền: Xe hơi, xích lô, xe đạp dã ngoại",
+                    "very_bad": "Gầm Cao: Xe xa đường nhẹ",
+                    "horrible": "Xa đường: Xe xa đường nặng",
+                    "very_horrible": "Xa đường Chuyên dụng: Máy kéo, ATV",
+                    "impassible": "Không thể qua được bằng bánh xe"
+                }

             },
             "social_facility_for": {
                 "label": "Dân được phục vụ",
             },
             "social_facility_for": {
                 "label": "Dân được phục vụ",


@@ -924,7 +1074,13 @@
                 "label": "Gạch dành cho Người Khiếm thị"
             },
             "toilets/disposal": {
                 "label": "Gạch dành cho Người Khiếm thị"
             },
             "toilets/disposal": {

-                "label": "Phương pháp thải"
+                "label": "Phương pháp thải",
+                "options": {
+                    "flush": "Bấm",
+                    "pitlatrine": "Mương",
+                    "chemical": "Hóa chất",
+                    "bucket": "Thùng"
+                }

             },
             "tourism": {
                 "label": "Loại"
             },
             "tourism": {
                 "label": "Loại"


@@ -932,8 +1088,28 @@
             "towertype": {
                 "label": "Kiểu Tháp"
             },
             "towertype": {
                 "label": "Kiểu Tháp"
             },

+            "tracktype": {
+                "label": "Loại Đường mòn",
+                "placeholder": "Rất chắc, Khá Chắc, Mềm…",
+                "options": {
+                    "grade1": "Rất Chắc: Mặt lát hoặc bằng cốt liệu chắc",
+                    "grade2": "Khá Chắc: Sỏi đá pha một tí nguyên liệu mềm",
+                    "grade3": "Pha trộn đều các nguyên liệu cứng mềm",
+                    "grade4": "Khá Mềm: Đất/cát/cỏ pha một tí nguyên liệu cứng",
+                    "grade5": "Rất Mềm: Đất/cát/cỏ"
+                }
+            },

             "trail_visibility": {
             "trail_visibility": {

-                "label": "Tầm nhìn trên Đường mòn"
+                "label": "Tầm nhìn trên Đường mòn",
+                "placeholder": "Tốt, Khá, Trung bình…",
+                "options": {
+                    "excellent": "Tốt: Lối đi rõ ràng hoặc có cắm bảng từng quãng một",
+                    "good": "Khá: Có bảng thấy được nhưng đôi khi cần phải mò mẫm",
+                    "intermediate": "Trung bình: Ít bảng, lối đi thấy được phần lớn",
+                    "bad": "Kém: Không có cắm bảng, đôi khi không thấy được lối đi hoặc không có lối đi",
+                    "horrible": "Tồi: Nhiều khi không có lối đi, cần biết dò đường một chút",
+                    "no": "Không có lối đi, rất cần biết dò đường"
+                }

             },
             "tree_type": {
                 "label": "Loại"
             },
             "tree_type": {
                 "label": "Loại"


@@ -1094,6 +1270,10 @@
                 "name": "Cho thuê Tàu",
                 "terms": "dịch vụ cho thuê tàu, chỗ thuê tàu, tiệm thuê tàu, thuê tàu, dịch vụ cho mướn tàu, chỗ mướn tàu, tiệm mướn tàu, mướn tàu, dịch vụ cho thuê thuyền, chỗ thuê thuyền, tiệm thuê thuyền, thuê thuyền, dịch vụ cho mướn thuyền, chỗ mướn thuyền, tiệm mướn thuyền, mướn thuyền, dich vu cho thue tau, cho thue tau, tiem thue tau, thue tau, dich vu cho muon tau, cho muon tau, tiem muon tau, muon tau, dich vu cho thue thuyen, cho thue thuyen, tiem thue thuyen, thue thuyen, dich vu cho muon thuyen, cho muon thuyen, tiem muon thuyen, muon thuyen"
             },
                 "name": "Cho thuê Tàu",
                 "terms": "dịch vụ cho thuê tàu, chỗ thuê tàu, tiệm thuê tàu, thuê tàu, dịch vụ cho mướn tàu, chỗ mướn tàu, tiệm mướn tàu, mướn tàu, dịch vụ cho thuê thuyền, chỗ thuê thuyền, tiệm thuê thuyền, thuê thuyền, dịch vụ cho mướn thuyền, chỗ mướn thuyền, tiệm mướn thuyền, mướn thuyền, dich vu cho thue tau, cho thue tau, tiem thue tau, thue tau, dich vu cho muon tau, cho muon tau, tiem muon tau, muon tau, dich vu cho thue thuyen, cho thue thuyen, tiem thue thuyen, thue thuyen, dich vu cho muon thuyen, cho muon thuyen, tiem muon thuyen, muon thuyen"
             },

+            "amenity/bus_station": {
+                "name": "Ga Xe buýt",
+                "terms": "ga xe buýt, nhà ga xe buýt, nhà ga buýt, ga buýt, ga xe buyt, nha ga xe buyt, nha ga buyt, ga buyt"
+            },

             "amenity/cafe": {
                 "name": "Quán Cà phê",
                 "terms": "cà phê, quán cà phê, trà, quán trà, ca phe, quan ca phe, tra, quan tra"
             "amenity/cafe": {
                 "name": "Quán Cà phê",
                 "terms": "cà phê, quán cà phê, trà, quán trà, ca phe, quan ca phe, tra, quan tra"

diff --git a/vendor/assets/iD/iD/locales/zh-TW.json b/vendor/assets/iD/iD/locales/zh-TW.json
index 6b53c3ab5a4f41d37513f7edc8e72cd3b7226626..1d8a64aa54f3e20ffe621649b376873fea3eb01e 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-TW.json
+++ b/vendor/assets/iD/iD/locales/zh-TW.json
@@ -221,15 +221,15 @@
     "status": {
         "error": "未能連接至伺服器介面。",
         "offline": "伺服器介面離線，請稍後再嘗試編輯。",
     "status": {
         "error": "未能連接至伺服器介面。",
         "offline": "伺服器介面離線，請稍後再嘗試編輯。",

-        "readonly": "伺服器介面處於唯讀模式，須待介面正常運作，方能保存您的編輯。"
+        "readonly": "伺服器介面處於唯讀模式，須待介面正常運作，方能儲存您的編輯。"

     },
     "commit": {
     },
     "commit": {

-        "title": "保存修改",
+        "title": "儲存修改",

         "description_placeholder": "簡要描述你的貢獻",
         "message_label": "有關此編輯的訊息",
         "description_placeholder": "簡要描述你的貢獻",
         "message_label": "有關此編輯的訊息",

-        "upload_explanation": "你的修改將會在所有使用OpenStreetMap數據的地圖上看得見。",
-        "upload_explanation_with_user": "你以 {user} 具名的修改將會在所有使用OpenStreetMap數據的地圖上看得見。",
-        "save": "保存",
+        "upload_explanation": "你的修改將會在所有使用OpenStreetMap資料的地圖上看到。",
+        "upload_explanation_with_user": "你以 {user} 具名的修改將會在所有使用OpenStreetMap資料的地圖上看到。",
+        "save": "儲存",

         "cancel": "取消",
         "warnings": "警告",
         "modified": "已修改",
         "cancel": "取消",
         "warnings": "警告",
         "modified": "已修改",


@@ -266,7 +266,7 @@
         "search": "搜尋",
         "multiselect": "已選擇的物件",
         "unknown": "未知種類",
         "search": "搜尋",
         "multiselect": "已選擇的物件",
         "unknown": "未知種類",

-        "incomplete": "<未有下載>",
+        "incomplete": "<未下載>",

         "feature_list": "搜尋物件",
         "edit": "編輯特徵",
         "none": "無",
         "feature_list": "搜尋物件",
         "edit": "編輯特徵",
         "none": "無",


@@ -287,18 +287,18 @@
         "reset": "重設"
     },
     "restore": {
         "reset": "重設"
     },
     "restore": {

-        "heading": "您有未保存的編輯",
-        "description": "您在上一次編輯時仍有未保存的修改，你想恢復這些修改嗎﹖",
+        "heading": "您有未儲存的編輯",
+        "description": "您在上一次編輯時仍有未儲存的修改，你想恢復這些修改嗎﹖",

         "restore": "恢復",
         "reset": "重設"
     },
     "save": {
         "restore": "恢復",
         "reset": "重設"
     },
     "save": {

-        "title": "保存",
-        "help": "保存修改至OpenStreetMap，讓其他用戶看見。",
-        "no_changes": "沒有修改需要保存。",
-        "error": "保存編輯時發生錯誤",
+        "title": "儲存",
+        "help": "儲存修改至OpenStreetMap，讓其他用戶看見。",
+        "no_changes": "沒有修改需要儲存。",
+        "error": "儲存編輯時發生錯誤",

         "uploading": "正在上載修改至OpenStreetMap。",
         "uploading": "正在上載修改至OpenStreetMap。",

-        "unsaved_changes": "你有未保存的編輯"
+        "unsaved_changes": "你有未儲存的編輯"

     },
     "success": {
         "edited_osm": "已編輯了OSM！",
     },
     "success": {
         "edited_osm": "已編輯了OSM！",


@@ -314,13 +314,13 @@
     },
     "splash": {
         "welcome": "歡迎使用iD OpenStreetMap編輯器",
     },
     "splash": {
         "welcome": "歡迎使用iD OpenStreetMap編輯器",

-        "text": "iD編輯器是一個既易用而又功能強大的工具，以助您編輯世界上最好的自由世界地圖。這是版本{version}。欲知詳情，請瀏覽 {website} 及於{github}報告程序錯誤。",
-        "walkthrough": "開始簡介",
+        "text": "iD編輯器是一個既易用而又功能強大的工具，以助您編輯世界上最好的自由世界地圖。這是版本{version}。欲知詳情，請瀏覽 {website} 及於{github}報告臭蟲。",
+        "walkthrough": "開始新手教學",

         "start": "現在就開始編輯"
     },
     "source_switch": {
         "live": "實況模式",
         "start": "現在就開始編輯"
     },
     "source_switch": {
         "live": "實況模式",

-        "lose_changes": "您有尚未保存的編輯，切換地圖伺服器會失去這些編輯。您是否確定要切換伺服器？",
+        "lose_changes": "您有尚未儲存的編輯，切換地圖伺服器會失去這些編輯。您是否確定要切換伺服器？",

         "dev": "開發模式"
     },
     "tag_reference": {
         "dev": "開發模式"
     },
     "tag_reference": {


@@ -345,69 +345,69 @@
     },
     "cannot_zoom": "在此模式下不能再縮小。",
     "gpx": {
     },
     "cannot_zoom": "在此模式下不能再縮小。",
     "gpx": {

-        "local_layer": "本機GPX檔案",
+        "local_layer": "本機 GPX 檔案",

         "drag_drop": "拖移一個 .gpx 檔案到頁面上，或是點擊右方的按鈕以瀏覽",
         "zoom": "放大至 GPX 軌跡",
         "drag_drop": "拖移一個 .gpx 檔案到頁面上，或是點擊右方的按鈕以瀏覽",
         "zoom": "放大至 GPX 軌跡",

-        "browse": "開啟一個 .gpx 檔案"
+        "browse": "開啟 .gpx 檔案"

     },
     "help": {
     },
     "help": {

-        "title": "幫助",
-        "help": "# 幫助\n\n這是一個[OpenStreetMap](http://www.openstreetmap.org/)的編輯器。\nOpenStreetMap是自由及可編輯的世界地圖。您可以用這個編輯器來添加和更新您所在區域的地圖資料，令這個開源和開放資料的世界地圖變得更好。\n\n您在這個地圖上所做的編輯，所有使用OpenStreetMap的人將可看見。為了進行編輯，您需要一個[免費的OpenStreetMap帳戶](https://www.openstreetmap.org/user/new)。\n\n這個[iD編輯器](http://ideditor.com/) 是一個合作開發的開源系統， [源碼可在GitHub找到](https://github.com/openstreetmap/iD)。\n",
-        "editing_saving": "# 編輯和保存\n\n這個編輯器的設計，主要是為在網上進行編輯工作，而你現正通過一個網站使用它。\n\n### 選擇物件\n\n要選擇地圖上一個物件，如道路或興趣點，可於地圖上點擊該物件。這將令所選取的物件以高亮顯示，並開啟一個載有其細節的面板，以及顯示一個您可對該物件進行的操作的功能菜單。\n\n要選擇多個物件，可以按住'Shift'鍵，在地圖上點擊並拖曳。這將選擇所顯示的方框內的所有物件，讓您可同時對幾個物件進行操作。\n\n### 保存編輯\n\n當您對地圖作出修改，如編輯道路，建築物和場所，這些修改都只是儲存在本機上而未被上載，直到您將它們保存到伺服器為止。如果您期間作出錯誤的修改，亦不用擔心，您可以點擊“撤消”按鈕修改，亦可點擊“重做”按鈕，重做經撤消的修改。\n\n點擊“保存”按鈕以完成一組編輯 － 例如，如果您已經完成了某市鎮的一個區域，而想開始一個新的區域。您將有機會覆核你做了什麼編輯，而如果看起來您作出了一些不適當的改變，編輯器會提供有用的建議及警告。\n\n如果一切看起來不錯，您可以輸入簡短的註釋，解釋您作出的修改，並再點擊“保存”以向[OpenStreetMap.org](http://www.openstreetmap.org/)發布這些修改。這些修改將可被其他OpenStreetMap用戶看見，並可供其他用戶在其上作進一步修訂及完善。\n\n如果您不能一次就完成您的編輯，您可以離開編輯器視窗，日後(在相同的瀏覽器和電腦上)回來，編輯器將讓你選擇是否希望恢復上一次未完成的編輯。\n",
-        "roads": "# é\81\93è·¯\n\næ\82¨å\8f¯ä»¥å\88©ç\94¨é\80\99å\80\8b編輯å\99¨å\89µå»ºï¼\8c修復ï¼\8cå\8f\8aå\88ªé\99¤é\81\93è·¯ã\80\82é\81\93è·¯å\8f¯ä»¥æ\9c\89å¾\88å¤\9a種ï¼\9aè·¯å¾\91ï¼\8cå\85¬è·¯ï¼\8cé\83\8aé\81\8aå¾\91ï¼\8cå\96®è»\8aå¾\91ï¼\8cå\92\8cæ\9b´å¤\9a ï¼\8d ä»»ä½\95ç¶\93常使ç\94¨ç\9a\84路段é\83½å\8f¯è£½å\9c\96ã\80\82\n\n### é\81¸æ\93\87é\81\93è·¯\n\né»\9eæ\93\8aå\9c\96ä¸\8aç\9a\84é\81\93路以é\81¸æ\93\87該é\81\93è·¯ã\80\82é\81\93è·¯ç\9a\84輪å»\93æ\9c\83以é«\98亮度顯示ï¼\8cè\80\8cå\90\8cæ\99\82å\9c°å\9c\96ä¸\8aæ\9c\83å\87ºç\8f¾å°\8få·¥å\85·é\81¸å\96®ï¼\8cæ\97\81é\82\8a亦æ\9c\83å½\88å\87ºé\9d¢æ\9d¿ï¼\8c顯示æ\9c\89é\97\9c該é\81\93è·¯ç\9a\84è³\87è¨\8aã\80\82\n\n### ä¿®è¨\82é\81\93è·¯\n\næ\82¨æ\88\96æ\9c\83ç¶\93常注æ\84\8få\88°ï¼\8cé\81\93路並é\9d\9eå°\8dé½\8aå\9c¨è\83\8cæ\99¯ä¸­é¡¯ç¤ºç\9a\84è¡\9bæ\98\9få\9c\96å\83\8fæ\88\96GPSè»\8cè·¡ã\80\82æ\82¨å\8f¯ä»¥èª¿æ\95´é\80\99äº\9bé\81\93è·¯ï¼\8cè®\93ä»\96å\80\91ä½\8dæ\96¼æ­£ç¢ºç\9a\84ä½\8dç½®ã\80\82\n\né¦\96å\85\88ï¼\8cé»\9eæ\93\8aæ\82¨æ\83³ä¿®è¨\82ç\9a\84é\81\93è·¯ã\80\82é\80\99æ\9c\83å°\87é\81\93路以é«\98亮度顯示ï¼\8c並顯示沿è\91\97é\80\99é\81\93è·¯ç\9a\84ç¯\80é»\9eï¼\8cä½ å\8f¯ä»¥æ\8b\96æ\9b³é\80\99äº\9bç¯\80é»\9eå\88°æ\9b´å¥½ç\9a\84ä½\8dç½®ã\80\82å¦\82æ\9e\9cæ\82¨æ\83³å¢\9eå\8a ç´°ç¯\80ï¼\8cå\8f¯ä»¥ç\82ºé\81\93路添å\8a æ\96°ç\9a\84ç¯\80é»\9eï¼\8cé»\9eæ\93\8aå\85©ä¸\8bé\81\93è·¯ä¸\8aæ²\92æ\9c\89ç¯\80é»\9eç\9a\84é\83¨å\88\86ï¼\8c便å\8f¯å\9c¨è©²è\99\95å¢\97å\8a ç¯\80é»\9eã\80\82\n\nå¦\82æ\9e\9cé\81\93è·¯é\80£æ\8e¥å\88°å\8f¦ä¸\80æ¢\9dé\81\93è·¯ï¼\8cä½\86å\9c¨å\9c°å\9c\96ä¸\8a並æ\9cªå¦¥å\96\84é\80£æ\8e¥ï¼\8cä½ å\8f¯ä»¥æ\8b\96æ\9b³é\81\93è·¯ç\9a\84å\85¶ä¸­ä¸\80å\80\8bç¯\80é»\9eå\88°å\8f¦ä¸\80æ¢\9dé\81\93è·¯ä¸\8aï¼\8c以é\80£æ\8e¥å\85©æ¢\9dé\81\93è·¯ã\80\82é\80£æ\8e¥å¥½é\81\93è·¯ï¼\8cå°\8då\9c°å\9c\96é\9d\9e常é\87\8dè¦\81ï¼\8cç\89¹å\88¥æ\98¯å°\8dæ\8f\90ä¾\9bé§\95é§\9bæ\8c\87示ç\9a\84æ\87\89ç\94¨ç¨\8båº\8fè\80\8cè¨\80ï¼\8cæ\98¯å¿\85è¦\81ç\9a\84ã\80\82\n\næ\82¨ä¹\9få\8f¯ä»¥é»\9eæ\93\8a'移å\8b\95'å·¥å\85·æ\88\96æ\8c\89`M`å¿«é\80\9fé\8dµï¼\8cä¾\86移å\8b\95æ\95´æ¢\9dé\81\93è·¯ï¼\8cç\84¶å¾\8cé»\9eæ\93\8aä¸\80ä¸\8b以å®\8cæ\88\90移å\8b\95ç\9a\84å\8b\95ä½\9cã\80\82\n\n### å\88ªé\99¤é\81\93è·¯\n\nå¦\82æ\9e\9cä¸\80æ¢\9dé\81\93è·¯å®\8cå\85¨ä¸\8d正確 ï¼\8d æ\82¨ç\9c\8bå\88°å®\83å\9c¨è¡\9bæ\98\9få\9c\96å\83\8fä¸\8aä¸\8då­\98å\9c¨ï¼\8c並æ\9c\80好實å\9c°è­\89實å®\83æ ¹æ\9c¬ä¸\8då­\98å\9c¨ ï¼\8d æ\82¨å\8f¯ä»¥å°\87é\81\93è·¯å\88ªé\99¤ï¼\8cé\80\99æ\9c\83å¾\9eå\9c°å\9c\96中å°\87ä¹\8b移é\99¤ã\80\82å\88ªé\99¤ç\89©ä»¶æ\99\82å\8b\99å¿\85è¦\81å°\8få¿\83 ï¼\8d å\83\8fä»»ä½\95å\85¶ä»\96ç\9a\84編輯ï¼\8cçµ\90æ\9e\9cæ\9c\83被大家ç\9c\8bè¦\8bï¼\8cè\80\8cè¡\9bæ\98\9få\9c\96å\83\8få¾\80å¾\80æ\9c\83é\81\8eæ\99\82ï¼\8cå\9b 此該é\81\93è·¯æ\88\96許å\8fªæ\98¯æ\96°å»ºç\9a\84ã\80\82\n\nè¦\81å\88ªé\99¤é\81\93è·¯ï¼\8cæ\82¨å\8f¯ä»¥é»\9eæ\93\8aå®\83以é\81¸æ\93\87ï¼\8cç\84¶å¾\8cé»\9eæ\93\8aå\9e\83å\9c¾æ¡¶å\9c\96æ¨\99ï¼\8cæ\88\96æ\8c\89 â\80\99Deleteâ\80\99 é\8dµã\80\82\n\n### 繪製æ\96°é\81\93è·¯\n\nç\99¼ç\8f¾æ\9f\90è\99\95æ\87\89æ\9c\89ä¸\80æ¢\9dé\81\93è·¯ï¼\8cä½\86å\9c°å\9c\96ä¸\8aæ²\92æ\9c\89ï¼\9fé»\9eæ\93\8a編輯å\99¨å·¦ä¸\8aæ\96¹ç\9a\84'ç·\9a'å\9c\96æ¨\99ï¼\8cæ\88\96æ\8c\89ä¸\8b`2`å¿«é\80\9fé\8dµï¼\8c以é\96\8bå§\8b繪製ç·\9a段ã\80\82\n\nå\9c¨å\9c°å\9c\96ä¸\8aé»\9eæ\93\8aé\81\93è·¯ç\9a\84é\96\8b端ï¼\8c以é\96\8bå§\8b繪製é\81\93è·¯ã\80\82å¦\82æ\9e\9cé\81\93è·¯å¾\9eä¸\80æ¢\9dç\8f¾æ\9c\89ç\9a\84é\81\93è·¯å\88\86æ\94¯å\87ºä¾\86ï¼\8cæ\87\89é»\9eæ\93\8aå\85©è\80\85é\80£æ\8e¥ç\9a\84å\9c°æ\96¹ï¼\8c以é\96\8bå§\8b繪製ã\80\82\n\nç\84¶å¾\8cé»\9eæ\93\8a沿è\91\97é\81\93è·¯ç\9a\84é»\9eï¼\8cä»¥æ ¹æ\93\9aè¡\9bæ\98\9få½±å\83\8fæ\88\96GPSè»\8cè·¡ï¼\8c正確å\9c°ç¹ªè£½é\81\93è·¯ã\80\82å¦\82æ\9e\9cæ\82¨ç¹ªè£½ç\9a\84é\81\93è·¯å¦\82æ\9e\9cè\88\87å\8f¦ä¸\80æ¢\9dé\81\93路交å\8c¯ï¼\8cè«\8bé»\9eæ\93\8aç\9b¸äº¤é»\9e以å°\87å®\83å\80\91é\80£æ\8e¥èµ·ä¾\86ã\80\82ç\95¶æ\82¨å®\8cæ\88\90繪製å¾\8cï¼\8cå\8f¯é»\9eæ\93\8aå\85©ä¸\8b或按鍵盤上的 'Return' 或 ’Enter’ 鍵。\n",
+        "title": "說明文件",
+        "help": "# 幫助\n\n這是[開放街圖](http://www.openstreetmap.org/)的編輯器。\n開放街圖是自由及可編輯的世界地圖。您可以用這個編輯器來添加和更新您所在區域的地圖資料，令這個開源和開放資料的世界地圖變得更好。\n\n您在地圖上所做的編輯，將會讓所有使用開放街圖的人看到。為了進行編輯，您需要一個[免費的開放街圖帳戶](https://www.openstreetmap.org/user/new)。\n\n[iD編輯器](http://ideditor.com/) 是採用開源方式合作開發的專案， [原始碼可在GitHub找到](https://github.com/openstreetmap/iD)。\n",
+        "editing_saving": "# 編輯和儲存\n\n這個編輯器主要為線上編輯而設計，而你現在透過網站使用它。\n\n### 選擇物件\n\n要選擇地圖上一個物件，如道路或興趣點，可於地圖上按該物件。這將令所選取的物件以高亮顯示，並開啟詳情的側邊欄，以及顯示可進行操作的功能選單。\n\n要選擇多個物件，可以按住'Shift'鍵，在地圖上按下並拖曳。這將選擇所顯示的方框內的所有物件，讓您可同時操作多個物件。\n\n### 儲存編輯\n\n當您修改地圖，如編輯道路，建築物和場所，這些修改都會先儲存在本機上而未被上傳，直到您將它們上傳到伺服器為止。如果您在這段時間做出錯誤的修改，也不用擔心，您可以按下“撤消”按鈕修改，亦可按下“重做”按鈕，重做經撤消的修改。\n\n按下“儲存”按鈕以完成編輯 － 例如，如果您已經完成了某市鎮的一個區域，而想開始一個新區域。您將有機會覆核你做了什麼編輯，而如果看起來您作出了一些不適當的改變，編輯器將會提供有用的建議及警告。\n\n如果一切看起來不錯，您可以輸入簡短的註釋，解釋您作出的修改，並再按下“儲存”以向[OpenStreetMap.org](http://www.openstreetmap.org/)發布這些修改。這些修改將可被其他OpenStreetMap用戶看見，並可供其他用戶在其上作進一步修訂及完善。\n\n如果您不能一次就完成您的編輯，您可以離開編輯器視窗，日後(在相同的瀏覽器和電腦上)回來，編輯器將讓你選擇是否希望恢復上一次未完成的編輯。\n",
+        "roads": "# é\81\93è·¯\n\næ\82¨å\8f¯ä»¥å\88©ç\94¨é\80\99å\80\8b編輯å\99¨å\89µå»ºï¼\8c修復ï¼\8cå\8f\8aå\88ªé\99¤é\81\93è·¯ã\80\82é\81\93è·¯å\8f¯ä»¥æ\9c\89å¾\88å¤\9a種ï¼\9aè¡\8c人路å¾\91ï¼\8cå\85¬è·¯ï¼\8cæ­¥é\81\93ï¼\8cå\96®è»\8aè·¯ç·\9aç­\89ç­\89 ï¼\8d ä»»ä½\95ç¶\93常使ç\94¨ç\9a\84路段é\83½å\8f¯è£½å\9c\96ã\80\82\n\n### é\81¸æ\93\87é\81\93è·¯\n\næ\8c\89å\9c\96ä¸\8aç\9a\84é\81\93路以é\81¸æ\93\87該é\81\93è·¯ã\80\82é\81\93è·¯ç\9a\84輪å»\93æ\9c\83以é«\98亮度顯示ï¼\8cè\80\8cå\90\8cæ\99\82å\9c°å\9c\96ä¸\8aæ\9c\83å\87ºç\8f¾å°\8få·¥å\85·é\81¸å\96®ï¼\8cæ\97\81é\82\8a亦æ\9c\83å½\88å\87ºé\9d¢æ\9d¿ï¼\8c顯示æ\9c\89é\97\9c該é\81\93è·¯ç\9a\84è³\87è¨\8aã\80\82\n\n### ä¿®æ\94¹é\81\93è·¯\n\næ\82¨æ\88\96æ\9c\83ç¶\93常注æ\84\8få\88°ï¼\8cé\81\93路並é\9d\9eå°\8dé½\8aå\9c¨è\83\8cæ\99¯ä¸­é¡¯ç¤ºç\9a\84è¡\9bæ\98\9få\9c\96å\83\8fæ\88\96GPSè»\8cè·¡ã\80\82æ\82¨å\8f¯ä»¥èª¿æ\95´é\80\99äº\9bé\81\93è·¯ï¼\8cè®\93ä»\96å\80\91ä½\8dæ\96¼æ­£ç¢ºç\9a\84ä½\8dç½®ã\80\82\n\né¦\96å\85\88ï¼\8cæ\8c\89æ\82¨æ\83³ä¿®è¨\82ç\9a\84é\81\93è·¯ã\80\82é\80\99æ\9c\83å°\87é\81\93路以é«\98亮度顯示ï¼\8c並顯示沿è\91\97é\80\99é\81\93è·¯ç\9a\84ç¯\80é»\9eï¼\8cä½ å\8f¯ä»¥æ\8b\96æ\9b³é\80\99äº\9bç¯\80é»\9eå\88°æ\9b´å¥½ç\9a\84ä½\8dç½®ã\80\82å¦\82æ\9e\9cæ\82¨æ\83³å¢\9eå\8a ç´°ç¯\80ï¼\8cå\8f¯ä»¥ç\82ºé\81\93路添å\8a æ\96°ç\9a\84ç¯\80é»\9eï¼\8cé»\9eæ\93\8aå\85©ä¸\8bé\81\93è·¯ä¸\8aæ²\92æ\9c\89ç¯\80é»\9eç\9a\84é\83¨å\88\86ï¼\8c便å\8f¯å\9c¨è©²è\99\95å¢\97å\8a ç¯\80é»\9eã\80\82\n\nå¦\82æ\9e\9cé\81\93è·¯é\80£æ\8e¥å\88°å\8f¦ä¸\80æ¢\9dé\81\93è·¯ï¼\8cä½\86å\9c¨å\9c°å\9c\96ä¸\8a並æ\9cªå¦¥å\96\84é\80£æ\8e¥ï¼\8cä½ å\8f¯ä»¥æ\8b\96æ\9b³é\81\93è·¯ç\9a\84å\85¶ä¸­ä¸\80å\80\8bç¯\80é»\9eå\88°å\8f¦ä¸\80æ¢\9dé\81\93è·¯ä¸\8aï¼\8c以é\80£æ\8e¥å\85©æ¢\9dé\81\93è·¯ã\80\82é\80£æ\8e¥å¥½é\81\93è·¯ï¼\8cå°\8då\9c°å\9c\96é\9d\9e常é\87\8dè¦\81ï¼\8cç\89¹å\88¥æ\98¯å°\8dæ\8f\90ä¾\9bé§\95é§\9bæ\8c\87示ç\9a\84æ\87\89ç\94¨ç¨\8båº\8fè\80\8cè¨\80ï¼\8cæ\98¯å¿\85è¦\81ç\9a\84ã\80\82\n\næ\82¨ä¹\9få\8f¯ä»¥æ\8c\89ä¸\8b'移å\8b\95'å·¥å\85·æ\88\96æ\8c\89`M`å¿«é\80\9fé\8dµï¼\8cä¾\86移å\8b\95æ\95´æ¢\9dé\81\93è·¯ï¼\8cç\84¶å¾\8cæ\8c\89ä¸\80ä¸\8b以å®\8cæ\88\90移å\8b\95ç\9a\84å\8b\95ä½\9cã\80\82\n\n### å\88ªé\99¤é\81\93è·¯\n\nå¦\82æ\9e\9cä¸\80æ¢\9dé\81\93è·¯å®\8cå\85¨ä¸\8d正確 ï¼\8d æ\82¨ç\9c\8bå\88°å®\83å\9c¨è¡\9bæ\98\9få\9c\96å\83\8fä¸\8aä¸\8då­\98å\9c¨ï¼\8c並æ\9c\80好實å\9c°è­\89實å®\83æ ¹æ\9c¬ä¸\8då­\98å\9c¨ ï¼\8d æ\82¨å\8f¯ä»¥å°\87é\81\93è·¯å\88ªé\99¤ï¼\8cé\80\99æ\9c\83å¾\9eå\9c°å\9c\96中å°\87ä¹\8b移é\99¤ã\80\82å\88ªé\99¤ç\89©ä»¶æ\99\82å\8b\99å¿\85è¦\81å°\8få¿\83 ï¼\8d å\83\8fä»»ä½\95å\85¶ä»\96ç\9a\84編輯ï¼\8cçµ\90æ\9e\9cæ\9c\83被大家ç\9c\8bè¦\8bï¼\8cè\80\8cè¡\9bæ\98\9få\9c\96å\83\8få¾\80å¾\80æ\9c\83é\81\8eæ\99\82ï¼\8cå\9b 此該é\81\93è·¯æ\88\96許å\8fªæ\98¯æ\96°å»ºç\9a\84ã\80\82\n\nè¦\81å\88ªé\99¤é\81\93è·¯ï¼\8cæ\82¨å\8f¯ä»¥æ\8c\89ä½\8få®\83以é\81¸æ\93\87ï¼\8cç\84¶å¾\8cæ\8c\89ä¸\8bå\9e\83å\9c¾æ¡¶å\9c\96æ¨\99ï¼\8cæ\88\96æ\8c\89 â\80\99Deleteâ\80\99 é\8dµã\80\82\n\n### 繪製æ\96°é\81\93è·¯\n\nç\99¼ç\8f¾æ\9f\90è\99\95æ\87\89æ\9c\89ä¸\80æ¢\9dé\81\93è·¯ï¼\8cä½\86å\9c°å\9c\96ä¸\8aæ²\92æ\9c\89ï¼\9fæ\8c\89編輯å\99¨å·¦ä¸\8aæ\96¹ç\9a\84'ç·\9a'æ\8c\89é\88\95ï¼\8cæ\88\96æ\8c\89ä¸\8b`2`å¿«é\80\9fé\8dµï¼\8c以é\96\8bå§\8b繪製ç·\9a段ã\80\82\n\nå\9c¨å\9c°å\9c\96ä¸\8aé»\9eæ\93\8aé\81\93è·¯ç\9a\84é\96\8b端ï¼\8c以é\96\8bå§\8b繪製é\81\93è·¯ã\80\82å¦\82æ\9e\9cé\81\93è·¯å¾\9eä¸\80æ¢\9dç\8f¾æ\9c\89ç\9a\84é\81\93è·¯å\88\86æ\94¯å\87ºä¾\86ï¼\8cæ\87\89é»\9eæ\93\8aå\85©è\80\85é\80£æ\8e¥ç\9a\84å\9c°æ\96¹ï¼\8c以é\96\8bå§\8b繪製ã\80\82\n\nç\84¶å¾\8cæ\8c\89ä½\8f沿è\91\97é\81\93è·¯ç\9a\84é»\9eï¼\8cä»¥æ ¹æ\93\9aè¡\9bæ\98\9få½±å\83\8fæ\88\96GPSè»\8cè·¡ï¼\8c正確å\9c°ç¹ªè£½é\81\93è·¯ã\80\82å¦\82æ\9e\9cæ\82¨ç¹ªè£½ç\9a\84é\81\93è·¯å¦\82æ\9e\9cè\88\87å\8f¦ä¸\80æ¢\9dé\81\93路交å\8c¯ï¼\8cè«\8bé»\9eæ\93\8aç\9b¸äº¤é»\9e以å°\87å®\83å\80\91é\80£æ\8e¥èµ·ä¾\86ã\80\82ç\95¶æ\82¨å®\8cæ\88\90繪製å¾\8cï¼\8cå\8f¯æ\8c\89å\85©ä¸\8bæ»\91é¼ 或按鍵盤上的 'Return' 或 ’Enter’ 鍵。\n",

         "gps": "# GPS軌跡\n\nGPS數據是OpenStreetMap中最可信的的數據來源。此編輯器\n支援在您的電腦上的GPS軌跡 - `.gpx`文件。你可以使用多個智能手機的應用程序或個人GPS硬件，收集這類GPS數據。\n\n有關如何進行GPS測量的資料，請參閱[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/)。\n\n要使用一個GPX軌跡製圖，可將GPX文件拖曳到編輯器中。如果編輯器能讀取該文件，它會被添加到地圖上，並以明亮的綠色線顯示。點擊左側的'設置背景'選單，便可啟用、停用或縮放這個新的的GPX圖層。\n\nGPX軌跡並不會直接上載到OpenStreetMap － 使用GPX軌跡的最佳方式，是以它作為指引，在繪製地圖時添加新的物件，並[上傳至 OpenStreetMap](http://www.openstreetmap.org/trace/create)來讓其他使用者運用。\n",
         "imagery": "# 圖像\n\n空照圖是繪製地圖重要的資料來源。在畫面右方的'背景圖像設定'選單中，可選擇使用的圖像，\n他們分別為空照圖、衛星影像和其他可自由編輯的圖像資源。\n\n編輯器預設使用[Bing Maps](http://www.bing.com/maps/)的衛星圖層，\n但當您平移或縮放地圖至一個新的地理區域，或可使用新的資源。\n在一些國家，像美國、法國和丹麥，部分區域有非常高品質的圖像。\n\n圖像會與地圖數據有所偏移。如果你看見很多的道路與背景有偏移，請不要立刻將它們全部搬移以與背景刎合。相反，你可以在「背景設定」選單中，點擊下方的「校準底圖」，以調整圖像以配合現有地圖數據。 \n\n圖像有時候或會因為圖像提供者方面的誤差，與地圖資料有所偏移。\n如果您看到有很多路與背景是平移錯位的，請不要立刻將它們全部搬移以與背景刎合。\n您只需要點擊圖像設定介面底部的'校準'來調整圖像，讓它符合現有資料。\n",
         "gps": "# GPS軌跡\n\nGPS數據是OpenStreetMap中最可信的的數據來源。此編輯器\n支援在您的電腦上的GPS軌跡 - `.gpx`文件。你可以使用多個智能手機的應用程序或個人GPS硬件，收集這類GPS數據。\n\n有關如何進行GPS測量的資料，請參閱[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/)。\n\n要使用一個GPX軌跡製圖，可將GPX文件拖曳到編輯器中。如果編輯器能讀取該文件，它會被添加到地圖上，並以明亮的綠色線顯示。點擊左側的'設置背景'選單，便可啟用、停用或縮放這個新的的GPX圖層。\n\nGPX軌跡並不會直接上載到OpenStreetMap － 使用GPX軌跡的最佳方式，是以它作為指引，在繪製地圖時添加新的物件，並[上傳至 OpenStreetMap](http://www.openstreetmap.org/trace/create)來讓其他使用者運用。\n",
         "imagery": "# 圖像\n\n空照圖是繪製地圖重要的資料來源。在畫面右方的'背景圖像設定'選單中，可選擇使用的圖像，\n他們分別為空照圖、衛星影像和其他可自由編輯的圖像資源。\n\n編輯器預設使用[Bing Maps](http://www.bing.com/maps/)的衛星圖層，\n但當您平移或縮放地圖至一個新的地理區域，或可使用新的資源。\n在一些國家，像美國、法國和丹麥，部分區域有非常高品質的圖像。\n\n圖像會與地圖數據有所偏移。如果你看見很多的道路與背景有偏移，請不要立刻將它們全部搬移以與背景刎合。相反，你可以在「背景設定」選單中，點擊下方的「校準底圖」，以調整圖像以配合現有地圖數據。 \n\n圖像有時候或會因為圖像提供者方面的誤差，與地圖資料有所偏移。\n如果您看到有很多路與背景是平移錯位的，請不要立刻將它們全部搬移以與背景刎合。\n您只需要點擊圖像設定介面底部的'校準'來調整圖像，讓它符合現有資料。\n",

-        "addresses": "# 地址 \n\n地址是地圖中最有用的訊息之一。 \n\n雖然地址通常被視為街道的一部分，在 OpenStreetMap 中，它們是沿相關街道的建築物和地方的屬性。 \n\n您可以將地址訊息，添加到以建築物輪廓為代表、或以點為代表的地方之上。地址資料的最佳來源，是實地調查或個人知識 － 與任何其他物件一樣，抄襲商業來源（如谷歌地圖）的資料，是嚴格禁止的。\n",
-        "inspector": "# 使用檢視面板\n\n檢視面板是畫面右面的用戶界面元素，當您選擇一個物件時便會出現，讓您可編輯物件的詳細資料。\n\n### 選擇物件類型\n\n在您添加一個點、線段或區域後，您可以選擇物件的類型，例如該物件應是高速公路還是住宅區道路，是超級市場還是咖啡廳。檢視面板將顯示常用物件類型的按鈕，要找出其他物件類型，您可以在搜尋框中輸入您所要的物件類型。\n\n點擊物件類型按鈕右下角的'i'字，可顯示物件類型的更多資訊。點擊按鈕以選擇該類型。\n\n### 使用表格和編輯標籤\n\n在您選擇物件類型後，或選擇已經被編配類型的物件時，檢查面板會顯示該物件詳細資料的欄位，\n如名稱和地址。\n\n在欄位下方，您可以點擊圖標，以添加其他詳細資料，如[維基百科](http://www.wikipedia.org/)的條目資料，輪椅可否到達，以及其他更多資料。\n\n在面板的底部，點擊'增加標籤'以添加其他任意的標籤到該物件。您可透過[Taginfo](http://taginfo.openstreetmap.org/)，了解有關常用的標籤組合的更多資料。\n\n您在檢查面板所做的更改，會自動應用到地圖上。您可以隨時點擊'撤消'按鈕，撤消這些更改。\n\n### 關閉檢查面板\n\n您可以點擊檢查面板右上角的關閉按鈕、按’Escape'鍵，或在地圖上點擊，以關閉檢查面板。\n",
-        "buildings": "# 建築物\n\nOpenStreetMap 是世界上最大的建築物的數據庫。您可以建立\n和改善這個數據庫。\n\n### 選擇建築物\n\n您可以點擊建築物的邊界，以選擇該建築物。該建築物將以高亮度顯示，並會開啟小工具選單，和在右邊顯示有關建築物更多資料的面板。\n\n### 修改建築物\n\n有時候，建築物的位置或其標籤或許會不正確。\n\n要移動整個建築物的位置，先選擇該建築物，然後點擊’移動’工具。移動您的滑鼠以移動築物，在移到正確位置上點擊一下。\n\n要更正建築物的形狀，點擊並拖曳建築物輪廓的節點，以移到更佳的位置。\n\n### 繪製新建築物\n\n為地圖添加建築物的主要問題之一，是 OpenStreetMap 可以用輪廓或點的形式，記錄建築物。一般來說，應_盡可能以區域記錄建築物的輪廓_，並以置於建築輪廓內的點，記錄建築物中的公司、住宅、設施及其他東西。\n\n要開始繪製建築物，先單擊左上方的’區域’按鈕，最後則按鍵盤上的’Return'鍵或點擊所繪的第一個節點，完成輪廓的繪製。\n\n### 刪除建築物\n\n如果一項建築物完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將建築物刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該建築物或許只是新建的。\n\n要刪除建築物，您可以點擊它以選擇，然後點擊垃圾桶圖標，或按 ’Delete’ 鍵。\n",
-        "relations": "# 關係\n\n關係是在 OpenStreetMap 裡將其他物件組合在一起的特殊物件。\n舉兩個常見的例子－*路線關係*可用來將屬於某一高速公路或道路的路段併合；而*多重多邊形*則可用來將數條線段組合，以勾劃出較為複雜區域(如分開為數個區塊，或像甜甜圈一樣中間穿洞的區域)。\n\n在一個關係中組合在一起的物件，稱為該關係的*成員*。\n在面板裡，您可以看到一個物件屬於哪些關係，並可點選當中任何一個關係。\n當您點選了一個關係後，面板會列出關係中的所有成員，\n而這些成員亦會在地圖上標示出來。\n\n在您編輯時，iD在大多數情況下都會自動處理所涉及的關係。唯您主要須注意的，是若您刪除舊有的路段以重繪更精確的路段，\n您必須確保將新的路段，仍為原本路段所屬各關係的成員。\n\n## 編輯關係\n\n如果您想編輯關係，以下是基本要領。\n\n要將物件加入一個現有的關係，請選擇該物件，\n點擊面板中\"所有關係\"下的\"+\"按鈕，並選擇或輸入關係的名稱。\n\n要增加一個新的關係，點選第一個要加入新關係作為成員的物件，\n點擊面板中\"所有關係\"下的\"+\"按鈕，並選擇\"建立新關係...\"。\n\n要將物件從一個關係中移除，選擇該物件，\n點擊您想將該物件移除的關係旁的垃圾桶按鈕。\n\n您可以運用\"合併\"工具，創建內含空洞的多重多邊形。\n繪製兩個區域(內部與外部)，按住 Shift 鍵並分別點選它們兩者，\n然後點擊 \"合併\"(+)按鈕。\n"
+        "addresses": "# 地址 \n\n地址是地圖中最有用的訊息之一。 \n\n雖然地址通常被視為街道的一部分，在 OpenStreetMap 中，它們是沿相關街道的建築物和地方的屬性。 \n\n您可以將地址訊息，添加到以建築物輪廓為代表、或以點為代表的地方之上。地址資料的最佳來源，是實地調查或個人知識 － 與任何其他物件一樣，嚴格禁止抄襲商業來源（如Google 地圖）的地圖資料。\n",
+        "inspector": "# 使用檢視面板\n\n檢視面板是畫面右面的用戶界面元素，當您選擇一個物件時便會出現，讓您可編輯物件的詳細資料。\n\n### 選擇物件類型\n\n在您添加一個點、線段或區域後，您可以選擇物件的類型，例如該物件應是高速公路還是住宅區道路，是超級市場還是咖啡廳。檢視面板將顯示常用物件類型的按鈕，要找出其他物件類型，您可以在搜尋框中輸入您所要的物件類型。\n\n點選物件類型按鈕右下角的'i'字，可顯示物件類型的更多資訊。點選按鈕以選擇該類型。\n\n### 使用表格和編輯標籤\n\n在您選擇物件類型後，或選擇已經被編配類型的物件時，檢查面板會顯示該物件詳細資料的欄位，\n如名稱和地址。\n\n在欄位下方，您可以點選按鈕，以添加其他詳細資料，如[維基百科](http://www.wikipedia.org/)的條目資料，輪椅可否到達，以及其他更多資料。\n\n在面板的底部，點擊'增加標籤'以添加其他任意的標籤到該物件。您可透過[Taginfo](http://taginfo.openstreetmap.org/)，了解有關常用的標籤組合的更多資料。\n\n您在檢查面板所做的更改，會自動應用到地圖上。您可以隨時點選'撤消'按鈕，撤消這些更改。\n\n### 關閉檢查面板\n\n您可以點選檢查面板右上角的關閉按鈕、按’Escape'鍵，或在地圖上點一下，以關閉檢查面板。\n",
+        "buildings": "# 建築物\n\n開放街圖是世界上最大的建築物資料庫。您可以建立\n和改善這個資料庫。\n\n### 選擇建築物\n\n您可以點選建築物的邊界，以選擇該建築物。該建築物將以高亮度顯示，並會開啟小工具選單，和在右邊顯示有關建築物更多資料的面板。\n\n### 修改建築物\n\n有時候，建築物的位置或其標籤或許會不正確。\n\n要移動整個建築物的位置，先選擇該建築物，然後點選’移動’工具。移動您的滑鼠以移動築物，在移到正確位置上按一下。\n\n要更正建築物的形狀，點選並拖曳建築物輪廓的節點，以移到更好的位置。\n\n### 繪製新建築物\n\n為地圖添加建築物的主要問題之一，是開放街圖可以用輪廓或點的形式，記錄建築物。一般來說，應_盡可能以區域記錄建築物的輪廓_，並以置於建築輪廓內的點，記錄建築物中的公司、住宅、設施及其他東西。\n\n要開始繪製建築物，先單擊左上方的’區域’按鈕，最後則按鍵盤上的’Return'鍵或點選所繪的第一個節點，完成輪廓的繪製。\n\n### 刪除建築物\n\n如果一項建築物完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將建築物刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該建築物或許只是新建的。\n\n要刪除建築物，您可以點選它以選擇，然後按下垃圾桶按鈕，或按 ’Delete’ 鍵。\n",
+        "relations": "# 關係\n\n關係是在開放街圖裡將其他物件組合在一起的特殊物件。\n舉兩個常見的例子－*路線關係*可用來將屬於某一高速公路或道路的路段併合；而*多重多邊形*則可用來將數條線段組合，以勾劃出較為複雜區域(如分開為數個區塊，或像甜甜圈一樣中間穿洞的區域)。\n\n在一個關係中組合在一起的物件，稱為該關係的*成員*。\n在面板裡，您可以看到一個物件屬於哪些關係，並可點選當中任何一個關係。\n當您點選了一個關係後，面板會列出關係中的所有成員，\n而這些成員亦會在地圖上標示出來。\n\n在您編輯時，iD在大多數情況下都會自動處理所涉及的關係。但是需注意，若您刪除舊有的路段以重繪更精確的路段，\n您必須確定將新的路段，仍為原本路段所屬關係的成員。\n\n## 編輯關係\n\n如果您想編輯關係，以下是基本要領。\n\n要將物件加入一個現有的關係，請選擇該物件，\n點選面板中\"所有關係\"下的\"+\"按鈕，並選擇或輸入關係的名稱。\n\n要增加一個新的關係，點選第一個要加入新關係作為成員的物件，\n點選面板中\"所有關係\"下的\"+\"按鈕，並選擇\"建立新關係...\"。\n\n要將物件從一個關係中移除，選擇該物件，\n點選您想將該物件移除的關係旁的垃圾桶按鈕。\n\n您可以運用\"合併\"工具，創建內含空洞的多重多邊形。\n繪製兩個區域(內部與外部)，按住 Shift 鍵並分別點選它們兩者，\n然後點選 \"合併\"(+)按鈕。\n"

     },
     "intro": {
         "navigation": {
             "title": "導航",
     },
     "intro": {
         "navigation": {
             "title": "導航",

-            "drag": "主要地圖區會在背景圖像上方顯示 OpenStreetMap 資料，您可以透過拖曳與捲動來導覽，就像其他互聯網地圖一樣。 **拖曳地圖！**",
-            "select": "地圖物件有三種表示方式：點、線以及區域，所有物件都可以點選。 **點擊該點來選擇它**",
+            "drag": "主要地圖區會在背景圖像上方顯示開放街圖資料，您可以透過拖曳與捲動來導覽，就像其他網路地圖一樣。 **拖曳地圖！**",
+            "select": "地圖物件有三種表示方式：點、線以及區域，所有物件都可以點選。 **點選該點來選擇它**",

             "header": "上方顯示物件種類",
             "header": "上方顯示物件種類",

-            "pane": "選擇一個物件後，會顯示物件編輯器。上方顯示物件類型，主面板則顯示物件的屬性，如物件的名稱與地址等。 **點擊物件編輯器右上角的關閉按鈕，關閉物件編輯器**"
+            "pane": "選擇一個物件後，會顯示物件編輯器。上方顯示物件類型，主面板則顯示物件的屬性，如物件的名稱與地址等。 **點選物件編輯器右上角的關閉按鈕，關閉物件編輯器**"

         },
         "points": {
             "title": "點",
             "add": "點可以用來表示像是商店、餐廳與古蹟之類的物件，它們標示一個特定位置，並且描述那裡有什麼。 **點擊「點」按鈕以新增一點**",
         },
         "points": {
             "title": "點",
             "add": "點可以用來表示像是商店、餐廳與古蹟之類的物件，它們標示一個特定位置，並且描述那裡有什麼。 **點擊「點」按鈕以新增一點**",

-            "place": "在地圖上點擊，可以地圖上放上新增的一點。 **將該點放到建築物上方**",
+            "place": "在地圖上按一下，可以地圖上放上新增的一點。 **將該點放到建築物上方**",

             "search": "很多不同的物件，可以用點來代表。您剛新增的點，是一間咖啡廳。**搜尋'{name}'**",
             "choose": "**從列表中選擇咖啡廳。**",
             "describe": "這個點現在標示為咖啡廳，透過物件編輯器，我們可以加入更多相關資訊。 **新增一個名稱**",
             "close": "點選關閉按鈕就可以關閉物件編輯器。 **關閉物件編輯器**",
             "search": "很多不同的物件，可以用點來代表。您剛新增的點，是一間咖啡廳。**搜尋'{name}'**",
             "choose": "**從列表中選擇咖啡廳。**",
             "describe": "這個點現在標示為咖啡廳，透過物件編輯器，我們可以加入更多相關資訊。 **新增一個名稱**",
             "close": "點選關閉按鈕就可以關閉物件編輯器。 **關閉物件編輯器**",

-            "reselect": "å¾\88å¤\9aæ\99\82å\80\99ï¼\8cæ\89\80é\9c\80ç\9a\84é»\9eå·²ç¶\93å­\98å\9c¨ï¼\8cä½\86æ\9c\89é\8c¯èª¤æ\88\96不完整。我們可以編輯現有的點。**選擇您剛創建的點**",
+            "reselect": "å¾\88å¤\9aæ\99\82å\80\99ï¼\8cæ\89\80é\9c\80ç\9a\84é»\9eå·²ç¶\93å­\98å\9c¨ï¼\8cä½\86æ\9c\83é\8c¯èª¤æ\88\96è\80\85æ\8f\8fè¿°不完整。我們可以編輯現有的點。**選擇您剛創建的點**",

             "fixname": "**更改名稱，並關閉物件編輯器。**",
             "fixname": "**更改名稱，並關閉物件編輯器。**",

-            "reselect_delete": "地圖上的所有物件均可刪除。**點擊你創建的點。**",
+            "reselect_delete": "地圖上的所有物件均可刪除。**按你創建的點。**",

             "delete": "在點周圍的選單，顯示可對該點進行的操作，包括刪除。**刪除該點。**"
         },
         "areas": {
             "title": "區域",
             "delete": "在點周圍的選單，顯示可對該點進行的操作，包括刪除。**刪除該點。**"
         },
         "areas": {
             "title": "區域",

-            "add": "區域能較詳細地代表物件，提供該物件的邊界資料。大部份以點可以代表的物件類別，都可以用區域代表，而後者往往更為適合。**點擊「區域」按鈕，以新增一個新區域**",
+            "add": "區域能較詳細地代表物件，提供該物件的邊界資料。大部份以點可以代表的物件類別，都可以用區域代表，而後者往往更為適合。**按「區域」按鈕，以新增一個新區域**",

             "corner": "透過將節點放到區域的界線上，可繪製區域。**將起始節點置於遊樂場的其中一角**",
             "corner": "透過將節點放到區域的界線上，可繪製區域。**將起始節點置於遊樂場的其中一角**",

-            "place": "放置更多節點，以勾畫該區域。點擊起始節點以完成繪製區域。**繪製一區域以代表遊樂場**",
+            "place": "放置更多節點，以勾畫該區域。按起始節點以完成繪製區域。**繪製一區域以代表遊樂場**",

             "search": "**搜尋'{name}'。**",
             "choose": "**從列表中選擇遊樂場。**",
             "search": "**搜尋'{name}'。**",
             "choose": "**從列表中選擇遊樂場。**",

-            "describe": "**添加一個名稱，並關閉物件編輯器。**"
+            "describe": "**添加名稱，並關閉物件編輯器。**"

         },
         "lines": {
             "title": "線",
         },
         "lines": {
             "title": "線",

-            "add": "線後可用於表示如道路、鐵路以及河流。 **點擊線按鈕來新增一條線段。**",
-            "start": "**點擊道路末端，以開始繪製線段。**",
+            "add": "線後可用於表示如道路、鐵路以及河流。 **按下線按鈕來新增一條線段。**",
+            "start": "**按道路末端，以開始繪製線段。**",

             "intersect": "點擊以為線段添加更多的節點。在繪圖是，如有需要，您可以拖曳地圖。道路和許多其他類型的線段，是整個體系的一部分。這些線段正確地連接起來，對導航的應用程序的運作相當重要。**點擊Flower Street，建立連接這兩條線段的相交點。**",
             "intersect": "點擊以為線段添加更多的節點。在繪圖是，如有需要，您可以拖曳地圖。道路和許多其他類型的線段，是整個體系的一部分。這些線段正確地連接起來，對導航的應用程序的運作相當重要。**點擊Flower Street，建立連接這兩條線段的相交點。**",

-            "finish": "再次點擊最後的節點，可完成繪製線段。**完成繪製此道路**",
+            "finish": "再次按最後的節點，可完成繪製線段。**完成繪製此道路**",

             "road": "**從列表中選擇道路。**",
             "residential": "道路有不同種類，最常見的為住宅區道路。**選擇住宅區道路**",
             "road": "**從列表中選擇道路。**",
             "residential": "道路有不同種類，最常見的為住宅區道路。**選擇住宅區道路**",

-            "describe": "**給道路一個名稱，並關閉物件編輯器。**",
+            "describe": "**命名道路，並關閉物件編輯器。**",

             "restart": "這道路須與Flower Street相交。",
             "restart": "這道路須與Flower Street相交。",

-            "wrong_preset": "您尚未選擇住宅區道路。**點擊這裡以再次選擇**"
+            "wrong_preset": "您尚未選擇住宅區道路。**按這裡以再次選擇**"

         },
         "startediting": {
             "title": "開始編輯",
         },
         "startediting": {
             "title": "開始編輯",

-            "help": "在這裡有更多使用說明及可重溫本簡介。",
-            "save": "不要忘記定時保存您的編輯！",
+            "help": "在這裡有更多使用說明以及可以再看一次新手教學。",
+            "save": "不要忘記定時儲存您的編輯！",

             "start": "開始製圖！"
         }
     },
             "start": "開始製圖！"
         }
     },


@@ -451,7 +451,7 @@
                 "types": {
                     "access": "一般",
                     "foot": "步行",
                 "types": {
                     "access": "一般",
                     "foot": "步行",

-                    "motor_vehicle": "æ\91©æ\89\98車",
+                    "motor_vehicle": "æ±½æ©\9f車",

                     "bicycle": "單車",
                     "horse": "馬匹"
                 },
                     "bicycle": "單車",
                     "horse": "馬匹"
                 },


@@ -514,7 +514,12 @@
                 "label": "種類"
             },
             "aerialway/access": {
                 "label": "種類"
             },
             "aerialway/access": {

-                "label": "通行方向"
+                "label": "通行方向",
+                "options": {
+                    "entry": "進入",
+                    "exit": "離開",
+                    "both": "雙向"
+                }

             },
             "aerialway/bubble": {
                 "label": "椅罩"
             },
             "aerialway/bubble": {
                 "label": "椅罩"


@@ -535,7 +540,12 @@
                 "placeholder": "2, 4, 8..."
             },
             "aerialway/summer/access": {
                 "placeholder": "2, 4, 8..."
             },
             "aerialway/summer/access": {

-                "label": "通行方向（夏季）"
+                "label": "通行方向（夏季）",
+                "options": {
+                    "entry": "進入",
+                    "exit": "離開",
+                    "both": "雙向"
+                }

             },
             "aeroway": {
                 "label": "種類"
             },
             "aeroway": {
                 "label": "種類"


@@ -575,7 +585,25 @@
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {

-                "label": "方向"
+                "label": "方向",
+                "options": {
+                    "N": "北",
+                    "E": "東",
+                    "S": "南",
+                    "W": "西",
+                    "NE": "東北",
+                    "SE": "東南",
+                    "SW": "西南",
+                    "NW": "西北",
+                    "NNE": "東北偏北",
+                    "ENE": "東北偏東",
+                    "ESE": "東南偏東",
+                    "SSE": "東南偏南",
+                    "SSW": "西南偏南",
+                    "WSW": "西南偏西",
+                    "WNW": "西北偏西",
+                    "NNW": "西北偏北"
+                }

             },
             "clock_direction": {
                 "label": "方向",
             },
             "clock_direction": {
                 "label": "方向",


@@ -615,7 +643,14 @@
                 "label": "描述"
             },
             "electrified": {
                 "label": "描述"
             },
             "electrified": {

-                "label": "電氣化"
+                "label": "電氣化",
+                "placeholder": "架空電車線, 第三軌供電",
+                "options": {
+                    "contact_line": "架空電車線",
+                    "rail": "第三軌供電",
+                    "yes": "是 (未指名)",
+                    "no": "否"
+                }

             },
             "elevation": {
                 "label": "海拔"
             },
             "elevation": {
                 "label": "海拔"


@@ -637,7 +672,13 @@
                 "label": "費用"
             },
             "fire_hydrant/type": {
                 "label": "費用"
             },
             "fire_hydrant/type": {

-                "label": "種類"
+                "label": "種類",
+                "options": {
+                    "pillar": "支柱式/地面式",
+                    "underground": "地下式",
+                    "wall": "牆",
+                    "pond": "池塘"
+                }

             },
             "fixme": {
                 "label": "Fix Me"
             },
             "fixme": {
                 "label": "Fix Me"


@@ -760,6 +801,23 @@
                 "label": "速度限制",
                 "placeholder": "40, 50, 60..."
             },
                 "label": "速度限制",
                 "placeholder": "40, 50, 60..."
             },

+            "mtb/scale": {
+                "label": "越越單車難度",
+                "placeholder": "0, 1, 2, 3...",
+                "options": {
+                    "3": "鋪面光滑，有大的障礙物，",
+                    "4": "4: 路面鬆散或是充滿石頭，有危險的髮夾彎",
+                    "5": "5: 騎乘等級最困難，路面充滿石頭，或者是路面坍方",
+                    "6": "6: 除非是技巧極好的越野車手，否則並不適合騎乘"
+                }
+            },
+            "mtb/scale/imba": {
+                "label": "國際登山車協會路徑難度",
+                "placeholder": "容易, 中等, 困難..."
+            },
+            "mtb/scale/uphill": {
+                "placeholder": "0, 1, 2, 3..."
+            },

             "name": {
                 "label": "名稱",
                 "placeholder": "常用名稱(如有)"
             "name": {
                 "label": "名稱",
                 "placeholder": "常用名稱(如有)"


@@ -806,7 +864,16 @@
                 "label": "停車轉乘"
             },
             "parking": {
                 "label": "停車轉乘"
             },
             "parking": {

-                "label": "種類"
+                "label": "種類",
+                "options": {
+                    "surface": "地面",
+                    "multi-storey": "立體",
+                    "underground": "地下",
+                    "sheds": "有覆蓋",
+                    "carports": "車棚",
+                    "garage_boxes": "垃圾桶",
+                    "lane": "路邊"
+                }

             },
             "phone": {
                 "label": "電話",
             },
             "phone": {
                 "label": "電話",


@@ -1079,6 +1146,9 @@
             "amenity/boat_rental": {
                 "name": "小艇租賃"
             },
             "amenity/boat_rental": {
                 "name": "小艇租賃"
             },

+            "amenity/bus_station": {
+                "name": "公車轉運站"
+            },

             "amenity/cafe": {
                 "name": "咖啡廳",
                 "terms": "咖啡店"
             "amenity/cafe": {
                 "name": "咖啡廳",
                 "terms": "咖啡店"


@@ -1675,7 +1745,8 @@
                 "name": "高速公路"
             },
             "highway/motorway_junction": {
                 "name": "高速公路"
             },
             "highway/motorway_junction": {

-                "name": "高速公路交匯處/出口"
+                "name": "交流道/出口",
+                "terms": "高速公路交流道/出口,高速公路交匯處/出口,快速道路交流道/出口"

             },
             "highway/motorway_link": {
                 "name": "高速公路引道"
             },
             "highway/motorway_link": {
                 "name": "高速公路引道"


@@ -1931,7 +2002,8 @@
                 "name": "跑道"
             },
             "line": {
                 "name": "跑道"
             },
             "line": {

-                "name": "線"
+                "name": "線",
+                "terms": "線"

             },
             "man_made": {
                 "name": "人造構築"
             },
             "man_made": {
                 "name": "人造構築"


@@ -1958,7 +2030,8 @@
                 "name": "碼頭"
             },
             "man_made/pipeline": {
                 "name": "碼頭"
             },
             "man_made/pipeline": {

-                "name": "管道"
+                "name": "管道",
+                "terms": "管線"

             },
             "man_made/survey_point": {
                 "name": "測量點"
             },
             "man_made/survey_point": {
                 "name": "測量點"


@@ -2294,7 +2367,7 @@
                 "name": "汽車維修店"
             },
             "shop/chemist": {
                 "name": "汽車維修店"
             },
             "shop/chemist": {

-                "name": "藥行"
+                "name": "藥妝店"

             },
             "shop/clothes": {
                 "name": "服飾店",
             },
             "shop/clothes": {
                 "name": "服飾店",


@@ -2379,7 +2452,8 @@
                 "name": "行動電話店"
             },
             "shop/motorcycle": {
                 "name": "行動電話店"
             },
             "shop/motorcycle": {

-                "name": "機車行"
+                "name": "機車行",
+                "terms": "摩托車行,機器腳踏車行"

             },
             "shop/music": {
                 "name": "音樂店"
             },
             "shop/music": {
                 "name": "音樂店"