Update to iD v1.3.7

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index 1927b00eb83687855cddeab4a69804ab4c2ffce5..1e63410fa42fcbe2b521b052afe7ddf0380f1abf 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -2732,14 +2732,13 @@ input[type=number] {
 
 .form-field .addr-number {
     width: 33.3333%;
 
 .form-field .addr-number {
     width: 33.3333%;

-    border-left: 0;
-    border-right: 0;
-    border-bottom: 0;
+    border: 0;

     border-radius: 0;
 }
 
 .form-field .addr-street {
     width: 66.6666%;
     border-radius: 0;
 }
 
 .form-field .addr-street {
     width: 66.6666%;

+    border-top: 0;

     border-right: 0;
     border-bottom: 0;
     border-radius: 0;
     border-right: 0;
     border-bottom: 0;
     border-radius: 0;

diff --git a/vendor/assets/iD/iD.js b/vendor/assets/iD/iD.js
index 6a8d7a87ae3c61c118a5b2f5f0c5ba99c62ec829..c7bb962195dce765dd685e4dafbef7c4c5dbac1e 100644 (file)
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
@@ -16151,7 +16151,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
     return d3.rebind(context, dispatch, 'on');
 };
 

-iD.version = '1.3.6';
+iD.version = '1.3.7';

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


@@ -16187,7 +16187,7 @@ iD.version = '1.3.6';
 })();
 iD.taginfo = function() {
     var taginfo = {},
 })();
 iD.taginfo = function() {
     var taginfo = {},

-        endpoint = 'http://taginfo.openstreetmap.org/api/4/',
+        endpoint = 'https://taginfo.openstreetmap.org/api/4/',

         tag_sorts = {
             point: 'count_nodes',
             vertex: 'count_nodes',
         tag_sorts = {
             point: 'count_nodes',
             vertex: 'count_nodes',


@@ -16323,7 +16323,7 @@ iD.taginfo = function() {
 };
 iD.wikipedia  = function() {
     var wiki = {},
 };
 iD.wikipedia  = function() {
     var wiki = {},

-        endpoint = 'http://en.wikipedia.org/w/api.php?';
+        endpoint = 'https://en.wikipedia.org/w/api.php?';

 
     wiki.search = function(lang, query, callback) {
         lang = lang || 'en';
 
     wiki.search = function(lang, query, callback) {
         lang = lang || 'en';


@@ -17702,10 +17702,14 @@ iD.actions.MergePolygon = function(ids, newRelationId) {
             graph = graph.remove(m);
         });
 
             graph = graph.remove(m);
         });
 

-        members.forEach(function(m) {
-            var entity = graph.entity(m.id);
-            relation = relation.mergeTags(entity.tags);
-            graph = graph.replace(entity.update({ tags: {} }));
+        entities.closedWay.forEach(function(way) {
+            function isThisOuter(m) {
+                return m.id === way.id && m.role !== 'inner';
+            }
+            if (members.some(isThisOuter)) {
+                relation = relation.mergeTags(way.tags);
+                graph = graph.replace(way.update({ tags: {} }));
+            }

         });
 
         return graph.replace(relation.update({
         });
 
         return graph.replace(relation.update({


@@ -17719,6 +17723,8 @@ iD.actions.MergePolygon = function(ids, newRelationId) {
         if (entities.other.length > 0 ||
             entities.closedWay.length + entities.multipolygon.length < 2)
             return 'not_eligible';
         if (entities.other.length > 0 ||
             entities.closedWay.length + entities.multipolygon.length < 2)
             return 'not_eligible';

+        if (!entities.multipolygon.every(function(r) { return r.isComplete(graph); }))
+            return 'incomplete_relation';

     };
 
     return action;
     };
 
     return action;


@@ -20567,6 +20573,9 @@ iD.operations.Merge = function(selectedIDs, context) {
         if (j === 'restriction' && m && p)
             return t('operations.merge.restriction', {relation: context.presets().item('type/restriction').name()});
 
         if (j === 'restriction' && m && p)
             return t('operations.merge.restriction', {relation: context.presets().item('type/restriction').name()});
 

+        if (p === 'incomplete_relation' && j && m)
+            return t('operations.merge.incomplete_relation');
+

         if (j && m && p)
             return t('operations.merge.' + j);
 
         if (j && m && p)
             return t('operations.merge.' + j);
 


@@ -22033,7 +22042,9 @@ iD.History = function(context) {
         toJSON: function() {
             if (stack.length <= 1) return;
 
         toJSON: function() {
             if (stack.length <= 1) return;
 

-            var allEntities = {};
+            var allEntities = {},
+                baseEntities = {},
+                base = stack[0];

 
             var s = stack.map(function(i) {
                 var modified = [], deleted = [];
 
             var s = stack.map(function(i) {
                 var modified = [], deleted = [];


@@ -22046,6 +22057,12 @@ iD.History = function(context) {
                     } else {
                         deleted.push(id);
                     }
                     } else {
                         deleted.push(id);
                     }

+
+                    // make sure that the originals of changed or deleted entities get merged
+                    // into the base of the stack after restoring the data from JSON.
+                    if (id in base.graph.entities) {
+                        baseEntities[id] = base.graph.entities[id];
+                    }

                 });
 
                 var x = {};
                 });
 
                 var x = {};


@@ -22059,8 +22076,9 @@ iD.History = function(context) {
             });
 
             return JSON.stringify({
             });
 
             return JSON.stringify({

-                version: 2,
+                version: 3,

                 entities: _.values(allEntities),
                 entities: _.values(allEntities),

+                baseEntities: _.values(baseEntities),

                 stack: s,
                 nextIDs: iD.Entity.id.next,
                 index: index
                 stack: s,
                 nextIDs: iD.Entity.id.next,
                 index: index


@@ -22073,13 +22091,22 @@ iD.History = function(context) {
             iD.Entity.id.next = h.nextIDs;
             index = h.index;
 
             iD.Entity.id.next = h.nextIDs;
             index = h.index;
 

-            if (h.version === 2) {
+            if (h.version === 2 || h.version === 3) {

                 var allEntities = {};
 
                 h.entities.forEach(function(entity) {
                     allEntities[iD.Entity.key(entity)] = iD.Entity(entity);
                 });
 
                 var allEntities = {};
 
                 h.entities.forEach(function(entity) {
                     allEntities[iD.Entity.key(entity)] = iD.Entity(entity);
                 });
 

+                if (h.version === 3) {
+                    // this merges originals for changed entities into the base of
+                    // the stack even if the current stack doesn't have them (for
+                    // example when iD has been restarted in a different region)
+                    var baseEntities = h.baseEntities.map(iD.Entity);
+                    stack[0].graph.rebase(baseEntities, _.pluck(stack, 'graph'));
+                    tree.rebase(baseEntities);
+                }
+

                 stack = h.stack.map(function(d) {
                     var entities = {}, entity;
 
                 stack = h.stack.map(function(d) {
                     var entities = {}, entity;
 


@@ -22151,8 +22178,6 @@ iD.History = function(context) {
 
             var json = context.storage(getKey('saved_history'));
             if (json) history.fromJSON(json);
 
             var json = context.storage(getKey('saved_history'));
             if (json) history.fromJSON(json);

-
-            context.storage(getKey('saved_history', null));

         },
 
         _getKey: getKey
         },
 
         _getKey: getKey


@@ -23066,7 +23091,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) {
 
     var bing = iD.BackgroundSource(data),
         key = 'Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU', // Same as P2 and JOSM
 
     var bing = iD.BackgroundSource(data),
         key = 'Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU', // Same as P2 and JOSM

-        url = 'http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' +
+        url = 'https://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&key=' +

             key + '&jsonp={callback}',
         providers = [];
 
             key + '&jsonp={callback}',
         providers = [];
 


@@ -23085,7 +23110,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) {
         dispatch.change();
     });
 
         dispatch.change();
     });
 

-    var template = 'http://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z',
+    var template = 'https://ecn.t{t}.tiles.virtualearth.net/tiles/a{u}.jpeg?g=587&mkt=en-gb&n=z',

         subdomains = [0, 1, 2, 3];
 
     bing.url = function(coord) {
         subdomains = [0, 1, 2, 3];
 
     bing.url = function(coord) {


@@ -29384,7 +29409,6 @@ iD.ui.preset.access = function(field) {
 };
 iD.ui.preset.address = function(field, context) {
     var event = d3.dispatch('change'),
 };
 iD.ui.preset.address = function(field, context) {
     var event = d3.dispatch('change'),

-        housename,

         housenumber,
         street,
         city,
         housenumber,
         street,
         city,


@@ -29482,12 +29506,6 @@ iD.ui.preset.address = function(field, context) {
         var enter = wrap.enter().append('div')
             .attr('class', 'preset-input-wrap');
 
         var enter = wrap.enter().append('div')
             .attr('class', 'preset-input-wrap');
 

-        enter.append('input')
-            .property('type', 'text')
-            .attr('placeholder', field.t('placeholders.housename'))
-            .attr('class', 'addr-housename')
-            .attr('id', 'preset-input-' + field.id);
-

         enter.append('input')
             .property('type', 'text')
             .attr('placeholder', field.t('placeholders.number'))
         enter.append('input')
             .property('type', 'text')
             .attr('placeholder', field.t('placeholders.number'))


@@ -29510,7 +29528,6 @@ iD.ui.preset.address = function(field, context) {
 
         // Update
 
 
         // Update
 

-        housename = wrap.select('.addr-housename');

         housenumber = wrap.select('.addr-number');
         street = wrap.select('.addr-street');
         city = wrap.select('.addr-city');
         housenumber = wrap.select('.addr-number');
         street = wrap.select('.addr-street');
         city = wrap.select('.addr-city');


@@ -29541,7 +29558,6 @@ iD.ui.preset.address = function(field, context) {
 
     function change() {
         event.change({
 
     function change() {
         event.change({

-            'addr:housename': housename.value() || undefined,

             'addr:housenumber': housenumber.value() || undefined,
             'addr:street': street.value() || undefined,
             'addr:city': city.value() || undefined,
             'addr:housenumber': housenumber.value() || undefined,
             'addr:street': street.value() || undefined,
             'addr:city': city.value() || undefined,


@@ -29556,7 +29572,6 @@ iD.ui.preset.address = function(field, context) {
     };
 
     address.tags = function(tags) {
     };
 
     address.tags = function(tags) {

-        housename.value(tags['addr:housename'] || '');

         housenumber.value(tags['addr:housenumber'] || '');
         street.value(tags['addr:street'] || '');
         city.value(tags['addr:city'] || '');
         housenumber.value(tags['addr:housenumber'] || '');
         street.value(tags['addr:street'] || '');
         city.value(tags['addr:city'] || '');


@@ -29564,7 +29579,7 @@ iD.ui.preset.address = function(field, context) {
     };
 
     address.focus = function() {
     };
 
     address.focus = function() {

-        housename.node().focus();
+        housenumber.node().focus();

     };
 
     return d3.rebind(address, event, 'on');
     };
 
     return d3.rebind(address, event, 'on');


@@ -62669,7 +62684,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "dentist's office"
                 ],
                 "tags": {
                     "dentist's office"
                 ],
                 "tags": {

-                    "amenity": "doctors"
+                    "amenity": "dentist"

                 },
                 "icon": "hospital",
                 "fields": [
                 },
                 "icon": "hospital",
                 "fields": [


@@ -63904,6 +63919,102 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Apartments"
             },
                 },
                 "name": "Apartments"
             },

+            "building/barn": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "barn"
+                },
+                "name": "Barn"
+            },
+            "building/bunker": {
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "bunker"
+                },
+                "name": "Bunker",
+                "searchable": false
+            },
+            "building/cabin": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "cabin"
+                },
+                "name": "Cabin"
+            },
+            "building/cathedral": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "cathedral"
+                },
+                "name": "Cathedral"
+            },
+            "building/chapel": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "chapel"
+                },
+                "name": "Chapel"
+            },
+            "building/church": {
+                "icon": "place-of-worship",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "church"
+                },
+                "name": "Church"
+            },

             "building/commercial": {
                 "icon": "commercial",
                 "geometry": [
             "building/commercial": {
                 "icon": "commercial",
                 "geometry": [


@@ -63916,6 +64027,54 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Commercial Building"
             },
                 },
                 "name": "Commercial Building"
             },

+            "building/construction": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "construction"
+                },
+                "name": "Building Under Construction"
+            },
+            "building/detached": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "detached"
+                },
+                "name": "Detached Home"
+            },
+            "building/dormitory": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "dormitory"
+                },
+                "name": "Dormitory"
+            },

             "building/entrance": {
                 "icon": "entrance",
                 "geometry": [
             "building/entrance": {
                 "icon": "entrance",
                 "geometry": [


@@ -63942,6 +64101,69 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "name": "Garage",
                 "icon": "warehouse"
             },
                 "name": "Garage",
                 "icon": "warehouse"
             },

+            "building/garages": {
+                "icon": "warehouse",
+                "fields": [
+                    "capacity"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "garages"
+                },
+                "name": "Garages"
+            },
+            "building/greenhouse": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "greenhouse"
+                },
+                "name": "Greenhouse"
+            },
+            "building/hospital": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "hospital"
+                },
+                "name": "Hospital Building"
+            },
+            "building/hotel": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "hotel"
+                },
+                "name": "Hotel Building"
+            },

             "building/house": {
                 "icon": "building",
                 "fields": [
             "building/house": {
                 "icon": "building",
                 "fields": [


@@ -63984,6 +64206,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Industrial Building"
             },
                 },
                 "name": "Industrial Building"
             },

+            "building/public": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "public"
+                },
+                "name": "Public Building"
+            },

             "building/residential": {
                 "icon": "building",
                 "fields": [
             "building/residential": {
                 "icon": "building",
                 "fields": [


@@ -64000,6 +64238,167 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Residential Building"
             },
                 },
                 "name": "Residential Building"
             },

+            "building/retail": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "retail"
+                },
+                "name": "Retail Building"
+            },
+            "building/roof": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "roof"
+                },
+                "name": "Roof"
+            },
+            "building/school": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "school"
+                },
+                "name": "School Building"
+            },
+            "building/shed": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "shed"
+                },
+                "name": "Shed"
+            },
+            "building/stable": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "stable"
+                },
+                "name": "Stable"
+            },
+            "building/static_caravan": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "static_caravan"
+                },
+                "name": "Static Mobile Home"
+            },
+            "building/terrace": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "terrace"
+                },
+                "name": "Row Houses"
+            },
+            "building/train_station": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "train_station"
+                },
+                "name": "Train Station",
+                "searchable": false
+            },
+            "building/university": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "university"
+                },
+                "name": "University Building"
+            },
+            "building/warehouse": {
+                "icon": "building",
+                "fields": [
+                    "address",
+                    "levels"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "building": "warehouse"
+                },
+                "name": "Warehouse"
+            },

             "craft/basket_maker": {
                 "name": "Basket Maker",
                 "geometry": [
             "craft/basket_maker": {
                 "name": "Basket Maker",
                 "geometry": [


@@ -67761,6 +68160,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "railway/station": {
                 "icon": "rail",
             },
             "railway/station": {
                 "icon": "rail",

+                "fields": [
+                    "building_area"
+                ],

                 "geometry": [
                     "point",
                     "vertex",
                 "geometry": [
                     "point",
                     "vertex",


@@ -67879,6 +68281,27 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "name": "Liquor Store"
             },
                 ],
                 "name": "Liquor Store"
             },

+            "shop/art": {
+                "icon": "art-gallery",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "terms": [
+                    "art store",
+                    "art gallery"
+                ],
+                "tags": {
+                    "shop": "art"
+                },
+                "name": "Art Shop"
+            },

             "shop/bakery": {
                 "icon": "bakery",
                 "fields": [
             "shop/bakery": {
                 "icon": "bakery",
                 "fields": [


@@ -67953,6 +68376,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Bicycle Shop"
             },
                 },
                 "name": "Bicycle Shop"
             },

+            "shop/bookmaker": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "bookmaker"
+                },
+                "name": "Bookmaker"
+            },

             "shop/books": {
                 "icon": "shop",
                 "fields": [
             "shop/books": {
                 "icon": "shop",
                 "fields": [


@@ -68472,6 +68912,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "name": "Locksmith"
             },
                 },
                 "name": "Locksmith"
             },

+            "shop/lottery": {
+                "icon": "shop",
+                "fields": [
+                    "address",
+                    "building_area",
+                    "opening_hours"
+                ],
+                "geometry": [
+                    "point",
+                    "vertex",
+                    "area"
+                ],
+                "tags": {
+                    "shop": "lottery"
+                },
+                "name": "Lottery Shop"
+            },

             "shop/mall": {
                 "icon": "shop",
                 "fields": [
             "shop/mall": {
                 "icon": "shop",
                 "fields": [


@@ -97121,7 +97578,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "address": {
                 "type": "address",
                 "keys": [
             "address": {
                 "type": "address",
                 "keys": [

-                    "addr:housename",

                     "addr:housenumber",
                     "addr:street",
                     "addr:city",
                     "addr:housenumber",
                     "addr:street",
                     "addr:city",


@@ -97132,7 +97588,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "label": "Address",
                 "strings": {
                     "placeholders": {
                 "label": "Address",
                 "strings": {
                     "placeholders": {

-                        "housename": "Housename",

                         "number": "123",
                         "street": "Street",
                         "city": "City",
                         "number": "123",
                         "street": "Street",
                         "city": "City",


@@ -109952,7 +110407,8 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "annotation": "Merged {n} lines.",
                 "not_eligible": "These features can't be merged.",
                 "not_adjacent": "These lines can't be merged because they aren't connected.",
                 "annotation": "Merged {n} lines.",
                 "not_eligible": "These features can't be merged.",
                 "not_adjacent": "These lines can't be merged because they aren't connected.",

-                "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation."
+                "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.",
+                "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded."

             },
             "move": {
                 "title": "Move",
             },
             "move": {
                 "title": "Move",


@@ -110287,7 +110743,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "address": {
                     "label": "Address",
                     "placeholders": {
                 "address": {
                     "label": "Address",
                     "placeholders": {

-                        "housename": "Housename",

                         "number": "123",
                         "street": "Street",
                         "city": "City",
                         "number": "123",
                         "street": "Street",
                         "city": "City",


@@ -111108,10 +111563,46 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Apartments",
                     "terms": ""
                 },
                     "name": "Apartments",
                     "terms": ""
                 },

+                "building/barn": {
+                    "name": "Barn",
+                    "terms": ""
+                },
+                "building/bunker": {
+                    "name": "Bunker",
+                    "terms": ""
+                },
+                "building/cabin": {
+                    "name": "Cabin",
+                    "terms": ""
+                },
+                "building/cathedral": {
+                    "name": "Cathedral",
+                    "terms": ""
+                },
+                "building/chapel": {
+                    "name": "Chapel",
+                    "terms": ""
+                },
+                "building/church": {
+                    "name": "Church",
+                    "terms": ""
+                },

                 "building/commercial": {
                     "name": "Commercial Building",
                     "terms": ""
                 },
                 "building/commercial": {
                     "name": "Commercial Building",
                     "terms": ""
                 },

+                "building/construction": {
+                    "name": "Building Under Construction",
+                    "terms": ""
+                },
+                "building/detached": {
+                    "name": "Detached Home",
+                    "terms": ""
+                },
+                "building/dormitory": {
+                    "name": "Dormitory",
+                    "terms": ""
+                },

                 "building/entrance": {
                     "name": "Entrance",
                     "terms": ""
                 "building/entrance": {
                     "name": "Entrance",
                     "terms": ""


@@ -111120,6 +111611,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Garage",
                     "terms": ""
                 },
                     "name": "Garage",
                     "terms": ""
                 },

+                "building/garages": {
+                    "name": "Garages",
+                    "terms": ""
+                },
+                "building/greenhouse": {
+                    "name": "Greenhouse",
+                    "terms": ""
+                },
+                "building/hospital": {
+                    "name": "Hospital Building",
+                    "terms": ""
+                },
+                "building/hotel": {
+                    "name": "Hotel Building",
+                    "terms": ""
+                },

                 "building/house": {
                     "name": "House",
                     "terms": ""
                 "building/house": {
                     "name": "House",
                     "terms": ""


@@ -111132,10 +111639,54 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Industrial Building",
                     "terms": ""
                 },
                     "name": "Industrial Building",
                     "terms": ""
                 },

+                "building/public": {
+                    "name": "Public Building",
+                    "terms": ""
+                },

                 "building/residential": {
                     "name": "Residential Building",
                     "terms": ""
                 },
                 "building/residential": {
                     "name": "Residential Building",
                     "terms": ""
                 },

+                "building/retail": {
+                    "name": "Retail Building",
+                    "terms": ""
+                },
+                "building/roof": {
+                    "name": "Roof",
+                    "terms": ""
+                },
+                "building/school": {
+                    "name": "School Building",
+                    "terms": ""
+                },
+                "building/shed": {
+                    "name": "Shed",
+                    "terms": ""
+                },
+                "building/stable": {
+                    "name": "Stable",
+                    "terms": ""
+                },
+                "building/static_caravan": {
+                    "name": "Static Mobile Home",
+                    "terms": ""
+                },
+                "building/terrace": {
+                    "name": "Row Houses",
+                    "terms": ""
+                },
+                "building/train_station": {
+                    "name": "Train Station",
+                    "terms": ""
+                },
+                "building/university": {
+                    "name": "University Building",
+                    "terms": ""
+                },
+                "building/warehouse": {
+                    "name": "Warehouse",
+                    "terms": ""
+                },

                 "craft/basket_maker": {
                     "name": "Basket Maker",
                     "terms": "basket,basketry,basket maker,basket weaver"
                 "craft/basket_maker": {
                     "name": "Basket Maker",
                     "terms": "basket,basketry,basket maker,basket weaver"


@@ -112112,6 +112663,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Liquor Store",
                     "terms": "alcohol"
                 },
                     "name": "Liquor Store",
                     "terms": "alcohol"
                 },

+                "shop/art": {
+                    "name": "Art Shop",
+                    "terms": "art store,art gallery"
+                },

                 "shop/bakery": {
                     "name": "Bakery",
                     "terms": ""
                 "shop/bakery": {
                     "name": "Bakery",
                     "terms": ""


@@ -112128,6 +112683,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Bicycle Shop",
                     "terms": ""
                 },
                     "name": "Bicycle Shop",
                     "terms": ""
                 },

+                "shop/bookmaker": {
+                    "name": "Bookmaker",
+                    "terms": ""
+                },

                 "shop/books": {
                     "name": "Bookstore",
                     "terms": ""
                 "shop/books": {
                     "name": "Bookstore",
                     "terms": ""


@@ -112248,6 +112807,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Locksmith",
                     "terms": "keys"
                 },
                     "name": "Locksmith",
                     "terms": "keys"
                 },

+                "shop/lottery": {
+                    "name": "Lottery Shop",
+                    "terms": ""
+                },

                 "shop/mall": {
                     "name": "Mall",
                     "terms": ""
                 "shop/mall": {
                     "name": "Mall",
                     "terms": ""

diff --git a/vendor/assets/iD/iD/locales/bn.json b/vendor/assets/iD/iD/locales/bn.json
index 1ac9f2b33270f1d264f7e81b9a29330fa24604dd..9b49520b63b32e6a480067a7811591875ce99a10 100644 (file)
--- a/vendor/assets/iD/iD/locales/bn.json
+++ b/vendor/assets/iD/iD/locales/bn.json
@@ -17,7 +17,7 @@
         },
         "browse": {
             "title": "ঘুরে ফিরে দেখুন",
         },
         "browse": {
             "title": "ঘুরে ফিরে দেখুন",

-            "description": "মানচিত্র প্যান এবং  জুম করুন "
+            "description": "মানচিত্র প্যান এবং জুম করুন।"

         },
         "draw_area": {
             "tail": "অাপনার এলাকায় নোড সংযোজন-এর জন্য ক্লিক করুন। এলাকাটি সম্পুর্ন করার জন্য প্রথম নোড-এ ক্লিক করুন।"
         },
         "draw_area": {
             "tail": "অাপনার এলাকায় নোড সংযোজন-এর জন্য ক্লিক করুন। এলাকাটি সম্পুর্ন করার জন্য প্রথম নোড-এ ক্লিক করুন।"


@@ -46,7 +46,7 @@
             "description": "এই রেখাকে প্রলম্বিত করুন.",
             "not_eligible": "কোন রেখাকে এখানে প্রলম্বিত করা যাবে না.",
             "annotation": {
             "description": "এই রেখাকে প্রলম্বিত করুন.",
             "not_eligible": "কোন রেখাকে এখানে প্রলম্বিত করা যাবে না.",
             "annotation": {

-                "line": "একটি রেখাকে প্রলম্বিত করা হয়েছে",
+                "line": "একটি রেখাকে প্রলম্বিত করা হয়েছে।",

                 "area": "একটি ক্ষেত্রকে বড় করা হয়েছে"
             }
         },
                 "area": "একটি ক্ষেত্রকে বড় করা হয়েছে"
             }
         },


@@ -176,7 +176,7 @@
     },
     "redo": {
         "tooltip": "পুনরায় করুন: {action}",
     },
     "redo": {
         "tooltip": "পুনরায় করুন: {action}",

-        "nothing": "পুনরায় করার কিছুই নেই."
+        "nothing": "পুনরায় করার কিছুই নেই।"

     },
     "tooltip_keyhint": "শর্টকাট:",
     "browser_notice": "এই এডিটরটি ফায়ারফক্স, ক্রোম, সাফারি, অপেরা এবং ইন্টারনেট এক্সপ্লোরার ৯ এবং তার উপরে কাজ করে। দয়া করে অাপনার ব্রাউসারটিকে উন্নত করুন অথবা ম্যাপ এ পরিবর্তন করতে পটল্যাচ ২ ব্যব্হার করুন।",
     },
     "tooltip_keyhint": "শর্টকাট:",
     "browser_notice": "এই এডিটরটি ফায়ারফক্স, ক্রোম, সাফারি, অপেরা এবং ইন্টারনেট এক্সপ্লোরার ৯ এবং তার উপরে কাজ করে। দয়া করে অাপনার ব্রাউসারটিকে উন্নত করুন অথবা ম্যাপ এ পরিবর্তন করতে পটল্যাচ ২ ব্যব্হার করুন।",

diff --git a/vendor/assets/iD/iD/locales/ca.json b/vendor/assets/iD/iD/locales/ca.json
index 6360dadea730d98693834aad469131a42242b9de..a95f8a84094858033dbb766dec34027fc8d51a70 100644 (file)
--- a/vendor/assets/iD/iD/locales/ca.json
+++ b/vendor/assets/iD/iD/locales/ca.json
@@ -134,7 +134,8 @@
             "annotation": "Heu fusionat {n} línies.",
             "not_eligible": "Aquestes característiques no poden ser fusionades.",
             "not_adjacent": "Aquestes línies no poden ser com fusionades ja que no estàn connectades.",
             "annotation": "Heu fusionat {n} línies.",
             "not_eligible": "Aquestes característiques no poden ser fusionades.",
             "not_adjacent": "Aquestes línies no poden ser com fusionades ja que no estàn connectades.",

-            "restriction": "Aquestes línies no poden ser fusionades perquè com a mínim una d'elles és membre de la relació \"{relation}\""
+            "restriction": "Aquestes línies no poden ser fusionades perquè com a mínim una d'elles és membre de la relació \"{relation}\"",
+            "incomplete_relation": "Aquestes característiques no poden ser fusionades perquè com a mínim una no s'ha descarregat del tot."

         },
         "move": {
             "title": "Mou",
         },
         "move": {
             "title": "Mou",


@@ -1254,15 +1255,55 @@
             "building/apartments": {
                 "name": "Apartaments"
             },
             "building/apartments": {
                 "name": "Apartaments"
             },

+            "building/barn": {
+                "name": "Graner"
+            },
+            "building/bunker": {
+                "name": "Búnquer"
+            },
+            "building/cabin": {
+                "name": "Cabina"
+            },
+            "building/cathedral": {
+                "name": "Catedral"
+            },
+            "building/chapel": {
+                "name": "Capella"
+            },
+            "building/church": {
+                "name": "Església"
+            },

             "building/commercial": {
                 "name": "Edifici comercial"
             },
             "building/commercial": {
                 "name": "Edifici comercial"
             },

+            "building/construction": {
+                "name": "Edifici en construcció"
+            },
+            "building/detached": {
+                "name": "Xalet unifamiliar",
+                "terms": "casa aïllada, casa d'urbanització, xalet, chalet, xalets, chalets, casa i jardí, casa amb jardí"
+            },
+            "building/dormitory": {
+                "name": "Edifici d'habitacions"
+            },

             "building/entrance": {
                 "name": "Entrada"
             },
             "building/garage": {
                 "name": "garatge "
             },
             "building/entrance": {
                 "name": "Entrada"
             },
             "building/garage": {
                 "name": "garatge "
             },

+            "building/garages": {
+                "name": "Garatges"
+            },
+            "building/greenhouse": {
+                "name": "Hivernacle"
+            },
+            "building/hospital": {
+                "name": "Edifici hospitalari"
+            },
+            "building/hotel": {
+                "name": "Edifici hoteler"
+            },

             "building/house": {
                 "name": "Casa"
             },
             "building/house": {
                 "name": "Casa"
             },


@@ -1272,9 +1313,42 @@
             "building/industrial": {
                 "name": "Edifici industrial"
             },
             "building/industrial": {
                 "name": "Edifici industrial"
             },

+            "building/public": {
+                "name": "Edifici públic"
+            },

             "building/residential": {
                 "name": "Edifici residencial"
             },
             "building/residential": {
                 "name": "Edifici residencial"
             },

+            "building/retail": {
+                "name": "Edifici de grans magatzems"
+            },
+            "building/roof": {
+                "name": "Teulada"
+            },
+            "building/school": {
+                "name": "Edifici escolar"
+            },
+            "building/shed": {
+                "name": "Traster"
+            },
+            "building/stable": {
+                "name": "Estable"
+            },
+            "building/static_caravan": {
+                "name": "Caravana fixa"
+            },
+            "building/terrace": {
+                "name": "Cases unifamiliars"
+            },
+            "building/train_station": {
+                "name": "Estació de ferrocarril"
+            },
+            "building/university": {
+                "name": "Edifici universitari"
+            },
+            "building/warehouse": {
+                "name": "Magatzem"
+            },

             "craft/basket_maker": {
                 "name": "Cistellaire"
             },
             "craft/basket_maker": {
                 "name": "Cistellaire"
             },


@@ -2011,6 +2085,9 @@
             "shop/alcohol": {
                 "name": "Botiga de licors"
             },
             "shop/alcohol": {
                 "name": "Botiga de licors"
             },

+            "shop/art": {
+                "name": "Botiga d'art"
+            },

             "shop/bakery": {
                 "name": "Fleca"
             },
             "shop/bakery": {
                 "name": "Fleca"
             },


@@ -2023,6 +2100,9 @@
             "shop/bicycle": {
                 "name": "Botiga de bicicletes"
             },
             "shop/bicycle": {
                 "name": "Botiga de bicicletes"
             },

+            "shop/bookmaker": {
+                "name": "Cusidor de llibres"
+            },

             "shop/books": {
                 "name": "Llibreria"
             },
             "shop/books": {
                 "name": "Llibreria"
             },


@@ -2113,6 +2193,9 @@
             "shop/locksmith": {
                 "name": "Copisteria de claus"
             },
             "shop/locksmith": {
                 "name": "Copisteria de claus"
             },

+            "shop/lottery": {
+                "name": "Administració de loteria"
+            },

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

diff --git a/vendor/assets/iD/iD/locales/da.json b/vendor/assets/iD/iD/locales/da.json
index 397c9b9e3b54210520451302c77650a5497fd4a0..1e62c8b03d88cb396003d8e4b7b9325edefca27e 100644 (file)
--- a/vendor/assets/iD/iD/locales/da.json
+++ b/vendor/assets/iD/iD/locales/da.json
@@ -134,7 +134,8 @@
             "annotation": "Fusionerede {n} linjer.",
             "not_eligible": "Disse elementer kan ikke fusioneres.",
             "not_adjacent": "Disse linjer kan ikke fusioneres fordi de ikke er knyttet sammen",
             "annotation": "Fusionerede {n} linjer.",
             "not_eligible": "Disse elementer kan ikke fusioneres.",
             "not_adjacent": "Disse linjer kan ikke fusioneres fordi de ikke er knyttet sammen",

-            "restriction": "Disse linjer kan ikke flettes sammen, da mindst en af disse er medlem af  \"{relation}\" relation."
+            "restriction": "Disse linjer kan ikke flettes sammen, da mindst en af disse er medlem af  \"{relation}\" relation.",
+            "incomplete_relation": "Disse kortegenskaber kan ikke fusioneres, da de ikke er blevet downloadet fuldstændigt."

         },
         "move": {
             "title": "Flyt",
         },
         "move": {
             "title": "Flyt",


@@ -1284,10 +1285,46 @@
                 "name": "Lejligheder",
                 "terms": "Lejligheder, Ejerlejligheder"
             },
                 "name": "Lejligheder",
                 "terms": "Lejligheder, Ejerlejligheder"
             },

+            "building/barn": {
+                "name": "Lade",
+                "terms": "Lade, Stald"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker"
+            },
+            "building/cabin": {
+                "name": "Hytte",
+                "terms": "Hytte"
+            },
+            "building/cathedral": {
+                "name": "Katedral",
+                "terms": "Katedral, Domkirke"
+            },
+            "building/chapel": {
+                "name": "Kapel",
+                "terms": "Kapel"
+            },
+            "building/church": {
+                "name": "Kirke",
+                "terms": "Kirke"
+            },

             "building/commercial": {
                 "name": "Indkøbscenter",
                 "terms": "Indkøbscenter, Storcenter"
             },
             "building/commercial": {
                 "name": "Indkøbscenter",
                 "terms": "Indkøbscenter, Storcenter"
             },

+            "building/construction": {
+                "name": "Bygning under konstruktion",
+                "terms": "Bygning under konstruktion, Byggeplads"
+            },
+            "building/detached": {
+                "name": "Parcelhus",
+                "terms": "Parcelhus"
+            },
+            "building/dormitory": {
+                "name": " Kollegie",
+                "terms": " Kollegie, Klubværelse, Kollegium"
+            },

             "building/entrance": {
                 "name": "Indgang",
                 "terms": "Indgang"
             "building/entrance": {
                 "name": "Indgang",
                 "terms": "Indgang"


@@ -1296,6 +1333,22 @@
                 "name": "Garage",
                 "terms": "Garage, Carport"
             },
                 "name": "Garage",
                 "terms": "Garage, Carport"
             },

+            "building/garages": {
+                "name": "Garager",
+                "terms": "Garager"
+            },
+            "building/greenhouse": {
+                "name": "Drivhus",
+                "terms": "Drivhus"
+            },
+            "building/hospital": {
+                "name": "Hospitalsbygning",
+                "terms": "Hospitalsbygning, Sygehusbygning"
+            },
+            "building/hotel": {
+                "name": "Hotelbygning",
+                "terms": "Hotelbygning"
+            },

             "building/house": {
                 "name": "Hus",
                 "terms": "Hus, Parcelhus"
             "building/house": {
                 "name": "Hus",
                 "terms": "Hus, Parcelhus"


@@ -1308,10 +1361,54 @@
                 "name": "Industribygning",
                 "terms": "Industribygning"
             },
                 "name": "Industribygning",
                 "terms": "Industribygning"
             },

+            "building/public": {
+                "name": "Offentlig bygning",
+                "terms": "Offentlig bygning"
+            },

             "building/residential": {
                 "name": "Beboelsesbygning",
                 "terms": "Beboelsesbygning, Parcelhus"
             },
             "building/residential": {
                 "name": "Beboelsesbygning",
                 "terms": "Beboelsesbygning, Parcelhus"
             },

+            "building/retail": {
+                "name": "Butiksbygning",
+                "terms": "Butiksbygning, Forretningsbygning"
+            },
+            "building/roof": {
+                "name": "Tag",
+                "terms": "Tag"
+            },
+            "building/school": {
+                "name": "Skolebygning",
+                "terms": "Skolebygning"
+            },
+            "building/shed": {
+                "name": "Skur",
+                "terms": "Skur"
+            },
+            "building/stable": {
+                "name": "Stald",
+                "terms": "Stald, Hestestald, Kostald, Grisestald"
+            },
+            "building/static_caravan": {
+                "name": "Fast mobilt hus",
+                "terms": "Fast mobilt hus"
+            },
+            "building/terrace": {
+                "name": "Rækkehuse",
+                "terms": "Rækkehuse"
+            },
+            "building/train_station": {
+                "name": "Togstation",
+                "terms": "Togstation, Station"
+            },
+            "building/university": {
+                "name": "Universitetsbygning",
+                "terms": "Universitetsbygning"
+            },
+            "building/warehouse": {
+                "name": "Lager",
+                "terms": "Lager, Lagerhotel, Varelager"
+            },

             "craft/basket_maker": {
                 "name": "Kurvemager",
                 "terms": "Kurvemager"
             "craft/basket_maker": {
                 "name": "Kurvemager",
                 "terms": "Kurvemager"


@@ -2288,6 +2385,10 @@
                 "name": "Vinforhandler",
                 "terms": "Vinforhandler, Vinbutik, Vinforretning"
             },
                 "name": "Vinforhandler",
                 "terms": "Vinforhandler, Vinbutik, Vinforretning"
             },

+            "shop/art": {
+                "name": "Kunstbutik",
+                "terms": "Kunstbutik, Kunstforretning"
+            },

             "shop/bakery": {
                 "name": "Bager",
                 "terms": "Bager, Bageri"
             "shop/bakery": {
                 "name": "Bager",
                 "terms": "Bager, Bageri"


@@ -2304,6 +2405,10 @@
                 "name": "Cykelbutik",
                 "terms": "Cykelforretning, Cykelbutik"
             },
                 "name": "Cykelbutik",
                 "terms": "Cykelforretning, Cykelbutik"
             },

+            "shop/bookmaker": {
+                "name": "Bookmaker",
+                "terms": "Bookmaker"
+            },

             "shop/books": {
                 "name": "Boghandler",
                 "terms": "Boghandler"
             "shop/books": {
                 "name": "Boghandler",
                 "terms": "Boghandler"


@@ -2424,6 +2529,10 @@
                 "name": "Låsesmed",
                 "terms": "Låsesmed"
             },
                 "name": "Låsesmed",
                 "terms": "Låsesmed"
             },

+            "shop/lottery": {
+                "name": "Lotteributik",
+                "terms": "Lotteributik, Lotteriforretning"
+            },

             "shop/mall": {
                 "name": "Indkøbscenter",
                 "terms": "Indkøbscenter"
             "shop/mall": {
                 "name": "Indkøbscenter",
                 "terms": "Indkøbscenter"

diff --git a/vendor/assets/iD/iD/locales/de.json b/vendor/assets/iD/iD/locales/de.json
index a20ecaa5e12aa49dfa4aa9f89b467b1f1692ea80..0556e801ac8783bfdf7691fdbf1184a0af66a900 100644 (file)
--- a/vendor/assets/iD/iD/locales/de.json
+++ b/vendor/assets/iD/iD/locales/de.json
@@ -134,7 +134,8 @@
             "annotation": "{n} Linien vereinigt.",
             "not_eligible": "Diese Objekte können nicht vereinigt werden.",
             "not_adjacent": "Diese Linien können nicht vereinigt werden, da sie nicht verbunden sind.",
             "annotation": "{n} Linien vereinigt.",
             "not_eligible": "Diese Objekte können nicht vereinigt werden.",
             "not_adjacent": "Diese Linien können nicht vereinigt werden, da sie nicht verbunden sind.",

-            "restriction": "Diese Linien können nicht vereinigt werden, da mindestens eine Linie ein Mitglied einer \"{relation}\" Relation ist."
+            "restriction": "Diese Linien können nicht vereinigt werden, da mindestens eine Linie ein Mitglied einer \"{relation}\" Relation ist.",
+            "incomplete_relation": "Diese Objekte können nicht zusammengefügt werden, da mindestens eines noch nicht vollständig heruntergeladen wurde."

         },
         "move": {
             "title": "Verschieben",
         },
         "move": {
             "title": "Verschieben",


@@ -332,7 +333,7 @@
     },
     "help": {
         "title": "Hilfe",
     },
     "help": {
         "title": "Hilfe",

-        "help": "#Hilfe\n\nDies ist ein Editor für [OpenStreetMap](http://www.openstreetmap.org/), der freien und editierbaren Weltkarte. Du kannst ihn verwenden, um Daten in deiner Umgebung hinzuzufügen oder zu verändern und so diese Karte mit freien Quellen und freien Daten für jeden verbessern.\n\nVeränderungen werden für alle Nutzer von OpenStreetMap sichtbar. Um Veränderungen vornehmen zu können, musst du ein [kostenloses OpenStreetMap Profil](https://www.openstreetmap.org/user/new) anlegen.\n\nDer [iD editor](http://ideditor.com/) ist ein Gemeinschaftsprojektn dessen [Quellcode\nauf GitHub verfügbar ist](https://github.com/openstreetmap/iD).\n",
+        "help": "#Hilfe\n\nDies ist ein Editor für [OpenStreetMap](http://www.openstreetmap.org/), der freien und editierbaren Weltkarte. Du kannst ihn verwenden, um Daten in deiner Umgebung hinzuzufügen oder zu verändern und so diese Karte mit freien Quellen und freien Daten für jeden verbessern.\n\nVeränderungen werden für alle Nutzer von OpenStreetMap sichtbar. Um Veränderungen vornehmen zu können, musst du ein [kostenloses OpenStreetMap Profil](https://www.openstreetmap.org/user/new) anlegen.\n\nDer [iD editor](http://ideditor.com/) ist ein Gemeinschaftsprojekt dessen [Quellcode\nauf GitHub verfügbar ist](https://github.com/openstreetmap/iD).\n",

         "editing_saving": "# Editieren & Speichern\n\nDieser Editor wurde entworfen, um online zu arbeiten und du erreichst ihn über diese Webseite.\n\n### Objekte auswählen\n\nUm ein Kartenobjekt wie eine Straße oder ein Sonderziel (POI) auszuwählen, klicke auf der Karte darauf. Dadurch wird das Objekt hervorgehoben und ein Bedienfeld mit Details und Möglichkeiten zur Veränderung aufgerufen.\n\nMehrere Objekte kannst du auswählen indem du die Shift-Taste (Umschalttaste) drückst und die Objekte einzeln anklickst oder klickst und einen Rahmen darum ziehst.\nSo können mehrere Objekte gleichzeitig geändert werden.\n\n### Speichern der Änderungen\n\nWenn du Änderungen an einer Straße, einem Gebäude oder einem Platz vorgenommen hast, sind diese lokal gespeichert, bis du sie auf dem Server speicherst. Keine Sorge falls du einen Fehler machen solltest: Du kannst Änderungen jederzeit über den Rückgängig-Knopf rückgängig machen oder über den Wiederherstellen-Knopf noch einmal ausführen.\n\nKlicke auf \"Speichern\", um eine Gruppe von Änderungen zu speichern. Zum Beispiel, wenn du in einem Stadtteil fertig bist und in einer neuen Gegend editieren willst.\nDu bekommst dann die Möglichkeit noch einmal zu überprüfen, was du gerade getan hast und der Editor zeigt dir nützliche Hinweise oder mögliche Fehler, wenn etwas nicht in Ordnung zu sein scheint.\n\nWenn alles gut aussieht kannst du einen kurzen Kommentar schreiben, der erklärt, was du gemacht hast. Drücke nun \"Speichern\", um die Änderungen auf dem Server zu speichern.\nNun können es alle auf [OpenStreetMap.org](http://www.openstreetmap.org/) sehen und darauf aufbauen.\n\nWenn du es zeitlich nicht schaffst, kannst du das Editor-Fenster einfach schließen. Wenn du die Seite wieder aufrufst (mit dem gleichen Browser und Computer) wird dir angeboten, die letzte Sitzung wiederherzustellen.\n",
         "roads": "# Straßen\n\nMit dem Editor kannst du Wege erstellen, verändern und löschen. Wege können alles mögliche sein, zum Beispiel Pfade, Straßen, Schienen, Fahrradwege und anderes.\n\n### Auswählen\n\nKlicke auf einen Weg, um ihn auszuwählen. Er sollte nun hervorgehoben werden. Außerdem erscheint ein kleines Werkzeugmenü und eine Seitenleiste mit den Eigenschaften des Weges.\n\n### Modifizieren\n\nOft sieht man, dass Wege nicht mit dem Luftbild oder einer GPS-Spur übereinstimmen. Du kannst den Weg aber so anpassen, dass er an der richtigen Stelle ist. Beachte jedoch, dass Luftbilder einen Versatz aufweisen können.\n\nAls Erstes wählst du einen Weg aus. Dieser wird nun hervorgehoben und es werden die Knoten des Weges angezeigt. Diese kannst du verschieben, bis sie an der richtigen Stelle sind. Wenn du neue Knoten hinzufügen möchtest, klicke doppelt zwischen den Knoten auf die Linie und es wird ein neuer Punkt erzeugt.\n\nWenn zwei Wege in Wirklichkeit mit einander verbunden sind, aber auf der Karte nicht, kannst du sie verbinden, indem du einen Knoten des einen Weges auf den anderen Weg ziehst. Dass Wege verbunden sind, ist wichtig für die Karte und essentiell für die Nutzung von Routenführung.\n\nDu kannst auch das \"Bewegen\"-Werkzeug nutzen oder \"M\" drücken, um den kompletten Weg zu verschieben. Beende die Aktion mit einem Klick.\n\n### Löschen\n\nWenn du weißt, dass ein Weg nicht existiert, kannst du ihn löschen, um ihn von der Karte zu entfernen. Sei beim Löschen von Objekten besonders vorsichtig, da diese Änderungen von jedem gesehen werden können und Luftbilder oft veraltet sind. Das heißt, dass ein Weg, der im Luftbild nicht zu sehen ist, vielleicht einfach neu gebaut wurde.\n\nDu kannst Wege löschen, indem du sie anklickst und das Mülltonnensymbol auswählst oder die \"Entfernen\"-Taste drückst.\n\n### Erstellen\n\nDu kennst einen Weg der nicht eingezeichnet ist? Dann klicke auf das \"Linien\"-Symbol oben links im Editor oder drücke die Taste \"2\" und beginne mit dem Zeichnen einer Linie.\n\nKlicke dort hin, wo die Straße anfängt. Sollte sie von einer bereits existierenden Straße abzweigen, klicke an der entsprechenden Stelle auf diese Straße.\n\nZeichne nun den Weg, indem du Punkte anhand der Luftaufnahme oder der GPS-Spur entlang des Weges setzt. Sollte der Weg einen anderen kreuzen, klicke auf den  Kreuzungspunkt, um beide Wege zu verbinden. Wenn du mit dem Zeichnen fertig bist, klicke doppelt oder drücke \"Enter\" auf der Tastatur, um den Weg abzuschließen.\n",
         "gps": "# GPS\n\nGPS-Daten sind die vertrauenswürdigste Quelle für OpenStreetMap.\nDieser Editor unterstützt lokale GPS-Spuren — \".gpx\"-Dateien auf \ndeinem Computer. Du kannst diese GPS-Spuren mit Hilfe diverser\nSmartphone-Apps oder anderen GPS-Geräten aufnehmen.\n\nFür Informationen über das Sammeln von GPS-Daten kannst du dir\nfolgende Anleitung durchlesen: [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/) (zur Zeit nur auf Englisch)\n\nUm einen GPX-Track zu verwenden, ziehe ihn einfach in den Karteneditor.\nWenn er erkannt wurde, wird dieser Track als leuchtend grüne Linie auf\nder Karte dargestellt. Klicke auf \"Hintergrundeinstellungen\", um sie zu\n(de-)aktivieren, oder um zum Gebiet des Tracks zu gelangen (Lupe).\n\nDer GPX-Track wird nicht automatisch direkt zu OpenStreetMap hochgeladen.\nAm besten verwendest du ihn, um neue Wege hinzuzufügen. Möchtest du den \nGPX-Track jedem zugänglich machen, kannst du ihn über die [Track-Upload-Seite](http://www.openstreetmap.org/trace/create) hochladen.\n",
         "editing_saving": "# Editieren & Speichern\n\nDieser Editor wurde entworfen, um online zu arbeiten und du erreichst ihn über diese Webseite.\n\n### Objekte auswählen\n\nUm ein Kartenobjekt wie eine Straße oder ein Sonderziel (POI) auszuwählen, klicke auf der Karte darauf. Dadurch wird das Objekt hervorgehoben und ein Bedienfeld mit Details und Möglichkeiten zur Veränderung aufgerufen.\n\nMehrere Objekte kannst du auswählen indem du die Shift-Taste (Umschalttaste) drückst und die Objekte einzeln anklickst oder klickst und einen Rahmen darum ziehst.\nSo können mehrere Objekte gleichzeitig geändert werden.\n\n### Speichern der Änderungen\n\nWenn du Änderungen an einer Straße, einem Gebäude oder einem Platz vorgenommen hast, sind diese lokal gespeichert, bis du sie auf dem Server speicherst. Keine Sorge falls du einen Fehler machen solltest: Du kannst Änderungen jederzeit über den Rückgängig-Knopf rückgängig machen oder über den Wiederherstellen-Knopf noch einmal ausführen.\n\nKlicke auf \"Speichern\", um eine Gruppe von Änderungen zu speichern. Zum Beispiel, wenn du in einem Stadtteil fertig bist und in einer neuen Gegend editieren willst.\nDu bekommst dann die Möglichkeit noch einmal zu überprüfen, was du gerade getan hast und der Editor zeigt dir nützliche Hinweise oder mögliche Fehler, wenn etwas nicht in Ordnung zu sein scheint.\n\nWenn alles gut aussieht kannst du einen kurzen Kommentar schreiben, der erklärt, was du gemacht hast. Drücke nun \"Speichern\", um die Änderungen auf dem Server zu speichern.\nNun können es alle auf [OpenStreetMap.org](http://www.openstreetmap.org/) sehen und darauf aufbauen.\n\nWenn du es zeitlich nicht schaffst, kannst du das Editor-Fenster einfach schließen. Wenn du die Seite wieder aufrufst (mit dem gleichen Browser und Computer) wird dir angeboten, die letzte Sitzung wiederherzustellen.\n",
         "roads": "# Straßen\n\nMit dem Editor kannst du Wege erstellen, verändern und löschen. Wege können alles mögliche sein, zum Beispiel Pfade, Straßen, Schienen, Fahrradwege und anderes.\n\n### Auswählen\n\nKlicke auf einen Weg, um ihn auszuwählen. Er sollte nun hervorgehoben werden. Außerdem erscheint ein kleines Werkzeugmenü und eine Seitenleiste mit den Eigenschaften des Weges.\n\n### Modifizieren\n\nOft sieht man, dass Wege nicht mit dem Luftbild oder einer GPS-Spur übereinstimmen. Du kannst den Weg aber so anpassen, dass er an der richtigen Stelle ist. Beachte jedoch, dass Luftbilder einen Versatz aufweisen können.\n\nAls Erstes wählst du einen Weg aus. Dieser wird nun hervorgehoben und es werden die Knoten des Weges angezeigt. Diese kannst du verschieben, bis sie an der richtigen Stelle sind. Wenn du neue Knoten hinzufügen möchtest, klicke doppelt zwischen den Knoten auf die Linie und es wird ein neuer Punkt erzeugt.\n\nWenn zwei Wege in Wirklichkeit mit einander verbunden sind, aber auf der Karte nicht, kannst du sie verbinden, indem du einen Knoten des einen Weges auf den anderen Weg ziehst. Dass Wege verbunden sind, ist wichtig für die Karte und essentiell für die Nutzung von Routenführung.\n\nDu kannst auch das \"Bewegen\"-Werkzeug nutzen oder \"M\" drücken, um den kompletten Weg zu verschieben. Beende die Aktion mit einem Klick.\n\n### Löschen\n\nWenn du weißt, dass ein Weg nicht existiert, kannst du ihn löschen, um ihn von der Karte zu entfernen. Sei beim Löschen von Objekten besonders vorsichtig, da diese Änderungen von jedem gesehen werden können und Luftbilder oft veraltet sind. Das heißt, dass ein Weg, der im Luftbild nicht zu sehen ist, vielleicht einfach neu gebaut wurde.\n\nDu kannst Wege löschen, indem du sie anklickst und das Mülltonnensymbol auswählst oder die \"Entfernen\"-Taste drückst.\n\n### Erstellen\n\nDu kennst einen Weg der nicht eingezeichnet ist? Dann klicke auf das \"Linien\"-Symbol oben links im Editor oder drücke die Taste \"2\" und beginne mit dem Zeichnen einer Linie.\n\nKlicke dort hin, wo die Straße anfängt. Sollte sie von einer bereits existierenden Straße abzweigen, klicke an der entsprechenden Stelle auf diese Straße.\n\nZeichne nun den Weg, indem du Punkte anhand der Luftaufnahme oder der GPS-Spur entlang des Weges setzt. Sollte der Weg einen anderen kreuzen, klicke auf den  Kreuzungspunkt, um beide Wege zu verbinden. Wenn du mit dem Zeichnen fertig bist, klicke doppelt oder drücke \"Enter\" auf der Tastatur, um den Weg abzuschließen.\n",
         "gps": "# GPS\n\nGPS-Daten sind die vertrauenswürdigste Quelle für OpenStreetMap.\nDieser Editor unterstützt lokale GPS-Spuren — \".gpx\"-Dateien auf \ndeinem Computer. Du kannst diese GPS-Spuren mit Hilfe diverser\nSmartphone-Apps oder anderen GPS-Geräten aufnehmen.\n\nFür Informationen über das Sammeln von GPS-Daten kannst du dir\nfolgende Anleitung durchlesen: [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/) (zur Zeit nur auf Englisch)\n\nUm einen GPX-Track zu verwenden, ziehe ihn einfach in den Karteneditor.\nWenn er erkannt wurde, wird dieser Track als leuchtend grüne Linie auf\nder Karte dargestellt. Klicke auf \"Hintergrundeinstellungen\", um sie zu\n(de-)aktivieren, oder um zum Gebiet des Tracks zu gelangen (Lupe).\n\nDer GPX-Track wird nicht automatisch direkt zu OpenStreetMap hochgeladen.\nAm besten verwendest du ihn, um neue Wege hinzuzufügen. Möchtest du den \nGPX-Track jedem zugänglich machen, kannst du ihn über die [Track-Upload-Seite](http://www.openstreetmap.org/trace/create) hochladen.\n",


@@ -465,7 +466,7 @@
             "address": {
                 "label": "Adresse",
                 "placeholders": {
             "address": {
                 "label": "Adresse",
                 "placeholders": {

-                    "housename": "Hausname",
+                    "housename": "postalischer Hausname",

                     "number": "123",
                     "street": "Straße",
                     "city": "Stadt",
                     "number": "123",
                     "street": "Straße",
                     "city": "Stadt",


@@ -961,7 +962,7 @@
                 "terms": "Geldautomat"
             },
             "amenity/bank": {
                 "terms": "Geldautomat"
             },
             "amenity/bank": {

-                "name": "Bank",
+                "name": "Bank (Geldinstitut)",

                 "terms": "Kasse,Kontor,Kreditgenossenschaft,Lagerstelle,Fiskus,Fonds,Vermögen,Investmentfirma,Register,Rücklage,Vorrat,Tresor,Rücklagen,Grundkapital,Vorrat,Lager,Lagerhaus,Sparkasse,Schatz,Treuhandgesellschaft,Tresorraum"
             },
             "amenity/bar": {
                 "terms": "Kasse,Kontor,Kreditgenossenschaft,Lagerstelle,Fiskus,Fonds,Vermögen,Investmentfirma,Register,Rücklage,Vorrat,Tresor,Rücklagen,Grundkapital,Vorrat,Lager,Lagerhaus,Sparkasse,Schatz,Treuhandgesellschaft,Tresorraum"
             },
             "amenity/bar": {


@@ -969,7 +970,7 @@
                 "terms": "Bar"
             },
             "amenity/bench": {
                 "terms": "Bar"
             },
             "amenity/bench": {

-                "name": "Bank",
+                "name": "Sitzbank",

                 "terms": "Bank, Sitzbank"
             },
             "amenity/bicycle_parking": {
                 "terms": "Bank, Sitzbank"
             },
             "amenity/bicycle_parking": {


@@ -1284,10 +1285,46 @@
                 "name": "Wohnungen",
                 "terms": "Wohnung"
             },
                 "name": "Wohnungen",
                 "terms": "Wohnung"
             },

+            "building/barn": {
+                "name": "Scheune",
+                "terms": "Scheune, Stall"
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "Bunker, Schutzraum"
+            },
+            "building/cabin": {
+                "name": "Hütte",
+                "terms": "Hütte, Wochenendhaus"
+            },
+            "building/cathedral": {
+                "name": "Kathedrale",
+                "terms": "Kathedrale, Dom"
+            },
+            "building/chapel": {
+                "name": "Kapelle (Sakralbau)",
+                "terms": "Kapelle"
+            },
+            "building/church": {
+                "name": "Kirche",
+                "terms": "Kirche"
+            },

             "building/commercial": {
                 "name": "Geschäftshaus",
                 "terms": "Gewerbehaus,gewerblich genutztes Gebäude,"
             },
             "building/commercial": {
                 "name": "Geschäftshaus",
                 "terms": "Gewerbehaus,gewerblich genutztes Gebäude,"
             },

+            "building/construction": {
+                "name": "im Bau befindliches Gebäude",
+                "terms": "Gebäude im Bau"
+            },
+            "building/detached": {
+                "name": "Doppelhaus",
+                "terms": "Haushälfte, Doppelhaus"
+            },
+            "building/dormitory": {
+                "name": "Schlafsaal",
+                "terms": "Schlafsaal, Dormitorium"
+            },

             "building/entrance": {
                 "name": "Eingang",
                 "terms": "Eingang"
             "building/entrance": {
                 "name": "Eingang",
                 "terms": "Eingang"


@@ -1296,6 +1333,22 @@
                 "name": "Garage",
                 "terms": "Garage"
             },
                 "name": "Garage",
                 "terms": "Garage"
             },

+            "building/garages": {
+                "name": "Garagen",
+                "terms": "Garagen"
+            },
+            "building/greenhouse": {
+                "name": "Gewächshaus",
+                "terms": "Glashaus, Gewächshaus, Treibhaus"
+            },
+            "building/hospital": {
+                "name": "Krankenhausgebäude",
+                "terms": "Krankenhausgebäude, Klinikgebäude"
+            },
+            "building/hotel": {
+                "name": "Hotelgebäude",
+                "terms": "Hotelgebäude"
+            },

             "building/house": {
                 "name": "Haus",
                 "terms": "Haus"
             "building/house": {
                 "name": "Haus",
                 "terms": "Haus"


@@ -1308,10 +1361,54 @@
                 "name": "Industriegebäude",
                 "terms": "Industriegebäude"
             },
                 "name": "Industriegebäude",
                 "terms": "Industriegebäude"
             },

+            "building/public": {
+                "name": "Öffentliches Gebäude",
+                "terms": "Öffentliches Gebäude"
+            },

             "building/residential": {
                 "name": "Wohngebäude",
                 "terms": "Wohnhaus,Einfamilienhaus,Mehrfamilienhaus"
             },
             "building/residential": {
                 "name": "Wohngebäude",
                 "terms": "Wohnhaus,Einfamilienhaus,Mehrfamilienhaus"
             },

+            "building/retail": {
+                "name": "Geschäftsgebäude",
+                "terms": "Geschäftsgebäude, Gebäude mit Läden"
+            },
+            "building/roof": {
+                "name": "Dach",
+                "terms": "Dach"
+            },
+            "building/school": {
+                "name": "Schulgebäude",
+                "terms": "Schulgebäude, Schulhaus"
+            },
+            "building/shed": {
+                "name": "Schuppen",
+                "terms": "Hütte, Baracke"
+            },
+            "building/stable": {
+                "name": "Stall",
+                "terms": "Stall, Stallgebäude"
+            },
+            "building/static_caravan": {
+                "name": "Feststehender Wohnwagen",
+                "terms": "Abgestellter Wohnwagen"
+            },
+            "building/terrace": {
+                "name": "Reihenhäuser",
+                "terms": "Reihenhäuser"
+            },
+            "building/train_station": {
+                "name": "Bahnhof",
+                "terms": "Bahnhof, Haltestelle, Haltepunkt"
+            },
+            "building/university": {
+                "name": "Universitätsgebäude",
+                "terms": "Universitätsgebäude, Campusgebäude"
+            },
+            "building/warehouse": {
+                "name": "Lagerhalle",
+                "terms": "Lagerhaus, Lagergebäude"
+            },

             "craft/basket_maker": {
                 "name": "Korbflechter",
                 "terms": "Korbflecher, Korbmacher, Korbhersteller"
             "craft/basket_maker": {
                 "name": "Korbflechter",
                 "terms": "Korbflecher, Korbmacher, Korbhersteller"


@@ -1754,7 +1851,7 @@
             },
             "landuse/commercial": {
                 "name": "Gewerbegebiet",
             },
             "landuse/commercial": {
                 "name": "Gewerbegebiet",

-                "terms": "Gewerbezone,Gewerbegebiet,gewerblich genutzte Gebäude,Buissenes Park,Büros"
+                "terms": "Gewerbezone,Gewerbegebiet,gewerblich genutzte Gebäude,Business Park,Büros"

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


@@ -2288,6 +2385,10 @@
                 "name": "Spirituosenladen",
                 "terms": "Alkohol"
             },
                 "name": "Spirituosenladen",
                 "terms": "Alkohol"
             },

+            "shop/art": {
+                "name": "Kunsthandlung",
+                "terms": "Kunsthandlung, Kunstladen"
+            },

             "shop/bakery": {
                 "name": "Bäckerei",
                 "terms": "Bäckerei"
             "shop/bakery": {
                 "name": "Bäckerei",
                 "terms": "Bäckerei"


@@ -2304,6 +2405,10 @@
                 "name": "Fahrradladen",
                 "terms": "Fahrradladen, Fahrradgeschäft, Fahrrad-Geschäft, Fahrrad-Handlung"
             },
                 "name": "Fahrradladen",
                 "terms": "Fahrradladen, Fahrradgeschäft, Fahrrad-Geschäft, Fahrrad-Handlung"
             },

+            "shop/bookmaker": {
+                "name": "Buchmacher",
+                "terms": "Buchmacher"
+            },

             "shop/books": {
                 "name": "Buchhandlung",
                 "terms": "Buchhandlung, Buchladen"
             "shop/books": {
                 "name": "Buchhandlung",
                 "terms": "Buchhandlung, Buchladen"


@@ -2424,6 +2529,10 @@
                 "name": "Schlosser",
                 "terms": "Schlosser, Schlüsseldienst"
             },
                 "name": "Schlosser",
                 "terms": "Schlosser, Schlüsseldienst"
             },

+            "shop/lottery": {
+                "name": "Lottoannahmestelle",
+                "terms": "Lottoannahmestelle"
+            },

             "shop/mall": {
                 "name": "Einkaufzentrum",
                 "terms": "Einkaufszentrum, Mall"
             "shop/mall": {
                 "name": "Einkaufzentrum",
                 "terms": "Einkaufszentrum, Mall"

diff --git a/vendor/assets/iD/iD/locales/en-GB.json b/vendor/assets/iD/iD/locales/en-GB.json
index f8db4d76e7389b06c7e5f8b09c0f9f68a803ab49..ef23eab654674a905c2e7748ad160697d510d102 100644 (file)
--- a/vendor/assets/iD/iD/locales/en-GB.json
+++ b/vendor/assets/iD/iD/locales/en-GB.json
@@ -82,6 +82,12 @@
             "amenity/theatre": {
                 "name": "Theatre"
             },
             "amenity/theatre": {
                 "name": "Theatre"
             },

+            "building/static_caravan": {
+                "name": "Static Caravan"
+            },
+            "building/terrace": {
+                "name": "Terraced houses"
+            },

             "leisure/sports_center": {
                 "name": "Sports Centre"
             },
             "leisure/sports_center": {
                 "name": "Sports Centre"
             },

diff --git a/vendor/assets/iD/iD/locales/en.json b/vendor/assets/iD/iD/locales/en.json
index 5a7bf2306d89b4c68b223849c9a79e2fa5460ab8..1b40481ad320d9c016eab66e977b1edb943cbd98 100644 (file)
--- a/vendor/assets/iD/iD/locales/en.json
+++ b/vendor/assets/iD/iD/locales/en.json
@@ -134,7 +134,8 @@
             "annotation": "Merged {n} lines.",
             "not_eligible": "These features can't be merged.",
             "not_adjacent": "These lines can't be merged because they aren't connected.",
             "annotation": "Merged {n} lines.",
             "not_eligible": "These features can't be merged.",
             "not_adjacent": "These lines can't be merged because they aren't connected.",

-            "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation."
+            "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.",
+            "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded."

         },
         "move": {
             "title": "Move",
         },
         "move": {
             "title": "Move",


@@ -1290,10 +1291,46 @@
                 "name": "Apartments",
                 "terms": ""
             },
                 "name": "Apartments",
                 "terms": ""
             },

+            "building/barn": {
+                "name": "Barn",
+                "terms": ""
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": ""
+            },
+            "building/cabin": {
+                "name": "Cabin",
+                "terms": ""
+            },
+            "building/cathedral": {
+                "name": "Cathedral",
+                "terms": ""
+            },
+            "building/chapel": {
+                "name": "Chapel",
+                "terms": ""
+            },
+            "building/church": {
+                "name": "Church",
+                "terms": ""
+            },

             "building/commercial": {
                 "name": "Commercial Building",
                 "terms": ""
             },
             "building/commercial": {
                 "name": "Commercial Building",
                 "terms": ""
             },

+            "building/construction": {
+                "name": "Building Under Construction",
+                "terms": ""
+            },
+            "building/detached": {
+                "name": "Detached Home",
+                "terms": ""
+            },
+            "building/dormitory": {
+                "name": "Dormitory",
+                "terms": ""
+            },

             "building/entrance": {
                 "name": "Entrance",
                 "terms": ""
             "building/entrance": {
                 "name": "Entrance",
                 "terms": ""


@@ -1302,6 +1339,22 @@
                 "name": "Garage",
                 "terms": ""
             },
                 "name": "Garage",
                 "terms": ""
             },

+            "building/garages": {
+                "name": "Garages",
+                "terms": ""
+            },
+            "building/greenhouse": {
+                "name": "Greenhouse",
+                "terms": ""
+            },
+            "building/hospital": {
+                "name": "Hospital Building",
+                "terms": ""
+            },
+            "building/hotel": {
+                "name": "Hotel Building",
+                "terms": ""
+            },

             "building/house": {
                 "name": "House",
                 "terms": ""
             "building/house": {
                 "name": "House",
                 "terms": ""


@@ -1314,10 +1367,54 @@
                 "name": "Industrial Building",
                 "terms": ""
             },
                 "name": "Industrial Building",
                 "terms": ""
             },

+            "building/public": {
+                "name": "Public Building",
+                "terms": ""
+            },

             "building/residential": {
                 "name": "Residential Building",
                 "terms": ""
             },
             "building/residential": {
                 "name": "Residential Building",
                 "terms": ""
             },

+            "building/retail": {
+                "name": "Retail Building",
+                "terms": ""
+            },
+            "building/roof": {
+                "name": "Roof",
+                "terms": ""
+            },
+            "building/school": {
+                "name": "School Building",
+                "terms": ""
+            },
+            "building/shed": {
+                "name": "Shed",
+                "terms": ""
+            },
+            "building/stable": {
+                "name": "Stable",
+                "terms": ""
+            },
+            "building/static_caravan": {
+                "name": "Static Mobile Home",
+                "terms": ""
+            },
+            "building/terrace": {
+                "name": "Row Houses",
+                "terms": ""
+            },
+            "building/train_station": {
+                "name": "Train Station",
+                "terms": ""
+            },
+            "building/university": {
+                "name": "University Building",
+                "terms": ""
+            },
+            "building/warehouse": {
+                "name": "Warehouse",
+                "terms": ""
+            },

             "craft/basket_maker": {
                 "name": "Basket Maker",
                 "terms": "basket,basketry,basket maker,basket weaver"
             "craft/basket_maker": {
                 "name": "Basket Maker",
                 "terms": "basket,basketry,basket maker,basket weaver"


@@ -2294,6 +2391,10 @@
                 "name": "Liquor Store",
                 "terms": "alcohol"
             },
                 "name": "Liquor Store",
                 "terms": "alcohol"
             },

+            "shop/art": {
+                "name": "Art Shop",
+                "terms": "art store,art gallery"
+            },

             "shop/bakery": {
                 "name": "Bakery",
                 "terms": ""
             "shop/bakery": {
                 "name": "Bakery",
                 "terms": ""


@@ -2310,6 +2411,10 @@
                 "name": "Bicycle Shop",
                 "terms": ""
             },
                 "name": "Bicycle Shop",
                 "terms": ""
             },

+            "shop/bookmaker": {
+                "name": "Bookmaker",
+                "terms": ""
+            },

             "shop/books": {
                 "name": "Bookstore",
                 "terms": ""
             "shop/books": {
                 "name": "Bookstore",
                 "terms": ""


@@ -2430,6 +2535,10 @@
                 "name": "Locksmith",
                 "terms": "keys"
             },
                 "name": "Locksmith",
                 "terms": "keys"
             },

+            "shop/lottery": {
+                "name": "Lottery Shop",
+                "terms": ""
+            },

             "shop/mall": {
                 "name": "Mall",
                 "terms": ""
             "shop/mall": {
                 "name": "Mall",
                 "terms": ""

diff --git a/vendor/assets/iD/iD/locales/es.json b/vendor/assets/iD/iD/locales/es.json
index 666f75cd79215b89b563a236a03fb5f31e4b6006..6689264bf59229ad924c278f42083ed86d6e9865 100644 (file)
--- a/vendor/assets/iD/iD/locales/es.json
+++ b/vendor/assets/iD/iD/locales/es.json
@@ -134,7 +134,8 @@
             "annotation": "{n} líneas combinadas.",
             "not_eligible": "Estos elementos no pueden ser fusionados.",
             "not_adjacent": "Estas líneas no pueden ser fusionadas porque no están conectadas",
             "annotation": "{n} líneas combinadas.",
             "not_eligible": "Estos elementos no pueden ser fusionados.",
             "not_adjacent": "Estas líneas no pueden ser fusionadas porque no están conectadas",

-            "restriction": "Estas líneas no se pueden combinar porque al menos una es miembro de una relación de \"{relation}\"."
+            "restriction": "Estas líneas no se pueden combinar porque al menos una es miembro de una relación de \"{relation}\".",
+            "incomplete_relation": "Estos elementos no se pueden combinar porque al menos uno de ellos no se ha descargado por completo."

         },
         "move": {
             "title": "Mover",
         },
         "move": {
             "title": "Mover",


@@ -490,6 +491,7 @@
                 "placeholder": "1, 2, 3..."
             },
             "aerialway/occupancy": {
                 "placeholder": "1, 2, 3..."
             },
             "aerialway/occupancy": {

+                "label": "Ocupación",

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


@@ -525,6 +527,9 @@
             "building_area": {
                 "label": "Edificio"
             },
             "building_area": {
                 "label": "Edificio"
             },

+            "cans": {
+                "label": "Acepta envases"
+            },

             "capacity": {
                 "label": "Capacidad",
                 "placeholder": "50, 100, 200..."
             "capacity": {
                 "label": "Capacidad",
                 "placeholder": "50, 100, 200..."


@@ -539,6 +544,9 @@
                     "anticlockwise": "En sentido antihorario"
                 }
             },
                     "anticlockwise": "En sentido antihorario"
                 }
             },

+            "clothes": {
+                "label": "Acepta ropas"
+            },

             "collection_times": {
                 "label": "Horario de recogida"
             },
             "collection_times": {
                 "label": "Horario de recogida"
             },


@@ -566,6 +574,9 @@
             "description": {
                 "label": "Descripción"
             },
             "description": {
                 "label": "Descripción"
             },

+            "electrified": {
+                "label": "Electrificación"
+            },

             "elevation": {
                 "label": "Altura"
             },
             "elevation": {
                 "label": "Altura"
             },


@@ -580,7 +591,7 @@
                 "placeholder": "+31 42 123 4567"
             },
             "fee": {
                 "placeholder": "+31 42 123 4567"
             },
             "fee": {

-                "label": "Tarifa"
+                "label": "Couta"

             },
             "fire_hydrant/type": {
                 "label": "Tipo"
             },
             "fire_hydrant/type": {
                 "label": "Tipo"


@@ -588,6 +599,9 @@
             "fixme": {
                 "label": "Arreglame"
             },
             "fixme": {
                 "label": "Arreglame"
             },

+            "gauge": {
+                "label": "Gálibo"
+            },

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


@@ -597,6 +611,9 @@
             "generator/type": {
                 "label": "Tipo"
             },
             "generator/type": {
                 "label": "Tipo"
             },

+            "glass": {
+                "label": "Acepta vidrio"
+            },

             "golf_hole": {
                 "label": "Referencia",
                 "placeholder": "Número de hoyo (1-18)"
             "golf_hole": {
                 "label": "Referencia",
                 "placeholder": "Número de hoyo (1-18)"


@@ -689,6 +706,9 @@
             "operator": {
                 "label": "Operador"
             },
             "operator": {
                 "label": "Operador"
             },

+            "paper": {
+                "label": "Acepta papel"
+            },

             "par": {
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
             "par": {
                 "label": "Par",
                 "placeholder": "3, 4, 5..."


@@ -760,6 +780,9 @@
             "shop": {
                 "label": "Tipo"
             },
             "shop": {
                 "label": "Tipo"
             },

+            "social_facility_for": {
+                "placeholder": "Personas sin hogar, discapacitados, niños, etc"
+            },

             "source": {
                 "label": "Fuente"
             },
             "source": {
                 "label": "Fuente"
             },


@@ -840,8 +863,23 @@
             "aerialway": {
                 "name": "Pista aérea"
             },
             "aerialway": {
                 "name": "Pista aérea"
             },

+            "aerialway/cable_car": {
+                "name": "Teleférico",
+                "terms": "transbordador, funicular, telecabina, telesilla, telesquí"
+            },
+            "aerialway/chair_lift": {
+                "name": "Telesilla",
+                "terms": "telesquí, teleférico, funicular"
+            },

             "aerialway/gondola": {
             "aerialway/gondola": {

-                "name": "Góndola"
+                "name": "Góndola",
+                "terms": "Telecabina"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Alfombra mágica"
+            },
+            "aerialway/pylon": {
+                "name": "Pilona"

             },
             "aeroway": {
                 "name": "Aerovía",
             },
             "aeroway": {
                 "name": "Aerovía",


@@ -938,7 +976,8 @@
                 "terms": "cinematógrafo,cine"
             },
             "amenity/clinic": {
                 "terms": "cinematógrafo,cine"
             },
             "amenity/clinic": {

-                "name": "Clínica"
+                "name": "Clínica",
+                "terms": "clínica, centro médico, hospital"

             },
             "amenity/clock": {
                 "name": "Reloj"
             },
             "amenity/clock": {
                 "name": "Reloj"


@@ -952,10 +991,12 @@
                 "terms": "tribunal, magistratura, judicatura, audiencia,justicia"
             },
             "amenity/dentist": {
                 "terms": "tribunal, magistratura, judicatura, audiencia,justicia"
             },
             "amenity/dentist": {

-                "name": "Dentista"
+                "name": "Dentista",
+                "terms": "dentista, odontólogo"

             },
             "amenity/doctor": {
             },
             "amenity/doctor": {

-                "name": "Médico"
+                "name": "Médico",
+                "terms": "médico, doctor, facultativo, medicina, curador"

             },
             "amenity/drinking_water": {
                 "name": "Agua potable",
             },
             "amenity/drinking_water": {
                 "name": "Agua potable",


@@ -982,7 +1023,7 @@
                 "terms": "gasolinera,surtidor, estación de servicio"
             },
             "amenity/grave_yard": {
                 "terms": "gasolinera,surtidor, estación de servicio"
             },
             "amenity/grave_yard": {

-                "name": "Camposanto",
+                "name": "Cementerio",

                 "terms": "cementerio,camposanto, necrópolis, sacramental"
             },
             "amenity/hospital": {
                 "terms": "cementerio,camposanto, necrópolis, sacramental"
             },
             "amenity/hospital": {


@@ -1059,7 +1100,18 @@
                 "terms": "escuela,colegio, academia, instituto, liceo, conservatorio"
             },
             "amenity/shelter": {
                 "terms": "escuela,colegio, academia, instituto, liceo, conservatorio"
             },
             "amenity/shelter": {

-                "name": "Refugio"
+                "name": "Refugio",
+                "terms": "albergue, abrigo, amparo, asilo, cobertizo, garita, refugio"
+            },
+            "amenity/social_facility": {
+                "name": "Instalación social"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Banco de alimentos"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Refugio de vagabundos",
+                "terms": "Refugio social"

             },
             "amenity/swimming_pool": {
                 "name": "Piscina",
             },
             "amenity/swimming_pool": {
                 "name": "Piscina",


@@ -1078,7 +1130,7 @@
                 "terms": "Teatro"
             },
             "amenity/toilets": {
                 "terms": "Teatro"
             },
             "amenity/toilets": {

-                "name": "Baños",
+                "name": "Aseos",

                 "terms": "baños, baño, aseo, letrina, lavabo, servicio, tocador, ducha"
             },
             "amenity/townhall": {
                 "terms": "baños, baño, aseo, letrina, lavabo, servicio, tocador, ducha"
             },
             "amenity/townhall": {


@@ -1093,7 +1145,8 @@
                 "name": "Máquina expendedora"
             },
             "amenity/veterinary": {
                 "name": "Máquina expendedora"
             },
             "amenity/veterinary": {

-                "name": "Veterinario"
+                "name": "Veterinario",
+                "terms": "veterinario, albéitar, mascotas, animales"

             },
             "amenity/waste_basket": {
                 "name": "Papelera",
             },
             "amenity/waste_basket": {
                 "name": "Papelera",


@@ -1183,10 +1236,39 @@
                 "name": "Apartamentos",
                 "terms": "apartamento, piso, vivienda, alojamiento, buhardilla, estudio, edificio"
             },
                 "name": "Apartamentos",
                 "terms": "apartamento, piso, vivienda, alojamiento, buhardilla, estudio, edificio"
             },

+            "building/barn": {
+                "name": "Granero"
+            },
+            "building/bunker": {
+                "name": "Búnker",
+                "terms": "Fortaleza"
+            },
+            "building/cabin": {
+                "name": "Cabina"
+            },
+            "building/cathedral": {
+                "name": "Catedral",
+                "terms": "Iglesia, Lugar de culto, templo, basílica, parroquia, santuario, oratorio, iglesia, basílica"
+            },
+            "building/chapel": {
+                "name": "Capilla"
+            },
+            "building/church": {
+                "name": "Iglesia",
+                "terms": "templo, basílica, capilla, colegiata, parroquia, santuario, ermita, oratorio,iglesia, basílica, catedral"
+            },

             "building/commercial": {
                 "name": "Edificio comercial",
                 "terms": "centro comercial, edificio comercial"
             },
             "building/commercial": {
                 "name": "Edificio comercial",
                 "terms": "centro comercial, edificio comercial"
             },

+            "building/construction": {
+                "name": "Edificio bajo construcción",
+                "terms": "Edificio en construcción"
+            },
+            "building/detached": {
+                "name": "Casa unifamiliar",
+                "terms": "Chalet, unifamiliar"
+            },

             "building/entrance": {
                 "name": "Entrada",
                 "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, embocadura, agujero, hueco"
             "building/entrance": {
                 "name": "Entrada",
                 "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, embocadura, agujero, hueco"


@@ -1195,6 +1277,20 @@
                 "name": "Garaje",
                 "terms": "garaje,cochera"
             },
                 "name": "Garaje",
                 "terms": "garaje,cochera"
             },

+            "building/garages": {
+                "name": "Garajes",
+                "terms": "garajes, cocheras"
+            },
+            "building/greenhouse": {
+                "name": "Invernadero"
+            },
+            "building/hospital": {
+                "name": "Edificio hospital",
+                "terms": "Hospital, sanatorio, Centro de primeros auxilios"
+            },
+            "building/hotel": {
+                "name": "Edificio Hotel"
+            },

             "building/house": {
                 "name": "Casa",
                 "terms": "domicilio, hogar, vivienda, morada, residencia"
             "building/house": {
                 "name": "Casa",
                 "terms": "domicilio, hogar, vivienda, morada, residencia"


@@ -1207,52 +1303,164 @@
                 "name": "Edificio industrial",
                 "terms": "fábrica,factoría, industria, manufactura, taller, empresa, explotación"
             },
                 "name": "Edificio industrial",
                 "terms": "fábrica,factoría, industria, manufactura, taller, empresa, explotación"
             },

+            "building/public": {
+                "name": "Edificio Público"
+            },

             "building/residential": {
                 "name": "Edificio residencial",
                 "terms": "bloque"
             },
             "building/residential": {
                 "name": "Edificio residencial",
                 "terms": "bloque"
             },

+            "building/roof": {
+                "name": "Tejado"
+            },
+            "building/school": {
+                "name": "Edificio Escuela",
+                "terms": "Edificio colegio"
+            },
+            "building/shed": {
+                "name": "Cobertizo"
+            },
+            "building/stable": {
+                "name": "Establo",
+                "terms": "Cuadra, caballeriza"
+            },
+            "building/static_caravan": {
+                "name": "Caravana estática"
+            },
+            "building/terrace": {
+                "name": "Bloque"
+            },
+            "building/train_station": {
+                "name": "Estación de ferrocarril",
+                "terms": "parada, alto, detención, apeadero, terminal, tren, ferrocarril"
+            },
+            "building/university": {
+                "name": "Edificio universidad"
+            },
+            "building/warehouse": {
+                "name": "Almacén",
+                "terms": "almacén, depósito, bodega, lonja, nave"
+            },

             "craft/beekeeper": {
                 "name": "Apicultor"
             },
             "craft/blacksmith": {
                 "name": "Herrero"
             },
             "craft/beekeeper": {
                 "name": "Apicultor"
             },
             "craft/blacksmith": {
                 "name": "Herrero"
             },

+            "craft/boatbuilder": {
+                "name": "Constructor de barco"
+            },
+            "craft/bookbinder": {
+                "name": "Capa"
+            },
+            "craft/brewery": {
+                "name": "Cervecería"
+            },
+            "craft/carpenter": {
+                "name": "Carpintería",
+                "terms": "carpintero, ebanistería, ebanista, madera, madedero"
+            },
+            "craft/caterer": {
+                "name": "Abastecedor, Proveedor"
+            },
+            "craft/clockmaker": {
+                "name": "Relojero"
+            },
+            "craft/confectionary": {
+                "name": "Golosinas",
+                "terms": "golosinas, chucherías, caramelos"
+            },
+            "craft/dressmaker": {
+                "name": "Modista"
+            },
+            "craft/electrician": {
+                "name": "Electricista",
+                "terms": "electricista, iluminista, trabajo de electricista"
+            },
+            "craft/gardener": {
+                "name": "Jardinero, Jardinería"
+            },
+            "craft/glaziery": {
+                "name": "Vidriería"
+            },
+            "craft/handicraft": {
+                "name": "Artesanía"
+            },

             "craft/hvac": {
                 "name": "Aire acondicionado"
             },
             "craft/insulator": {
                 "name": "Aislante"
             },
             "craft/hvac": {
                 "name": "Aire acondicionado"
             },
             "craft/insulator": {
                 "name": "Aislante"
             },

+            "craft/jeweler": {
+                "name": "Joyería",
+                "terms": "joyero, relojería, relojero, platería, orfebrería, orfebre"
+            },
+            "craft/locksmith": {
+                "name": "Cerrajero",
+                "terms": "Cerrajero, cerraduras"
+            },

             "craft/metal_construction": {
                 "name": "Construcción metálica"
             },
             "craft/metal_construction": {
                 "name": "Construcción metálica"
             },

+            "craft/optician": {
+                "name": "Óptico",
+                "terms": "óptico, óptica, gafas"
+            },
+            "craft/painter": {
+                "name": "Pintor, albañil"
+            },

             "craft/photographer": {
             "craft/photographer": {

-                "name": "Fotógrafo"
+                "name": "Fotógrafo",
+                "terms": "fotógrafo, retratista"

             },
             "craft/photographic_labratory": {
                 "name": "Laboratorio fotográfico"
             },
             },
             "craft/photographic_labratory": {
                 "name": "Laboratorio fotográfico"
             },

+            "craft/plasterer": {
+                "name": "Yesero",
+                "terms": "yeso, albañil, obra"
+            },

             "craft/plumber": {
                 "name": "Fontanero"
             },
             "craft/pottery": {
             "craft/plumber": {
                 "name": "Fontanero"
             },
             "craft/pottery": {

+                "name": "Cerámica",

                 "terms": "cerámica, cerasmista, alfarería, cantarería, alcaller, alfar"
             },
             "craft/saddler": {
                 "terms": "guarnicionero, talabartero, guarnicería"
             },
             "craft/sailmaker": {
                 "terms": "cerámica, cerasmista, alfarería, cantarería, alcaller, alfar"
             },
             "craft/saddler": {
                 "terms": "guarnicionero, talabartero, guarnicería"
             },
             "craft/sailmaker": {

+                "name": "Velero",

                 "terms": "Fabricante de velas"
             },
                 "terms": "Fabricante de velas"
             },

+            "craft/sawmill": {
+                "name": "Aserradero"
+            },
+            "craft/scaffolder": {
+                "name": "Andamiaje"
+            },

             "craft/sculpter": {
             "craft/sculpter": {

+                "name": "Escultor",

                 "terms": "escultor, artista, cincelador, imaginero, tallista, modelista"
             },
             "craft/shoemaker": {
                 "terms": "escultor, artista, cincelador, imaginero, tallista, modelista"
             },
             "craft/shoemaker": {

-                "name": "zapatero, remendón, zapatería, arreglo de zapatos"
+                "name": "zapatero, remendón, zapatería, arreglo de zapatos",
+                "terms": "zapatero, remendón"
+            },
+            "craft/tailor": {
+                "name": "Sastre"

             },
             "craft/upholsterer": {
                 "name": "Tapicero"
             },
             },
             "craft/upholsterer": {
                 "name": "Tapicero"
             },

+            "craft/watchmaker": {
+                "name": "Relojero"
+            },
+            "craft/window_construction": {
+                "name": "Construcción de ventanas"
+            },

             "embankment": {
                 "name": "Terraplén"
             },
             "embankment": {
                 "name": "Terraplén"
             },


@@ -1272,7 +1480,8 @@
                 "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, entrada, portilla"
             },
             "footway/crossing": {
                 "terms": "puerta, portal, vestíbulo, umbral, soportal, pórtico, abertura, acceso, boca, entrada, portilla"
             },
             "footway/crossing": {

-                "name": "Cruce peatonal"
+                "name": "Cruce peatonal",
+                "terms": "cruce, travesía, paso, cruzamiento, pasaje, vado, paseo, traviesa, paso de peatones"

             },
             "footway/sidewalk": {
                 "name": "Acera",
             },
             "footway/sidewalk": {
                 "name": "Acera",


@@ -1349,7 +1558,8 @@
                 "terms": "calle, vía, paseo, avenida, bulevar, rambla, ronda, carrera, arteria, corredera, callejón, travesía, pasadizo, pasaje, rúa, vial, costanilla, callejuela"
             },
             "highway/rest_area": {
                 "terms": "calle, vía, paseo, avenida, bulevar, rambla, ronda, carrera, arteria, corredera, callejón, travesía, pasadizo, pasaje, rúa, vial, costanilla, callejuela"
             },
             "highway/rest_area": {

-                "name": "Área de Descanso"
+                "name": "Área de Descanso",
+                "terms": "Área de descanso"

             },
             "highway/road": {
                 "name": "Carretera sin categoría conocida",
             },
             "highway/road": {
                 "name": "Carretera sin categoría conocida",


@@ -1388,14 +1598,16 @@
                 "terms": "aparcamiento, parking"
             },
             "highway/services": {
                 "terms": "aparcamiento, parking"
             },
             "highway/services": {

-                "name": "Área de Servicio"
+                "name": "Área de Servicio",
+                "terms": "área de servicios, área de descanso"

             },
             "highway/steps": {
                 "name": "Escaleras",
                 "terms": "escalera, escalinata, grada, gradería, escala, escalerilla, peldaños, escalones"
             },
             "highway/stop": {
             },
             "highway/steps": {
                 "name": "Escaleras",
                 "terms": "escalera, escalinata, grada, gradería, escala, escalerilla, peldaños, escalones"
             },
             "highway/stop": {

-                "name": "Señal de Stop"
+                "name": "Señal de Stop",
+                "terms": "señal de detención, señal de parada, señal, stop, detención, parada"

             },
             "highway/tertiary": {
                 "name": "Carretera local",
             },
             "highway/tertiary": {
                 "name": "Carretera local",


@@ -1494,7 +1706,8 @@
                 "terms": "Granja"
             },
             "landuse/farmland": {
                 "terms": "Granja"
             },
             "landuse/farmland": {

-                "name": "Tierra de labranza"
+                "name": "Tierra de labranza",
+                "terms": "granja, tierra de cultivo"

             },
             "landuse/farmyard": {
                 "name": "Tierras de cultivo",
             },
             "landuse/farmyard": {
                 "name": "Tierras de cultivo",


@@ -1684,10 +1897,15 @@
                 "terms": "Aerodromo, Aeropuerto, Pista"
             },
             "military/barracks": {
                 "terms": "Aerodromo, Aeropuerto, Pista"
             },
             "military/barracks": {

-                "name": "Cuartel"
+                "name": "Cuartel",
+                "terms": "cuartel, barracones, acantonamiento, acuartelamiento, campamento"

             },
             "military/bunker": {
             },
             "military/bunker": {

-                "name": "Búnker"
+                "name": "Búnker",
+                "terms": "búnker, refugio subterráneo"
+            },
+            "military/range": {
+                "name": "Rango militar"

             },
             "natural": {
                 "name": "Natural",
             },
             "natural": {
                 "name": "Natural",


@@ -1849,8 +2067,8 @@
                 "terms": "urbe, capital, metrópoli, ciudad, núcleo urbano, localidad, villa"
             },
             "place/hamlet": {
                 "terms": "urbe, capital, metrópoli, ciudad, núcleo urbano, localidad, villa"
             },
             "place/hamlet": {

-                "name": "Aldea",
-                "terms": "aldea, caserío, poblado, pueblo, aldehuela, aldeorrio, villorrio, pueblecito"
+                "name": "Aldea o barrio",
+                "terms": "aldea, caserío, poblado, pueblo, aldehuela, aldeorrio, villorrio, localidad, barrio, vecindario"

             },
             "place/island": {
                 "name": "Isla",
             },
             "place/island": {
                 "name": "Isla",


@@ -1911,7 +2129,8 @@
                 "name": "Plataforma"
             },
             "public_transport/stop_position": {
                 "name": "Plataforma"
             },
             "public_transport/stop_position": {

-                "name": "Punto de parada"
+                "name": "Punto de parada",
+                "terms": "punto de detención, stop, parada"

             },
             "railway": {
                 "name": "Ferrocarril",
             },
             "railway": {
                 "name": "Ferrocarril",


@@ -1940,6 +2159,9 @@
                 "name": "Monorraíl ",
                 "terms": "Monorail"
             },
                 "name": "Monorraíl ",
                 "terms": "Monorail"
             },

+            "railway/narrow_gauge": {
+                "name": "Carril de vía estrecha"
+            },

             "railway/platform": {
                 "name": "Andén",
                 "terms": "Andén de ferrocarril"
             "railway/platform": {
                 "name": "Andén",
                 "terms": "Andén de ferrocarril"


@@ -1980,6 +2202,10 @@
                 "name": "Licorería",
                 "terms": "licor, trago, bebida, alcohol, tienda, licorería"
             },
                 "name": "Licorería",
                 "terms": "licor, trago, bebida, alcohol, tienda, licorería"
             },

+            "shop/art": {
+                "name": "Tienda de arte",
+                "terms": "Galería de arte"
+            },

             "shop/bakery": {
                 "name": "Panadería o pastelería",
                 "terms": "panadería, horno, tahona, tienda, pastelería, confitería, pastel, pan, bollería, bollo"
             "shop/bakery": {
                 "name": "Panadería o pastelería",
                 "terms": "panadería, horno, tahona, tienda, pastelería, confitería, pastel, pan, bollería, bollo"


@@ -1996,6 +2222,9 @@
                 "name": "Tienda de bicicletas",
                 "terms": "tienda de bicicletas, bici"
             },
                 "name": "Tienda de bicicletas",
                 "terms": "tienda de bicicletas, bici"
             },

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

             "shop/books": {
                 "name": "Librería",
                 "terms": "librería, venta de libros"
             "shop/books": {
                 "name": "Librería",
                 "terms": "librería, venta de libros"


@@ -2112,6 +2341,9 @@
             "shop/locksmith": {
                 "name": "Cerrajero"
             },
             "shop/locksmith": {
                 "name": "Cerrajero"
             },

+            "shop/lottery": {
+                "name": "Administración de loterías"
+            },

             "shop/mall": {
                 "name": "Centro comercial",
                 "terms": "mall,centro comercial,plaza comercial"
             "shop/mall": {
                 "name": "Centro comercial",
                 "terms": "mall,centro comercial,plaza comercial"


@@ -2209,16 +2441,16 @@
                 "terms": "casa"
             },
             "tourism/guest_house": {
                 "terms": "casa"
             },
             "tourism/guest_house": {

-                "name": "Pensión",
-                "terms": "hostal,hotel,pensión"
+                "name": "Hospedaje",
+                "terms": "hostal, hotel, pensión, B&B, Bed & Breakfast, casa rural, bed and breakfast, posada, cama y desayuno, alojamiento, alojamiento rural, agroturismo, casa de aldea, casa de labranza, hostería"

             },
             "tourism/hostel": {
                 "name": "Albergue",
             },
             "tourism/hostel": {
                 "name": "Albergue",

-                "terms": "hostal,hotel,pensión"
+                "terms": "hostal, hotel, pensión, alojamiento, albergue, hostería"

             },
             "tourism/hotel": {
                 "name": "Hotel",
             },
             "tourism/hotel": {
                 "name": "Hotel",

-                "terms": "hotel,hostal,pensión"
+                "terms": "hotel, hostal, pensión, alojamiento"

             },
             "tourism/information": {
                 "name": "Información",
             },
             "tourism/information": {
                 "name": "Información",


@@ -2226,7 +2458,7 @@
             },
             "tourism/motel": {
                 "name": "Motel",
             },
             "tourism/motel": {
                 "name": "Motel",

-                "terms": "hostal,hotel.motel,pensión"
+                "terms": "hostal, hotel, motel, pensión, alojamiento"

             },
             "tourism/museum": {
                 "name": "Museo",
             },
             "tourism/museum": {
                 "name": "Museo",


@@ -2237,10 +2469,12 @@
                 "terms": "picnic,barbacoa,espercimiento"
             },
             "tourism/theme_park": {
                 "terms": "picnic,barbacoa,espercimiento"
             },
             "tourism/theme_park": {

-                "name": "Parque temático"
+                "name": "Parque temático",
+                "terms": "parque temático, parque de atracciones, atracciones"

             },
             "tourism/viewpoint": {
             },
             "tourism/viewpoint": {

-                "name": "Vista panorámica"
+                "name": "Vista panorámica",
+                "terms": "oteadero, punto de vista, mirador, vistas"

             },
             "tourism/zoo": {
                 "name": "Zoo",
             },
             "tourism/zoo": {
                 "name": "Zoo",


@@ -2270,22 +2504,27 @@
                 "name": "Ruta en bicicleta"
             },
             "type/route/bus": {
                 "name": "Ruta en bicicleta"
             },
             "type/route/bus": {

-                "name": "Ruta del colectivo"
+                "name": "Ruta del colectivo",
+                "terms": "ruta de autobús, ruta de bus, línea de autobús, recorrido, trayecto, itinerario, bus, autobús"

             },
             "type/route/detour": {
             },
             "type/route/detour": {

-                "name": "Ruta de desvío"
+                "name": "Ruta de desvío",
+                "terms": "ruta de desvío, dirección alternativa, alternativa, ruta, itinerario alternativo,"

             },
             "type/route/ferry": {
             },
             "type/route/ferry": {

-                "name": "Ruta de Ferry"
+                "name": "Ruta de Ferry",
+                "terms": "ruta, itinerario, rumbo, dirección, trayecto, ferry, transbordador"

             },
             "type/route/foot": {
             },
             "type/route/foot": {

-                "name": "Ruta a pie"
+                "name": "Ruta a pie",
+                "terms": "ruta, itinerario, rumbo, dirección, trayecto, peatonal, pie, senderismo , camino, derrotero, vía"

             },
             "type/route/hiking": {
                 "name": "Ruta de senderismo"
             },
             "type/route/pipeline": {
             },
             "type/route/hiking": {
                 "name": "Ruta de senderismo"
             },
             "type/route/pipeline": {

-                "name": "Ruta de tubería"
+                "name": "Ruta de tubería",
+                "terms": "ruta, itinerario, rumbo, dirección, trayecto, ferry, trasbordador, tubería, gasoducto, oleoducto, conducto, cañería"

             },
             "type/route/power": {
                 "name": "Ruta de red elécrica"
             },
             "type/route/power": {
                 "name": "Ruta de red elécrica"


@@ -2303,7 +2542,8 @@
                 "name": "Ruta maestra"
             },
             "vertex": {
                 "name": "Ruta maestra"
             },
             "vertex": {

-                "name": "Otro"
+                "name": "Otro",
+                "terms": "diferente, distinto, ajeno, otro"

             },
             "waterway": {
                 "name": "Vía fluvial",
             },
             "waterway": {
                 "name": "Vía fluvial",

diff --git a/vendor/assets/iD/iD/locales/fi.json b/vendor/assets/iD/iD/locales/fi.json
index c41a6934634af730b7b05b7332ef564d6848e224..b3930bd81adb27e8fc504fee5e5abbe154c15c6e 100644 (file)
--- a/vendor/assets/iD/iD/locales/fi.json
+++ b/vendor/assets/iD/iD/locales/fi.json
@@ -488,6 +488,9 @@
                 "label": "Vaunun matkustajamäärä",
                 "placeholder": "2, 4, 8..."
             },
                 "label": "Vaunun matkustajamäärä",
                 "placeholder": "2, 4, 8..."
             },

+            "aerialway/summer/access": {
+                "label": "Käyttöoikeus kesällä"
+            },

             "aeroway": {
                 "label": "Tyyppi"
             },
             "aeroway": {
                 "label": "Tyyppi"
             },


@@ -521,6 +524,9 @@
             "building_area": {
                 "label": "Rakennus"
             },
             "building_area": {
                 "label": "Rakennus"
             },

+            "cans": {
+                "label": "Tölkinkeräys"
+            },

             "capacity": {
                 "label": "Paikkamäärä",
                 "placeholder": "50, 100, 200..."
             "capacity": {
                 "label": "Paikkamäärä",
                 "placeholder": "50, 100, 200..."


@@ -535,6 +541,9 @@
                     "anticlockwise": "Vastapäivään"
                 }
             },
                     "anticlockwise": "Vastapäivään"
                 }
             },

+            "clothes": {
+                "label": "Vaatekeräys"
+            },

             "collection_times": {
                 "label": "Tyhjennysaika"
             },
             "collection_times": {
                 "label": "Tyhjennysaika"
             },


@@ -544,6 +553,9 @@
             "country": {
                 "label": "Maa"
             },
             "country": {
                 "label": "Maa"
             },

+            "covered": {
+                "label": "Katos"
+            },

             "crossing": {
                 "label": "Tyyppi"
             },
             "crossing": {
                 "label": "Tyyppi"
             },


@@ -593,6 +605,9 @@
             "generator/type": {
                 "label": "Tyyppi"
             },
             "generator/type": {
                 "label": "Tyyppi"
             },

+            "glass": {
+                "label": "Lasinkeräys"
+            },

             "highway": {
                 "label": "Tyyppi"
             },
             "highway": {
                 "label": "Tyyppi"
             },


@@ -606,7 +621,7 @@
                 "label": "ICAO"
             },
             "incline": {
                 "label": "ICAO"
             },
             "incline": {

-                "label": "Kallista"
+                "label": "Kaltevuus"

             },
             "internet_access": {
                 "label": "Internet-yhteys",
             },
             "internet_access": {
                 "label": "Internet-yhteys",


@@ -674,6 +689,9 @@
             "operator": {
                 "label": "Toimija"
             },
             "operator": {
                 "label": "Toimija"
             },

+            "paper": {
+                "label": "Paperinkeräys"
+            },

             "park_ride": {
                 "label": "Autoparkki"
             },
             "park_ride": {
                 "label": "Autoparkki"
             },


@@ -730,7 +748,7 @@
                 "label": "Tyyppi"
             },
             "sac_scale": {
                 "label": "Tyyppi"
             },
             "sac_scale": {

-                "label": "Polun haastavuus"
+                "label": "Haastavuus"

             },
             "service": {
                 "label": "Tyyppi"
             },
             "service": {
                 "label": "Tyyppi"


@@ -776,7 +794,7 @@
                 "label": "Tyyppi"
             },
             "trail_visibility": {
                 "label": "Tyyppi"
             },
             "trail_visibility": {

-                "label": "Polun näkyvyys"
+                "label": "Näkyvyys"

             },
             "tunnel": {
                 "label": "Tunneli"
             },
             "tunnel": {
                 "label": "Tunneli"


@@ -1028,6 +1046,10 @@
             "amenity/pub": {
                 "name": "Pubi"
             },
             "amenity/pub": {
                 "name": "Pubi"
             },

+            "amenity/recycling": {
+                "name": "Kierrätyspiste",
+                "terms": "kierrättäminen, kierrätys, lajittelu, uudelleenkäyttö, uudelleenkäyttäminen, ympäristö, lajittelupiste, lajitteluasema, jäte, jätteet, roskat, roska, roskikset, roskis, säiliö, roskasäiliö"
+            },

             "amenity/restaurant": {
                 "name": "Ravintola"
             },
             "amenity/restaurant": {
                 "name": "Ravintola"
             },


@@ -1895,7 +1917,7 @@
             },
             "shop/hairdresser": {
                 "name": "Parturi-kampaamo",
             },
             "shop/hairdresser": {
                 "name": "Parturi-kampaamo",

-                "terms": "parturi, kampaaja, parturi-kampaamo, hiustenleikkuu, hiukset, hiusliike, hiusmyymälä, hiustenvärjäys, parranajo, parta"
+                "terms": "parturi, kampaaja, kampaamo, parturi-kampaamo, hiustenleikkuu, hiukset, hiusliike, hiusmyymälä, hiustenvärjäys, parranajo, parta"

             },
             "shop/hardware": {
                 "name": "Rautakauppa"
             },
             "shop/hardware": {
                 "name": "Rautakauppa"

diff --git a/vendor/assets/iD/iD/locales/fr.json b/vendor/assets/iD/iD/locales/fr.json
index 9eddaeed243d48bfa9c83175d419d0f307bfffc0..f78780555fa80d756589dd869fc7150e973ef458 100644 (file)
--- a/vendor/assets/iD/iD/locales/fr.json
+++ b/vendor/assets/iD/iD/locales/fr.json
@@ -332,6 +332,7 @@
     },
     "help": {
         "title": "Aide",
     },
     "help": {
         "title": "Aide",

+        "help": "#Aide\n\n Ceci est un éditeur pour [OpenStreetMap](http://www.openstreetmap.org/), la carte du\n monde gratuite et éditable. Vous pouvez l'utiliser pour ajouter ou corriger les données\n dans votre zone, et participer ainsi à la réalisation d'une carte du monde libre de droits.\n\n Les modifications que vous réaliserez seront visibles de tout le monde. Pour commencer\n à éditer, vous devez créer un [compte gratuit sur OpenStreetMap](https://www.openstreetmap.org/user/new).\n\n [iD editor](http://ideditor.com/) est un projet collaboratif dont le [code source est\n disponible sur GitHub](https://github.com/openstreetmap/iD).\n",

         "editing_saving": "# Éditer et sauvegarder⏎\n⏎\nCet éditeur est conçu principalement pour travailler en mode connecté, et vous l'accéder depuis un site Web en ce moment.⏎\n⏎\n### Sélectionner un élément de la carte⏎\n⏎\nPour sélection un élément de la carte, tel qu'une rue ou un point d'intérêt, cliquez sur ce dernier⏎\nsur la carte. Cette action mettra l'élément en surbrillance, et ouvrira le panneau latéral⏎\nqui affiche les propriétés de l'élément. Un menu apparaîtra également sur la carte,⏎\npermettant de poser des actions sur l'élément (telles que le déplacer, repositionner⏎\nses points constituants, etc).\n⏎\nPour sélectionner plusieurs éléments, appuyez sur la touche 'Majuscule'. Puis, cliquez⏎\nun à un sur les éléments à sélectionner. Alternativement, il est possible de dessinez un rectangle⏎\nsur la carte (toujours en appuyant sur 'Majuscule) pour effectuer la sélection multiple.⏎\nles points à sélectionner.⏎\n⏎\n### Enregistrer les modifications⏎\n⏎\nL'éditeur enregistre localement (sur votre ordinateur) toutes les modifications⏎\nque vous effectuez sur les éléments de la carte (les rues, les bâtiments, etc.).⏎\nCes modifications seront envoyées au serveur OpenStreetMap uniquement⏎\nlorsque vous appuierez sur \"Sauvegarder\".⏎\n⏎\nNe vous faites donc pas de souci si vous faites une erreur. Vous pouvez annuler⏎\ntout changement effectué en appuyant sur le bouton d'annulation (la flèche de demi-tour⏎\npointant vers la gauche).⏎\n⏎\nLorsque vous avez terminé un groupe de modifications - par exemple, vous avez⏎\ncomplété une partie de la ville et vous voulez en débuter une nouvelle,⏎\nil suffit d'appuyer sur le bouton \"Sauvegarder\". Vos changements ne seront pas⏎\nenvoyés immédiatement - vous avez l'occasion de réviser le travail effectué⏎\navant de confirmer les changements. ⏎\n⏎\nSi tout semble bon, entrez un commentaire décrivant vos changements⏎\n(par exemple: \"Ajout d'une boulangerie\" ou \"Ajout de commerces du quartier\"),⏎\npuis appuyez à nouveau sur le bouton 'Sauvegarder' (qui, cette fois-ci, apparaîtra\nen bleu dans le panneau latéral). Vos changements seront alors envoyés à⏎\n[OpenStreetMap.org](http://www.openstreetmap.org/), où il seront partagés et rendus⏎\nvisibles à tous les autres utilisateurs.\n⏎\nSi vous ne pouvez pas terminer vos changements en une seule séance, vous pouvez⏎\nfermer la fenêtre de l'éditeur. Vos changements seront enregistrés localement.⏎\nLorsque vous ouvrirez à nouveau l'éditeur, sur le même ordinateur et avec le même⏎\nnavigateur Web, l'éditeur vous proposera de récupérer le travail de la séance précédente.⏎\n",
         "roads": "# Routes\n\nVous pouvez créer, mettre à jour et supprimer des routes à l'aide de l'éditeur. Il peut s'agir de tous types de routes : chemins, autoroutes, pistes cyclables, et plus encore : toute voie régulièrement fréquentée peut être cartographiée.\n\n### Sélection\n\nCliquez sur une route pour la sélectionner. Elle sera alors surlignée et un menu 'outils' apparaîtra sur la carte, ainsi qu'une barre d'état affichant des informations supplémentaires.\n\n### Modification\n\nIl est fréquent que les routes ne soient pas bien alignées avec l'imagerie satellite ou avec les traces GPS. Vous pouvez ajuster et corriger la position des routes.\n\nCliquez d'abord sur la route à modifier. Elle est alors surlignée et des points de contrôle apparaissent qui permettent de corriger sa position. Pour ajouter des points de contrôle, double-cliquez sur un segment de la route sans nœuds.\n\nSi la route est connectée à une autre, mais que la connexion est incorrecte, vous pouvez déplacer un de ses points de contrôle sur la seconde route pour corriger la connexion. Des routes bien connectées sont essentielles pour la carte et pour fournir de bonnes informations d'itinéraire.\n\nVous pouvez également cliquer sur l'outil 'Déplacer' ou appuyer sur le raccourci `M` pour déplacer l'ensemble de la route en une fois, puis cliquer de nouveau une fois pour sauvegarder le déplacement.\n\n### Suppression\n\nSi une route est complètement fausse - c'est-à-dire qu'elle n'apparaît pas sur l'image satellite, et que dans l'idéal, vous avez confirmé qu'elle n'existe pas sur le terrain - vous pouvez la supprimer, ce qui l'enlèvera de la carte. Faites attention lorsque vous supprimez des éléments : comme n'importe quelle autre modification, le résultat sera visible par tout le monde sur la carte. Les photos aériennes sont souvent dépassées et la route est peut-être tout simplement récente.\n\nPour supprimer une route, sélectionnez-la en cliquant dessus, puis cliquez sur l'icône 'Poubelle' ou appuyez sur la touche 'Suppr'.\n\n### Création\n\nVous avez constaté qu'une route de votre connaissance manque à la carte ? Cliquez sur l'icône 'Ligne' en haut à gauche de l'éditeur ou appuyez sur le raccourci `2` pour dessiner une route. \n\nPour commencer le dessin, cliquez sur l'endroit où commence la route. Si elle commence à l'embranchement d'une autre route, commencez le dessin en cliquant à l'endroit de la connexion.\n\nCliquez ensuite régulièrement le long de la route pour ajouter des points, en utilisant l'imagerie satellite comme référence. Si la route que vous dessinez croise une autre route, connectez les deux en cliquant à l'endroit de l'intersection. Lorsque vous avez terminé le dessin, double-cliquez ou appuyez sur 'Entrée'.\n",
         "gps": "# GPS⏎\n⏎\nLes traces GPS sont les données les plus fiables pour OpenStreetMap. ⏎\nCet éditeur connaît les traces au format  -`.gpx`. Vous pouvez enregistrer ce\ntype de traces avec un grand nombre d'applications pour smartphones\nainsi qu'avec certains GPS de randonnées.⏎\n⏎\nPour plus d'informations sur la manière de relever des traces GPS, vous\npouvez consulter le guide [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).⏎\n⏎\nPour utiliser un relevé GPX, il vous suffit de glisser-déposer le fichier GPX\ndirectement sur la carte. S'il est reconnu, il sera ajouté sur la carte sous\nla forme d'une ligne vert clair. Cliquez sur le menu \"Configuration du fond\nde carte\" à gauche pour activer et désactiver l'affichage de la trace, ou\nencore pour centrer le zoom sur la trace.⏎\n⏎\nLes traces GPX ne sont pas directement enregistrée dans OpenStreetMap.⏎\nLe meilleur moyen de les utiliser est de les prendre comme guide pour ajouter⏎\nvous même des informations sur la carte ou bien en les [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)⏎\npour les fournir aux autres contributeurs⏎\n",
         "editing_saving": "# Éditer et sauvegarder⏎\n⏎\nCet éditeur est conçu principalement pour travailler en mode connecté, et vous l'accéder depuis un site Web en ce moment.⏎\n⏎\n### Sélectionner un élément de la carte⏎\n⏎\nPour sélection un élément de la carte, tel qu'une rue ou un point d'intérêt, cliquez sur ce dernier⏎\nsur la carte. Cette action mettra l'élément en surbrillance, et ouvrira le panneau latéral⏎\nqui affiche les propriétés de l'élément. Un menu apparaîtra également sur la carte,⏎\npermettant de poser des actions sur l'élément (telles que le déplacer, repositionner⏎\nses points constituants, etc).\n⏎\nPour sélectionner plusieurs éléments, appuyez sur la touche 'Majuscule'. Puis, cliquez⏎\nun à un sur les éléments à sélectionner. Alternativement, il est possible de dessinez un rectangle⏎\nsur la carte (toujours en appuyant sur 'Majuscule) pour effectuer la sélection multiple.⏎\nles points à sélectionner.⏎\n⏎\n### Enregistrer les modifications⏎\n⏎\nL'éditeur enregistre localement (sur votre ordinateur) toutes les modifications⏎\nque vous effectuez sur les éléments de la carte (les rues, les bâtiments, etc.).⏎\nCes modifications seront envoyées au serveur OpenStreetMap uniquement⏎\nlorsque vous appuierez sur \"Sauvegarder\".⏎\n⏎\nNe vous faites donc pas de souci si vous faites une erreur. Vous pouvez annuler⏎\ntout changement effectué en appuyant sur le bouton d'annulation (la flèche de demi-tour⏎\npointant vers la gauche).⏎\n⏎\nLorsque vous avez terminé un groupe de modifications - par exemple, vous avez⏎\ncomplété une partie de la ville et vous voulez en débuter une nouvelle,⏎\nil suffit d'appuyer sur le bouton \"Sauvegarder\". Vos changements ne seront pas⏎\nenvoyés immédiatement - vous avez l'occasion de réviser le travail effectué⏎\navant de confirmer les changements. ⏎\n⏎\nSi tout semble bon, entrez un commentaire décrivant vos changements⏎\n(par exemple: \"Ajout d'une boulangerie\" ou \"Ajout de commerces du quartier\"),⏎\npuis appuyez à nouveau sur le bouton 'Sauvegarder' (qui, cette fois-ci, apparaîtra\nen bleu dans le panneau latéral). Vos changements seront alors envoyés à⏎\n[OpenStreetMap.org](http://www.openstreetmap.org/), où il seront partagés et rendus⏎\nvisibles à tous les autres utilisateurs.\n⏎\nSi vous ne pouvez pas terminer vos changements en une seule séance, vous pouvez⏎\nfermer la fenêtre de l'éditeur. Vos changements seront enregistrés localement.⏎\nLorsque vous ouvrirez à nouveau l'éditeur, sur le même ordinateur et avec le même⏎\nnavigateur Web, l'éditeur vous proposera de récupérer le travail de la séance précédente.⏎\n",
         "roads": "# Routes\n\nVous pouvez créer, mettre à jour et supprimer des routes à l'aide de l'éditeur. Il peut s'agir de tous types de routes : chemins, autoroutes, pistes cyclables, et plus encore : toute voie régulièrement fréquentée peut être cartographiée.\n\n### Sélection\n\nCliquez sur une route pour la sélectionner. Elle sera alors surlignée et un menu 'outils' apparaîtra sur la carte, ainsi qu'une barre d'état affichant des informations supplémentaires.\n\n### Modification\n\nIl est fréquent que les routes ne soient pas bien alignées avec l'imagerie satellite ou avec les traces GPS. Vous pouvez ajuster et corriger la position des routes.\n\nCliquez d'abord sur la route à modifier. Elle est alors surlignée et des points de contrôle apparaissent qui permettent de corriger sa position. Pour ajouter des points de contrôle, double-cliquez sur un segment de la route sans nœuds.\n\nSi la route est connectée à une autre, mais que la connexion est incorrecte, vous pouvez déplacer un de ses points de contrôle sur la seconde route pour corriger la connexion. Des routes bien connectées sont essentielles pour la carte et pour fournir de bonnes informations d'itinéraire.\n\nVous pouvez également cliquer sur l'outil 'Déplacer' ou appuyer sur le raccourci `M` pour déplacer l'ensemble de la route en une fois, puis cliquer de nouveau une fois pour sauvegarder le déplacement.\n\n### Suppression\n\nSi une route est complètement fausse - c'est-à-dire qu'elle n'apparaît pas sur l'image satellite, et que dans l'idéal, vous avez confirmé qu'elle n'existe pas sur le terrain - vous pouvez la supprimer, ce qui l'enlèvera de la carte. Faites attention lorsque vous supprimez des éléments : comme n'importe quelle autre modification, le résultat sera visible par tout le monde sur la carte. Les photos aériennes sont souvent dépassées et la route est peut-être tout simplement récente.\n\nPour supprimer une route, sélectionnez-la en cliquant dessus, puis cliquez sur l'icône 'Poubelle' ou appuyez sur la touche 'Suppr'.\n\n### Création\n\nVous avez constaté qu'une route de votre connaissance manque à la carte ? Cliquez sur l'icône 'Ligne' en haut à gauche de l'éditeur ou appuyez sur le raccourci `2` pour dessiner une route. \n\nPour commencer le dessin, cliquez sur l'endroit où commence la route. Si elle commence à l'embranchement d'une autre route, commencez le dessin en cliquant à l'endroit de la connexion.\n\nCliquez ensuite régulièrement le long de la route pour ajouter des points, en utilisant l'imagerie satellite comme référence. Si la route que vous dessinez croise une autre route, connectez les deux en cliquant à l'endroit de l'intersection. Lorsque vous avez terminé le dessin, double-cliquez ou appuyez sur 'Entrée'.\n",
         "gps": "# GPS⏎\n⏎\nLes traces GPS sont les données les plus fiables pour OpenStreetMap. ⏎\nCet éditeur connaît les traces au format  -`.gpx`. Vous pouvez enregistrer ce\ntype de traces avec un grand nombre d'applications pour smartphones\nainsi qu'avec certains GPS de randonnées.⏎\n⏎\nPour plus d'informations sur la manière de relever des traces GPS, vous\npouvez consulter le guide [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).⏎\n⏎\nPour utiliser un relevé GPX, il vous suffit de glisser-déposer le fichier GPX\ndirectement sur la carte. S'il est reconnu, il sera ajouté sur la carte sous\nla forme d'une ligne vert clair. Cliquez sur le menu \"Configuration du fond\nde carte\" à gauche pour activer et désactiver l'affichage de la trace, ou\nencore pour centrer le zoom sur la trace.⏎\n⏎\nLes traces GPX ne sont pas directement enregistrée dans OpenStreetMap.⏎\nLe meilleur moyen de les utiliser est de les prendre comme guide pour ajouter⏎\nvous même des informations sur la carte ou bien en les [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)⏎\npour les fournir aux autres contributeurs⏎\n",


@@ -481,7 +482,8 @@
                 "label": "Accès"
             },
             "aerialway/capacity": {
                 "label": "Accès"
             },
             "aerialway/capacity": {

-                "label": "Capacité (par heure)"
+                "label": "Capacité (par heure)",
+                "placeholder": "500, 2500, 5000..."

             },
             "aerialway/duration": {
                 "label": "Durée (minutes)",
             },
             "aerialway/duration": {
                 "label": "Durée (minutes)",


@@ -490,6 +492,10 @@
             "aerialway/heating": {
                 "label": "Chauffé"
             },
             "aerialway/heating": {
                 "label": "Chauffé"
             },

+            "aerialway/occupancy": {
+                "label": "Nombre de places",
+                "placeholder": "2, 4, 8..."
+            },

             "aerialway/summer/access": {
                 "label": "Accès (été)"
             },
             "aerialway/summer/access": {
                 "label": "Accès (été)"
             },


@@ -716,6 +722,9 @@
             "piste/difficulty": {
                 "label": "Difficulté"
             },
             "piste/difficulty": {
                 "label": "Difficulté"
             },

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

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


@@ -786,6 +795,9 @@
                     "cutting": "Tranchée"
                 }
             },
                     "cutting": "Tranchée"
                 }
             },

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

             "supervised": {
                 "label": "Supervisé"
             },
             "supervised": {
                 "label": "Supervisé"
             },


@@ -844,12 +856,37 @@
                 "name": "Adresse",
                 "terms": "Adresse"
             },
                 "name": "Adresse",
                 "terms": "Adresse"
             },

+            "aerialway": {
+                "name": "Remontée mécanique"
+            },

             "aerialway/cable_car": {
                 "name": "Téléphérique"
             },
             "aerialway/chair_lift": {
                 "name": "Télésiège"
             },
             "aerialway/cable_car": {
                 "name": "Téléphérique"
             },
             "aerialway/chair_lift": {
                 "name": "Télésiège"
             },

+            "aerialway/gondola": {
+                "name": "Gondole"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Bande transporteuse de personnes"
+            },
+            "aerialway/platter": {
+                "name": "Téléski",
+                "terms": "Remonte-pente, tire-fesses, téléski à enrouleurs, téléski à perches débrayables"
+            },
+            "aerialway/pylon": {
+                "name": "Pylône de remontée mécanique"
+            },
+            "aerialway/rope_tow": {
+                "name": "Télécorde"
+            },
+            "aerialway/station": {
+                "name": "Gare de remontée mécanique"
+            },
+            "aerialway/t-bar": {
+                "name": "Téléski bi-place"
+            },

             "aeroway": {
                 "name": "Aviation",
                 "terms": "Piste de décollage, Piste d'atterissage, Piste"
             "aeroway": {
                 "name": "Aviation",
                 "terms": "Piste de décollage, Piste d'atterissage, Piste"


@@ -1078,6 +1115,9 @@
                 "name": "Abri",
                 "terms": "Abri"
             },
                 "name": "Abri",
                 "terms": "Abri"
             },

+            "amenity/studio": {
+                "name": "Studio"
+            },

             "amenity/swimming_pool": {
                 "name": "Piscine",
                 "terms": "Piscine"
             "amenity/swimming_pool": {
                 "name": "Piscine",
                 "terms": "Piscine"


@@ -1111,6 +1151,7 @@
                 "terms": "Machine distributrice"
             },
             "amenity/veterinary": {
                 "terms": "Machine distributrice"
             },
             "amenity/veterinary": {

+                "name": "Vétérinaire",

                 "terms": "Vétérinaire"
             },
             "amenity/waste_basket": {
                 "terms": "Vétérinaire"
             },
             "amenity/waste_basket": {


@@ -1201,6 +1242,15 @@
                 "name": "Résidence",
                 "terms": "Appartements"
             },
                 "name": "Résidence",
                 "terms": "Appartements"
             },

+            "building/cathedral": {
+                "name": "Cathédrale"
+            },
+            "building/chapel": {
+                "name": "Chapelle"
+            },
+            "building/church": {
+                "name": "Église"
+            },

             "building/commercial": {
                 "name": "Bâtiment commercial",
                 "terms": "Bâtiment commercial"
             "building/commercial": {
                 "name": "Bâtiment commercial",
                 "terms": "Bâtiment commercial"


@@ -1213,6 +1263,12 @@
                 "name": "Garage",
                 "terms": "Garage"
             },
                 "name": "Garage",
                 "terms": "Garage"
             },

+            "building/greenhouse": {
+                "name": "Serre"
+            },
+            "building/hotel": {
+                "name": "Hôtel"
+            },

             "building/house": {
                 "name": "Maison",
                 "terms": "Maison"
             "building/house": {
                 "name": "Maison",
                 "terms": "Maison"


@@ -1225,10 +1281,25 @@
                 "name": "Bâtiment industriel",
                 "terms": "Bâtiment industriel"
             },
                 "name": "Bâtiment industriel",
                 "terms": "Bâtiment industriel"
             },

+            "building/public": {
+                "name": "Établissement public"
+            },

             "building/residential": {
                 "name": "Bâtiment résidentiel",
                 "terms": "Bâtiment résidentiel"
             },
             "building/residential": {
                 "name": "Bâtiment résidentiel",
                 "terms": "Bâtiment résidentiel"
             },

+            "building/school": {
+                "name": "Bâtiment d'enseignement"
+            },
+            "building/stable": {
+                "name": "Étable"
+            },
+            "building/train_station": {
+                "name": "Gare ferroviaire"
+            },
+            "building/university": {
+                "name": "Université"
+            },

             "craft/blacksmith": {
                 "name": "Forgeron"
             },
             "craft/blacksmith": {
                 "name": "Forgeron"
             },


@@ -1449,6 +1520,9 @@
                 "name": "Route résidentielle",
                 "terms": "Route résidentielle"
             },
                 "name": "Route résidentielle",
                 "terms": "Route résidentielle"
             },

+            "highway/rest_area": {
+                "name": "Aire de repos"
+            },

             "highway/road": {
                 "name": "Voie de type inconnu",
                 "terms": "Route inconnue"
             "highway/road": {
                 "name": "Voie de type inconnu",
                 "terms": "Route inconnue"


@@ -1962,6 +2036,9 @@
                 "name": "Agence de voyage",
                 "terms": "Agence de voyage"
             },
                 "name": "Agence de voyage",
                 "terms": "Agence de voyage"
             },

+            "piste": {
+                "name": "Piste de ski"
+            },

             "place": {
                 "name": "Toponymie",
                 "terms": "Lieu"
             "place": {
                 "name": "Toponymie",
                 "terms": "Lieu"


@@ -2048,6 +2125,9 @@
                 "name": "Voie ferrée désaffectée",
                 "terms": "Voie ferrée non utilisée"
             },
                 "name": "Voie ferrée désaffectée",
                 "terms": "Voie ferrée non utilisée"
             },

+            "railway/funicular": {
+                "name": "Funiculaire"
+            },

             "railway/halt": {
                 "name": "Hall de gare",
                 "terms": "Halte ferroviaire"
             "railway/halt": {
                 "name": "Hall de gare",
                 "terms": "Halte ferroviaire"

diff --git a/vendor/assets/iD/iD/locales/hr.json b/vendor/assets/iD/iD/locales/hr.json
index edda10936af88db6ba701e461e2035d09eb7c4c4..a0afa93b3d356069690aaa90e6245d5ae98e1e63 100644 (file)
--- a/vendor/assets/iD/iD/locales/hr.json
+++ b/vendor/assets/iD/iD/locales/hr.json
@@ -134,7 +134,8 @@
             "annotation": "Spojeno {n} linija.",
             "not_eligible": "Ova svojstva se ne mogu spojiti.",
             "not_adjacent": "Ove se linije ne mogu stopiti u jednu jer nisu spojene.",
             "annotation": "Spojeno {n} linija.",
             "not_eligible": "Ova svojstva se ne mogu spojiti.",
             "not_adjacent": "Ove se linije ne mogu stopiti u jednu jer nisu spojene.",

-            "restriction": "Ove se linije ne mogu spojiti jer je barem jedna član \"{relation}\" relacije."
+            "restriction": "Ove se linije ne mogu spojiti jer je barem jedna član \"{relation}\" relacije.",
+            "incomplete_relation": "Ove se značajke ne mogu spojiti jer bar jedna od njih nije potpuno preuzeta s Interneta."

         },
         "move": {
             "title": "Premjesti",
         },
         "move": {
             "title": "Premjesti",

diff --git a/vendor/assets/iD/iD/locales/it.json b/vendor/assets/iD/iD/locales/it.json
index 56cf0d3ad8f71a0e7528effc24b3d55cd667cc3b..6a5724b43ead872ac2e0f4e9cd131eab4a4824af 100644 (file)
--- a/vendor/assets/iD/iD/locales/it.json
+++ b/vendor/assets/iD/iD/locales/it.json
@@ -134,7 +134,8 @@
             "annotation": "Unite {n} linee.",
             "not_eligible": "Questi elementi non possono essere uniti.",
             "not_adjacent": "Queste linee non possono essere unite perché non sono connesse.",
             "annotation": "Unite {n} linee.",
             "not_eligible": "Questi elementi non possono essere uniti.",
             "not_adjacent": "Queste linee non possono essere unite perché non sono connesse.",

-            "restriction": "Queste linee non possono essere unite perché almeno una è membro di una relazione \"{relation}\"."
+            "restriction": "Queste linee non possono essere unite perché almeno una è membro di una relazione \"{relation}\".",
+            "incomplete_relation": "Questi elementi non posso essere uniti perché almeno uno di loro non è stato completamente scaricato."

         },
         "move": {
             "title": "Muovi",
         },
         "move": {
             "title": "Muovi",


@@ -1284,10 +1285,30 @@
                 "name": "Appartamenti",
                 "terms": "appartamenti,condominio,palazzo,palazzone,casermone,case popolari,abitazioni,case,edilizia popolare,peep,iacp"
             },
                 "name": "Appartamenti",
                 "terms": "appartamenti,condominio,palazzo,palazzone,casermone,case popolari,abitazioni,case,edilizia popolare,peep,iacp"
             },

+            "building/bunker": {
+                "name": "Bunker",
+                "terms": "bunker,casamatta"
+            },
+            "building/cathedral": {
+                "name": "Cattedrale",
+                "terms": "cattedrale,chiesa,monumento,religioso"
+            },
+            "building/church": {
+                "name": "Chiesa",
+                "terms": "cristiano,abbazia,basilica,cattedrale,presbiterio,cappella,chiesa,casa di Dio,luogo di preghiera,luogo di culto,missione,oratorio,parrocchia,sacello,edicola votiva,tabernacolo,tempio"
+            },

             "building/commercial": {
                 "name": "Edificio commerciale",
                 "terms": "Edificio commerciale"
             },
             "building/commercial": {
                 "name": "Edificio commerciale",
                 "terms": "Edificio commerciale"
             },

+            "building/construction": {
+                "name": "Edificio in costruzione",
+                "terms": "cantiere,struttura,in costruzione"
+            },
+            "building/dormitory": {
+                "name": "Dormitorio",
+                "terms": "dormitorio,struttura sociale"
+            },

             "building/entrance": {
                 "name": "Entrata",
                 "terms": "Entrata"
             "building/entrance": {
                 "name": "Entrata",
                 "terms": "Entrata"


@@ -1296,6 +1317,22 @@
                 "name": "Garage",
                 "terms": "Garage"
             },
                 "name": "Garage",
                 "terms": "Garage"
             },

+            "building/garages": {
+                "name": "Garage",
+                "terms": "Garage,rimesse"
+            },
+            "building/greenhouse": {
+                "name": "Serra",
+                "terms": "serra,coltivazione,piante,orto,coltivazione,vegetali"
+            },
+            "building/hospital": {
+                "name": "Edificio ospedaliero",
+                "terms": "clinica,pronto soccorso,servizio sanitario,salute,hospice,ospizio,infermeria,istituzione,casa di cura,casa di riposo,sanatorio,ambulatorio,chirurgia,reparto"
+            },
+            "building/hotel": {
+                "name": "Edificio alberghiero",
+                "terms": "albergo,hotel"
+            },

             "building/house": {
                 "name": "Casa",
                 "terms": "Casa"
             "building/house": {
                 "name": "Casa",
                 "terms": "Casa"


@@ -1308,10 +1345,38 @@
                 "name": "Edificio industriale",
                 "terms": "Edifico industriale"
             },
                 "name": "Edificio industriale",
                 "terms": "Edifico industriale"
             },

+            "building/public": {
+                "name": "Edificio pubblico",
+                "terms": "comunita,edificio comunitario,comunità"
+            },

             "building/residential": {
                 "name": "Edificio residenziale",
                 "terms": "Edificio residenziale"
             },
             "building/residential": {
                 "name": "Edificio residenziale",
                 "terms": "Edificio residenziale"
             },

+            "building/roof": {
+                "name": "Tettoia",
+                "terms": "tetto,pensilina"
+            },
+            "building/school": {
+                "name": "Edificio scolastico",
+                "terms": "accademia,alma mater,lavagna,collegio,dipartimento,disciplina,classe,facoltà,aula,istituto,istituzione,riformatorio,scuola,edificio scolastico,seminario,università"
+            },
+            "building/stable": {
+                "name": "Stalla",
+                "terms": "stalla,ricovero,scuderia"
+            },
+            "building/train_station": {
+                "name": "Stazione ferroviaria",
+                "terms": "treno,stazione,centrale"
+            },
+            "building/university": {
+                "name": "Edificio universitario",
+                "terms": "college,alma"
+            },
+            "building/warehouse": {
+                "name": "Magazzino",
+                "terms": "magazzino,ripostiglio,rimessa"
+            },

             "craft/blacksmith": {
                 "name": "Maniscalco",
                 "terms": "ferri di cavallo"
             "craft/blacksmith": {
                 "name": "Maniscalco",
                 "terms": "ferri di cavallo"


@@ -2124,6 +2189,10 @@
                 "name": "Negozio di liquori",
                 "terms": "alcool,liquori,grappa,rum,vodka"
             },
                 "name": "Negozio di liquori",
                 "terms": "alcool,liquori,grappa,rum,vodka"
             },

+            "shop/art": {
+                "name": "Negozio di opere d'arte",
+                "terms": "opere d'arte,quadri,sculture,galleria"
+            },

             "shop/bakery": {
                 "name": "Panificio",
                 "terms": "Panificio"
             "shop/bakery": {
                 "name": "Panificio",
                 "terms": "Panificio"


@@ -2140,6 +2209,10 @@
                 "name": "Negozio di biciclette",
                 "terms": "Negozio biciclette"
             },
                 "name": "Negozio di biciclette",
                 "terms": "Negozio biciclette"
             },

+            "shop/bookmaker": {
+                "name": "Negozio di scommesse",
+                "terms": "scommesse,puntate,allibratore"
+            },

             "shop/books": {
                 "name": "Libreria",
                 "terms": "Negozio di libri"
             "shop/books": {
                 "name": "Libreria",
                 "terms": "Negozio di libri"


@@ -2260,6 +2333,10 @@
                 "name": "Fabbro",
                 "terms": "<tradurre con sinonimi o termini collegati alla parola 'fabbro, separati da virgole'>"
             },
                 "name": "Fabbro",
                 "terms": "<tradurre con sinonimi o termini collegati alla parola 'fabbro, separati da virgole'>"
             },

+            "shop/lottery": {
+                "name": "Ricevitoria",
+                "terms": "lotto,lotteria"
+            },

             "shop/mall": {
                 "name": "Centro commerciale",
                 "terms": " Centro commerciale "
             "shop/mall": {
                 "name": "Centro commerciale",
                 "terms": " Centro commerciale "

diff --git a/vendor/assets/iD/iD/locales/ja.json b/vendor/assets/iD/iD/locales/ja.json
index ab22789df770e1137dc3a8403de4fbbab96d6003..d958b69686575e4c5d3c48280622e4319a919b2d 100644 (file)
--- a/vendor/assets/iD/iD/locales/ja.json
+++ b/vendor/assets/iD/iD/locales/ja.json
@@ -134,7 +134,8 @@
             "annotation": "{n} 本のラインを結合",
             "not_eligible": "地物情報がマージできません",
             "not_adjacent": "ラインをマージするには、ラインが結合している必要があります。",
             "annotation": "{n} 本のラインを結合",
             "not_eligible": "地物情報がマージできません",
             "not_adjacent": "ラインをマージするには、ラインが結合している必要があります。",

-            "restriction": "\"{relation}\" リレーションに所属しているラインが含まれているため、マージすることができません。"
+            "restriction": "\"{relation}\" リレーションに所属しているラインが含まれているため、マージすることができません。",
+            "incomplete_relation": "地物全体がダウンロードされていないため、マージさせることができません。"

         },
         "move": {
             "title": "移動",
         },
         "move": {
             "title": "移動",


@@ -1284,21 +1285,73 @@
                 "name": "アパート",
                 "terms": "アパート"
             },
                 "name": "アパート",
                 "terms": "アパート"
             },

+            "building/barn": {
+                "name": "納屋",
+                "terms": "納屋"
+            },
+            "building/bunker": {
+                "name": "掩体壕",
+                "terms": "掩体壕, 掩蔽壕"
+            },
+            "building/cabin": {
+                "name": "ログハウス",
+                "terms": "ログハウス"
+            },
+            "building/cathedral": {
+                "name": "大聖堂",
+                "terms": "大聖堂"
+            },
+            "building/chapel": {
+                "name": "礼拝堂",
+                "terms": "礼拝堂"
+            },
+            "building/church": {
+                "name": "教会",
+                "terms": "教会"
+            },

             "building/commercial": {
                 "name": "オフィスビル",
                 "terms": "オフィスビル"
             },
             "building/commercial": {
                 "name": "オフィスビル",
                 "terms": "オフィスビル"
             },

+            "building/construction": {
+                "name": "建設中の建物",
+                "terms": "建設中の建物"
+            },
+            "building/detached": {
+                "name": "一戸建て住宅",
+                "terms": "一戸建て住宅"
+            },
+            "building/dormitory": {
+                "name": "寮",
+                "terms": "寮"
+            },

             "building/entrance": {
                 "name": "出入口",
                 "terms": "出入口, エントランス"
             },
             "building/garage": {
                 "name": "車庫",
             "building/entrance": {
                 "name": "出入口",
                 "terms": "出入口, エントランス"
             },
             "building/garage": {
                 "name": "車庫",

-                "terms": "車庫,ガレージ"
+                "terms": "車庫, ガレージ"
+            },
+            "building/garages": {
+                "name": "集合車庫",
+                "terms": "集合車庫"
+            },
+            "building/greenhouse": {
+                "name": "温室",
+                "terms": "温室"
+            },
+            "building/hospital": {
+                "name": "病院の建物",
+                "terms": "病院の建物, 病棟"
+            },
+            "building/hotel": {
+                "name": "ホテルの建物",
+                "terms": "ホテルの建物, 宿泊棟"

             },
             "building/house": {
             },
             "building/house": {

-                "name": "住宅",
-                "terms": "住宅"
+                "name": "連結住宅",
+                "terms": "連結住宅"

             },
             "building/hut": {
                 "name": "小屋",
             },
             "building/hut": {
                 "name": "小屋",


@@ -1308,10 +1361,54 @@
                 "name": "工場",
                 "terms": "工場"
             },
                 "name": "工場",
                 "terms": "工場"
             },

+            "building/public": {
+                "name": "公共施設",
+                "terms": "公共施設"
+            },

             "building/residential": {
                 "name": "住宅",
                 "terms": "住宅, アパート, マンション"
             },
             "building/residential": {
                 "name": "住宅",
                 "terms": "住宅, アパート, マンション"
             },

+            "building/retail": {
+                "name": "商業施設",
+                "terms": "商業施設, 店舗"
+            },
+            "building/roof": {
+                "name": "屋根",
+                "terms": "屋根, 屋根付きテラス"
+            },
+            "building/school": {
+                "name": "校舎",
+                "terms": "校舎, 学校の建物"
+            },
+            "building/shed": {
+                "name": "格納庫",
+                "terms": "格納庫, 離れ"
+            },
+            "building/stable": {
+                "name": "厩",
+                "terms": "厩, 馬小屋"
+            },
+            "building/static_caravan": {
+                "name": "トレーラーハウス",
+                "terms": "トレーラーハウス"
+            },
+            "building/terrace": {
+                "name": "テラスハウス",
+                "terms": "テラスハウス, 長屋"
+            },
+            "building/train_station": {
+                "name": "駅舎",
+                "terms": "駅舎"
+            },
+            "building/university": {
+                "name": "大学",
+                "terms": "大学, 大学の建物"
+            },
+            "building/warehouse": {
+                "name": "倉庫",
+                "terms": "倉庫, 蔵"
+            },

             "craft/basket_maker": {
                 "name": "かご製造所",
                 "terms": "かご,籠"
             "craft/basket_maker": {
                 "name": "かご製造所",
                 "terms": "かご,籠"


@@ -2288,6 +2385,10 @@
                 "name": "酒店",
                 "terms": "酒店, 酒屋"
             },
                 "name": "酒店",
                 "terms": "酒店, 酒屋"
             },

+            "shop/art": {
+                "name": "美術工芸品店",
+                "terms": "美術工芸品店, 美術品店, アートショップ,工芸品店"
+            },

             "shop/bakery": {
                 "name": "パン屋",
                 "terms": "パン屋, ベーカリー"
             "shop/bakery": {
                 "name": "パン屋",
                 "terms": "パン屋, ベーカリー"


@@ -2304,6 +2405,10 @@
                 "name": "自転車店",
                 "terms": "自転車店"
             },
                 "name": "自転車店",
                 "terms": "自転車店"
             },

+            "shop/bookmaker": {
+                "name": "公営競技投票券売り場",
+                "terms": "公営競技投票券売り場, 馬券売り場, 車券売り場, 舟券売り場"
+            },

             "shop/books": {
                 "name": "書店",
                 "terms": "書店, 本屋"
             "shop/books": {
                 "name": "書店",
                 "terms": "書店, 本屋"


@@ -2424,6 +2529,10 @@
                 "name": "錠前屋",
                 "terms": "錠前屋"
             },
                 "name": "錠前屋",
                 "terms": "錠前屋"
             },

+            "shop/lottery": {
+                "name": "宝くじ売り場",
+                "terms": "宝くじ売り場"
+            },

             "shop/mall": {
                 "name": "ショッピングセンター",
                 "terms": "ショッピングセンター, ショッピングモール, 複合商業施設"
             "shop/mall": {
                 "name": "ショッピングセンター",
                 "terms": "ショッピングセンター, ショッピングモール, 複合商業施設"

diff --git a/vendor/assets/iD/iD/locales/pl.json b/vendor/assets/iD/iD/locales/pl.json
index 3457f0ba5bc794c2e4c95e355be1249f1f0d8fa4..60ca34b48edf5a076b70f0f69451607d30b95dc8 100644 (file)
--- a/vendor/assets/iD/iD/locales/pl.json
+++ b/vendor/assets/iD/iD/locales/pl.json
@@ -395,6 +395,9 @@
             "category-building": {
                 "name": "Budynek"
             },
             "category-building": {
                 "name": "Budynek"
             },

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

             "category-landuse": {
                 "name": "Zagospodarowanie terenu"
             },
             "category-landuse": {
                 "name": "Zagospodarowanie terenu"
             },


@@ -504,6 +507,9 @@
             "building_area": {
                 "label": "Budynek"
             },
             "building_area": {
                 "label": "Budynek"
             },

+            "cans": {
+                "label": "Przyjmowanie puszek"
+            },

             "capacity": {
                 "label": "Pojemność",
                 "placeholder": "50, 100, 200..."
             "capacity": {
                 "label": "Pojemność",
                 "placeholder": "50, 100, 200..."


@@ -518,6 +524,9 @@
                     "anticlockwise": "Przeciwnie do wskazówek zegara"
                 }
             },
                     "anticlockwise": "Przeciwnie do wskazówek zegara"
                 }
             },

+            "clothes": {
+                "label": "Przyjmowanie ciuchów"
+            },

             "collection_times": {
                 "label": "Czas zbierania"
             },
             "collection_times": {
                 "label": "Czas zbierania"
             },


@@ -573,6 +582,9 @@
             "generator/type": {
                 "label": "Typ"
             },
             "generator/type": {
                 "label": "Typ"
             },

+            "glass": {
+                "label": "Przyjmowanie szkła"
+            },

             "highway": {
                 "label": "Typ"
             },
             "highway": {
                 "label": "Typ"
             },


@@ -709,6 +721,9 @@
             "shelter": {
                 "label": "Schronienie"
             },
             "shelter": {
                 "label": "Schronienie"
             },

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

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


@@ -752,6 +767,9 @@
             "tree_type": {
                 "label": "Typ"
             },
             "tree_type": {
                 "label": "Typ"
             },

+            "tunnel": {
+                "label": "Tunel"
+            },

             "vending": {
                 "label": "Rodzaje towarów"
             },
             "vending": {
                 "label": "Rodzaje towarów"
             },


@@ -876,6 +894,9 @@
                 "name": "Kino",
                 "terms": "duży ekran,drive-in,film,ruchomy obraz,pokaz zdjęć,zdjęcia,pokaz,silver screen"
             },
                 "name": "Kino",
                 "terms": "duży ekran,drive-in,film,ruchomy obraz,pokaz zdjęć,zdjęcia,pokaz,silver screen"
             },

+            "amenity/clock": {
+                "name": "Zegar"
+            },

             "amenity/college": {
                 "name": "Uczelnia",
                 "terms": "uczelnia"
             "amenity/college": {
                 "name": "Uczelnia",
                 "terms": "uczelnia"


@@ -971,6 +992,9 @@
                 "name": "Pub",
                 "terms": "pub,piwo,wino"
             },
                 "name": "Pub",
                 "terms": "pub,piwo,wino"
             },

+            "amenity/recycling": {
+                "name": "Recykling"
+            },

             "amenity/restaurant": {
                 "name": "Restauracja",
                 "terms": "bar,kawiarnia,stołówka,jadalnia,drive-in,knajpa,jadłodajnia,fast food,grill,gospoda,klub nocny,pizzeria"
             "amenity/restaurant": {
                 "name": "Restauracja",
                 "terms": "bar,kawiarnia,stołówka,jadalnia,drive-in,knajpa,jadłodajnia,fast food,grill,gospoda,klub nocny,pizzeria"


@@ -982,6 +1006,15 @@
             "amenity/shelter": {
                 "name": "Schronienie"
             },
             "amenity/shelter": {
                 "name": "Schronienie"
             },

+            "amenity/social_facility": {
+                "name": "Placówka pomocy społecznej"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Bank żywności"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Schronisko dla bezdomnych"
+            },

             "amenity/swimming_pool": {
                 "name": "Basen",
                 "terms": "basen,pływalnia"
             "amenity/swimming_pool": {
                 "name": "Basen",
                 "terms": "basen,pływalnia"


@@ -1014,6 +1047,9 @@
                 "name": "Automat sprzedający",
                 "terms": "automat do sprzedaży"
             },
                 "name": "Automat sprzedający",
                 "terms": "automat do sprzedaży"
             },

+            "amenity/veterinary": {
+                "name": "Weterynarz"
+            },

             "amenity/waste_basket": {
                 "name": "Kosz na śmieci",
                 "terms": "kosz,kubeł,śmietnik"
             "amenity/waste_basket": {
                 "name": "Kosz na śmieci",
                 "terms": "kosz,kubeł,śmietnik"


@@ -1100,6 +1136,9 @@
                 "name": "Apartamenty",
                 "terms": "blok,kamienica"
             },
                 "name": "Apartamenty",
                 "terms": "blok,kamienica"
             },

+            "building/church": {
+                "name": "Kościół"
+            },

             "building/commercial": {
                 "name": "Nieruchomość komercyjna",
                 "terms": "sklep,komercyjny,sprzedaż,handlowy"
             "building/commercial": {
                 "name": "Nieruchomość komercyjna",
                 "terms": "sklep,komercyjny,sprzedaż,handlowy"


@@ -1128,6 +1167,51 @@
                 "name": "Budynek mieszkalny",
                 "terms": "blok, kamienica, dom, czynszówka"
             },
                 "name": "Budynek mieszkalny",
                 "terms": "blok, kamienica, dom, czynszówka"
             },

+            "building/warehouse": {
+                "name": "Magazyn"
+            },
+            "craft/clockmaker": {
+                "name": "Zegarmistrz"
+            },
+            "craft/confectionary": {
+                "name": "Cukiernik"
+            },
+            "craft/dressmaker": {
+                "name": "Krawiec"
+            },
+            "craft/electrician": {
+                "name": "Elektryk"
+            },
+            "craft/gardener": {
+                "name": "Ogrodnik"
+            },
+            "craft/glaziery": {
+                "name": "Szklarz"
+            },
+            "craft/jeweler": {
+                "name": "Jubiler"
+            },
+            "craft/locksmith": {
+                "name": "Ślusarz"
+            },
+            "craft/optician": {
+                "name": "Optyk"
+            },
+            "craft/painter": {
+                "name": "Malarz"
+            },
+            "craft/photographer": {
+                "name": "Fotograf"
+            },
+            "craft/photographic_labratory": {
+                "name": "Laboratorium fotograficzne"
+            },
+            "craft/plumber": {
+                "name": "Hydraulik"
+            },
+            "craft/roofer": {
+                "name": "Dekarz"
+            },

             "emergency/ambulance_station": {
                 "name": "Stacja pogotowia ratunkowego",
                 "terms": "pogotowie ratunkowe"
             "emergency/ambulance_station": {
                 "name": "Stacja pogotowia ratunkowego",
                 "terms": "pogotowie ratunkowe"


@@ -1215,6 +1299,9 @@
                 "name": "Droga lokalna",
                 "terms": "lokalna, osiedlowa, zamieszkała"
             },
                 "name": "Droga lokalna",
                 "terms": "lokalna, osiedlowa, zamieszkała"
             },

+            "highway/rest_area": {
+                "name": "Obszar wypoczynkowy"
+            },

             "highway/road": {
                 "name": "Nieokreślona droga",
                 "terms": "droga,nieznana,niewiadoma"
             "highway/road": {
                 "name": "Nieokreślona droga",
                 "terms": "droga,nieznana,niewiadoma"


@@ -1247,6 +1334,9 @@
             "highway/service/parking_aisle": {
                 "name": "Uliczka parkingowa"
             },
             "highway/service/parking_aisle": {
                 "name": "Uliczka parkingowa"
             },

+            "highway/services": {
+                "name": "Obszar usługowy"
+            },

             "highway/steps": {
                 "name": "Schody",
                 "terms": "schody"
             "highway/steps": {
                 "name": "Schody",
                 "terms": "schody"


@@ -1592,9 +1682,25 @@
             "office/architect": {
                 "terms": "architekt"
             },
             "office/architect": {
                 "terms": "architekt"
             },

+            "office/educational_institution": {
+                "name": "Instytucja edukacyjna"
+            },
+            "office/employment_agency": {
+                "name": "Agencja zatrudnienia"
+            },
+            "office/estate_agent": {
+                "name": "Biuro nieruchomości"
+            },
+            "office/insurance": {
+                "name": "Biuro ubezpieczeń"
+            },

             "office/political_party": {
             "office/political_party": {

+                "name": "Partia polityczna",

                 "terms": "partia polityczna"
             },
                 "terms": "partia polityczna"
             },

+            "office/therapist": {
+                "name": "Terapeuta"
+            },

             "office/travel_agent": {
                 "name": "Biuro podróży"
             },
             "office/travel_agent": {
                 "name": "Biuro podróży"
             },


@@ -1652,6 +1758,9 @@
             "power/transformer": {
                 "name": "Transformator"
             },
             "power/transformer": {
                 "name": "Transformator"
             },

+            "public_transport/stop_position": {
+                "name": "Miejsce zatrzymania"
+            },

             "railway": {
                 "name": "Kolej",
                 "terms": "torowisko, kolej"
             "railway": {
                 "name": "Kolej",
                 "terms": "torowisko, kolej"


@@ -1724,6 +1833,9 @@
                 "name": "Sklep rowerowy",
                 "terms": "sklep rowerowy"
             },
                 "name": "Sklep rowerowy",
                 "terms": "sklep rowerowy"
             },

+            "shop/bookmaker": {
+                "name": "Bukmacher"
+            },

             "shop/books": {
                 "name": "Księgarnia",
                 "terms": "księgarnia"
             "shop/books": {
                 "name": "Księgarnia",
                 "terms": "księgarnia"


@@ -1827,6 +1939,9 @@
             "shop/locksmith": {
                 "name": "Ślusarz"
             },
             "shop/locksmith": {
                 "name": "Ślusarz"
             },

+            "shop/lottery": {
+                "name": "Kolektura"
+            },

             "shop/mall": {
                 "name": "Centrum handlowe"
             },
             "shop/mall": {
                 "name": "Centrum handlowe"
             },

diff --git a/vendor/assets/iD/iD/locales/pt-BR.json b/vendor/assets/iD/iD/locales/pt-BR.json
index c13273ca931230681d4f348e5b1c4f0f284dbf70..fdde3d88d9297d1b0a7e0f1c9f8e833d9d44a4de 100644 (file)
--- a/vendor/assets/iD/iD/locales/pt-BR.json
+++ b/vendor/assets/iD/iD/locales/pt-BR.json
@@ -134,7 +134,8 @@
             "annotation": "Mesclou {n} linhas.",
             "not_eligible": "Esses elementos não podem ser mesclados.",
             "not_adjacent": "Essas linhas não podem ser mescladas porque não estão conectadas.",
             "annotation": "Mesclou {n} linhas.",
             "not_eligible": "Esses elementos não podem ser mesclados.",
             "not_adjacent": "Essas linhas não podem ser mescladas porque não estão conectadas.",

-            "restriction": "Estas linhas não podem ser mescladas porque pelo menos uma delas é membro da relação \"{relation}\"."
+            "restriction": "Estas linhas não podem ser mescladas porque pelo menos uma delas é membro da relação \"{relation}\".",
+            "incomplete_relation": "Estas funcionalidades não podem ser mescladas porque pelo menos uma delas não foi transferida completamente."

         },
         "move": {
             "title": "Mover",
         },
         "move": {
             "title": "Mover",


@@ -332,6 +333,7 @@
     },
     "help": {
         "title": "Ajuda",
     },
     "help": {
         "title": "Ajuda",

+        "help": "# Ajuda\n\nEste é um editor para OpenStreetMap (http://www.openstreetmap.org/), o mapa mundial livre e editavel. Você pode usá-lo para adicionar e atualizar de dados em sua área,  tornando um mapa mundi de codigo aberto melhor para todos.\nAs edições que você fizer nesse mapa serão visíveis para todos que usam OpenStreetMap. Para fazer uma edição você precisará de uma conta gratuita OpenStreetMap(https://www.openstreetmap.org/user/new).\n\nO editor iD (http://ideditor.com/) é um projeto colaborativo com o código fonte disponível no GitHub(https://github.com/openstreetmap/iD).\n",

         "editing_saving": "# Editando e Salvando\n\nEsse editor é feito para trabalhar primariamente online e você está\nneste momento acessando-o através de um sítio eletrônico.\n\n### Selecionando Elementos\n\nPara selecionar um elemento do mapa, como uma estrada ou \num ponto de interesse, clique sobre ele. Isso vai pôr o elemento\nselecionado em destaque, abrir um painel com detalhes sobre\nele e mostrar um menu de coisas que podem ser feitas com ele.\n\nMúltiplos elementos podem ser selecionados segurando a tecla\n\"Shift\", clicando e arrastando no mapa. Isso vai selecionar todos\nos elementos que estiverem dentro da caixa que foi desenhada,\npermitindo você fazer coisas com vários elementos de uma vez\nsó.\n\n### Salvando as Alterações\n\nQuando você faz alterações como editar ruas, prédios e lugares, elas\nsão guardadas localmente até que você as envie para o servidor. Não\nse preocupe se você cometer algum deslize: você pode desfazer\nalterações clicando no botão de desfazer e também refazer as\nalterações clicando no botão de refazer.\n\nClique em \"Salvar\" para salvar um conjunto de alterações. Por exemplo,\nvocê completou uma área de uma cidade e gostaria de começar a\neditar uma outra área. Você terá a chance de revisar o que foi feito\naté o momento e o editor mostrará sugestões e dicas se alguma coisa\nparecer estar errada com as suas alterações.\n\nSe tudo parecer estar OK, você pode inserir um breve comentário\nexplicando as mudanças que você fez e clicar em \"Salvar\" de novo\npara lançar as mudanças para o [OpenStreetMap](http://www.openstreetmap.org/),\nonde elas estarão visíveis para todos os outros usuários.\n\nSe você não conseguir concluir uma sessão de edição, você pode\ndeixar a janela do seu editor aberta e voltar mais tarde (no mesmo\nnavegador e computador) que o editor irá oferecer a possibilidade\nde restaurar o seu trabalho.\n",
         "roads": "# Estradas \n\nVocê pode criar, corrigir e excluir estradas com este editor. Estradas podem ser de vários \ntipos: caminhos, estradas, trilhas, ciclovias e muito mais - qualquer segmento\nonde se passa, mesmo que às vezes, pode ser mapeado. \n\n### Selecionando \n\nClique em uma estrada para selecioná-la. Um esboço deve tornar-se visível, junto \ncom um pequeno menu de ferramentas no mapa e uma barra lateral mostrando mais informações \nsobre a estrada. \n\n### Modificando \n\nMuitas vezes você vai encontrar estradas que não estão alinhadas com as imagens por trás delas \nou com uma faixa de GPS. Você pode ajustar estas estradas para que elas fiquem no \nlugar certo. \n\nPrimeiro clique no caminho que você deseja alterar. Isso irá destacá-lo e mostrar \npontos de controle ao longo dela que você pode arrastar para locais melhores. Se \no que você deseja é adicionar novos pontos de controle para obter mais detalhes, clique duas vezes em uma parte \nda estrada sem um nó, e um ponto será adicionado.\n\nSe a estrada se conecta a uma outra estrada, mas não está corretamente conectada no \nmapa, você pode arrastar um de seus pontos de controle para a outra estrada \na fim de juntá-las. Ter estradas que se conectam é importante para o mapa \ne essencial para fornecer instruções de direção. \n\nVocê também pode clicar na ferramenta 'Mover' ou pressione a tecla 'M' para mover o caminho inteiro de \numa vez, e em seguida, clique novamente para salvar esse movimento. \n\n### Apagando \n\nSe uma estrada está completamente errada - você pode ver que ela não existe nas imagens \nde satélite e, junto a isso, ter confirmado localmente que ela não existe - você pode apagá-la do mapa.\nSeja cauteloso ao excluir recursos - \ncomo qualquer outra edição, os resultados são vistos por todos, e como as imagens de satélite \npodem estar desatualizadas, a estrada pode simplesmente ser recém-construída. \n\nVocê pode excluir um caminho, clicando sobre ele para selecioná-lo, em seguida, clicar no \nícone de lixeira ou pressionando a tecla 'Delete'.\n\n### Criando \n\nEncontrou um lugar onde deveria ter uma estrada, mas não tem? Clique no botão 'Linha' \nno canto superior esquerdo do editor ou pressione a tecla de atalho '2' para começar a desenhar \numa linha. \n\nClique no início da estrada no mapa para começar a desenhar. Se a estrada \nse ramifica de uma estrada existente, comece clicando sobre o lugar onde eles se conectam. \n\nEm seguida, clique em pontos ao longo da estrada para que ela siga o caminho certo, de acordo \ncom imagens de satélite ou GPS. Se a estrada que você está desenhando atravessa outra estrada, ligue-as \nclicando sobre o ponto de intersecção. Quando você terminar de desenhar, clique duas vezes \nou pressione 'Voltar' ou 'Enter' no seu teclado.\n",
         "gps": "# GPS\n\nO GPS é a fonte de dados mais confiável do OpenStreetMap. Esse editor\nsuporta trilhas locais, isto é, arquivos \".gpx\" guardados no seu computador.\nVocê pode coletar esse tipo de trilha usando um smartphone ou um\num aparelho de GPS dedicado.\n\nPara mais informações sobre como fazer mapeamento por GPS, leia\n[Utilizando o GPS](http://learnosm.org/pt/beginner/using-gps/).\n\nPara utilizar uma trilha GPS no iD, arraste o arquivo GPX para o mapa. Se\na trilha for reconhecida, ela será adicionada ao mapa como uma linha\nem verde brilhante. Clique no menu \"Configurações da imagem de fundo\",\nno lado esquerdo, para habilitar, desabilitar ou focar o zoom na camada\nreferente a essa trilha.\n\nNote que a trilha GPX não é enviada diretamente ao OpenStreetMap. A\nmelhor maneira de utilizá-la é usando-a como uma linha guia, isto é, desenhando\npor cima dela os novos elementos que estão sendo adicionados no mapa.\nAlém disso, [envie a trilha para o OpenStreetMap](http://www.openstreetmap.org/trace/create)\npara que outras pessoas possam usá-la.\n",
         "editing_saving": "# Editando e Salvando\n\nEsse editor é feito para trabalhar primariamente online e você está\nneste momento acessando-o através de um sítio eletrônico.\n\n### Selecionando Elementos\n\nPara selecionar um elemento do mapa, como uma estrada ou \num ponto de interesse, clique sobre ele. Isso vai pôr o elemento\nselecionado em destaque, abrir um painel com detalhes sobre\nele e mostrar um menu de coisas que podem ser feitas com ele.\n\nMúltiplos elementos podem ser selecionados segurando a tecla\n\"Shift\", clicando e arrastando no mapa. Isso vai selecionar todos\nos elementos que estiverem dentro da caixa que foi desenhada,\npermitindo você fazer coisas com vários elementos de uma vez\nsó.\n\n### Salvando as Alterações\n\nQuando você faz alterações como editar ruas, prédios e lugares, elas\nsão guardadas localmente até que você as envie para o servidor. Não\nse preocupe se você cometer algum deslize: você pode desfazer\nalterações clicando no botão de desfazer e também refazer as\nalterações clicando no botão de refazer.\n\nClique em \"Salvar\" para salvar um conjunto de alterações. Por exemplo,\nvocê completou uma área de uma cidade e gostaria de começar a\neditar uma outra área. Você terá a chance de revisar o que foi feito\naté o momento e o editor mostrará sugestões e dicas se alguma coisa\nparecer estar errada com as suas alterações.\n\nSe tudo parecer estar OK, você pode inserir um breve comentário\nexplicando as mudanças que você fez e clicar em \"Salvar\" de novo\npara lançar as mudanças para o [OpenStreetMap](http://www.openstreetmap.org/),\nonde elas estarão visíveis para todos os outros usuários.\n\nSe você não conseguir concluir uma sessão de edição, você pode\ndeixar a janela do seu editor aberta e voltar mais tarde (no mesmo\nnavegador e computador) que o editor irá oferecer a possibilidade\nde restaurar o seu trabalho.\n",
         "roads": "# Estradas \n\nVocê pode criar, corrigir e excluir estradas com este editor. Estradas podem ser de vários \ntipos: caminhos, estradas, trilhas, ciclovias e muito mais - qualquer segmento\nonde se passa, mesmo que às vezes, pode ser mapeado. \n\n### Selecionando \n\nClique em uma estrada para selecioná-la. Um esboço deve tornar-se visível, junto \ncom um pequeno menu de ferramentas no mapa e uma barra lateral mostrando mais informações \nsobre a estrada. \n\n### Modificando \n\nMuitas vezes você vai encontrar estradas que não estão alinhadas com as imagens por trás delas \nou com uma faixa de GPS. Você pode ajustar estas estradas para que elas fiquem no \nlugar certo. \n\nPrimeiro clique no caminho que você deseja alterar. Isso irá destacá-lo e mostrar \npontos de controle ao longo dela que você pode arrastar para locais melhores. Se \no que você deseja é adicionar novos pontos de controle para obter mais detalhes, clique duas vezes em uma parte \nda estrada sem um nó, e um ponto será adicionado.\n\nSe a estrada se conecta a uma outra estrada, mas não está corretamente conectada no \nmapa, você pode arrastar um de seus pontos de controle para a outra estrada \na fim de juntá-las. Ter estradas que se conectam é importante para o mapa \ne essencial para fornecer instruções de direção. \n\nVocê também pode clicar na ferramenta 'Mover' ou pressione a tecla 'M' para mover o caminho inteiro de \numa vez, e em seguida, clique novamente para salvar esse movimento. \n\n### Apagando \n\nSe uma estrada está completamente errada - você pode ver que ela não existe nas imagens \nde satélite e, junto a isso, ter confirmado localmente que ela não existe - você pode apagá-la do mapa.\nSeja cauteloso ao excluir recursos - \ncomo qualquer outra edição, os resultados são vistos por todos, e como as imagens de satélite \npodem estar desatualizadas, a estrada pode simplesmente ser recém-construída. \n\nVocê pode excluir um caminho, clicando sobre ele para selecioná-lo, em seguida, clicar no \nícone de lixeira ou pressionando a tecla 'Delete'.\n\n### Criando \n\nEncontrou um lugar onde deveria ter uma estrada, mas não tem? Clique no botão 'Linha' \nno canto superior esquerdo do editor ou pressione a tecla de atalho '2' para começar a desenhar \numa linha. \n\nClique no início da estrada no mapa para começar a desenhar. Se a estrada \nse ramifica de uma estrada existente, comece clicando sobre o lugar onde eles se conectam. \n\nEm seguida, clique em pontos ao longo da estrada para que ela siga o caminho certo, de acordo \ncom imagens de satélite ou GPS. Se a estrada que você está desenhando atravessa outra estrada, ligue-as \nclicando sobre o ponto de intersecção. Quando você terminar de desenhar, clique duas vezes \nou pressione 'Voltar' ou 'Enter' no seu teclado.\n",
         "gps": "# GPS\n\nO GPS é a fonte de dados mais confiável do OpenStreetMap. Esse editor\nsuporta trilhas locais, isto é, arquivos \".gpx\" guardados no seu computador.\nVocê pode coletar esse tipo de trilha usando um smartphone ou um\num aparelho de GPS dedicado.\n\nPara mais informações sobre como fazer mapeamento por GPS, leia\n[Utilizando o GPS](http://learnosm.org/pt/beginner/using-gps/).\n\nPara utilizar uma trilha GPS no iD, arraste o arquivo GPX para o mapa. Se\na trilha for reconhecida, ela será adicionada ao mapa como uma linha\nem verde brilhante. Clique no menu \"Configurações da imagem de fundo\",\nno lado esquerdo, para habilitar, desabilitar ou focar o zoom na camada\nreferente a essa trilha.\n\nNote que a trilha GPX não é enviada diretamente ao OpenStreetMap. A\nmelhor maneira de utilizá-la é usando-a como uma linha guia, isto é, desenhando\npor cima dela os novos elementos que estão sendo adicionados no mapa.\nAlém disso, [envie a trilha para o OpenStreetMap](http://www.openstreetmap.org/trace/create)\npara que outras pessoas possam usá-la.\n",


@@ -395,6 +397,9 @@
             "category-building": {
                 "name": "Prédio"
             },
             "category-building": {
                 "name": "Prédio"
             },

+            "category-golf": {
+                "name": "Golfe"
+            },

             "category-landuse": {
                 "name": "Uso da Terra"
             },
             "category-landuse": {
                 "name": "Uso da Terra"
             },


@@ -438,7 +443,7 @@
                         "description": "Acesso não permitido ao público em geral"
                     },
                     "permissive": {
                         "description": "Acesso não permitido ao público em geral"
                     },
                     "permissive": {

-                        "title": "Permissivo",
+                        "title": "Concedido",

                         "description": "Acesso permitido até que o dono cancele a permissão"
                     },
                     "private": {
                         "description": "Acesso permitido até que o dono cancele a permissão"
                     },
                     "private": {


@@ -461,16 +466,43 @@
             "address": {
                 "label": "Endereço",
                 "placeholders": {
             "address": {
                 "label": "Endereço",
                 "placeholders": {

-                    "housename": "Nome da Casa",
+                    "housename": "Complemento",

                     "number": "123",
                     "street": "Rua",
                     "number": "123",
                     "street": "Rua",

-                    "city": "Cidade",
+                    "city": "Município",

                     "postcode": "CEP"
                 }
             },
             "admin_level": {
                 "label": "Nível Administrativo"
             },
                     "postcode": "CEP"
                 }
             },
             "admin_level": {
                 "label": "Nível Administrativo"
             },

+            "aerialway": {
+                "label": "Tipo"
+            },
+            "aerialway/access": {
+                "label": "Acesso"
+            },
+            "aerialway/bubble": {
+                "label": "Bolha"
+            },
+            "aerialway/capacity": {
+                "label": "Capacidade (por hora)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Duração (minutos)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Aquecido"
+            },
+            "aerialway/occupancy": {
+                "label": "Ocupação",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Acesso (verão)"
+            },

             "aeroway": {
                 "label": "Tipo"
             },
             "aeroway": {
                 "label": "Tipo"
             },


@@ -504,6 +536,9 @@
             "building_area": {
                 "label": "Edifício"
             },
             "building_area": {
                 "label": "Edifício"
             },

+            "cans": {
+                "label": "Aceita Cans"
+            },

             "capacity": {
                 "label": "Capacidade",
                 "placeholder": "50, 100, 200..."
             "capacity": {
                 "label": "Capacidade",
                 "placeholder": "50, 100, 200..."


@@ -518,6 +553,9 @@
                     "anticlockwise": "Sentido Anti-horário"
                 }
             },
                     "anticlockwise": "Sentido Anti-horário"
                 }
             },

+            "clothes": {
+                "label": "Aceita Clothes"
+            },

             "collection_times": {
                 "label": "Horários de Coleta"
             },
             "collection_times": {
                 "label": "Horários de Coleta"
             },


@@ -527,6 +565,9 @@
             "country": {
                 "label": "País"
             },
             "country": {
                 "label": "País"
             },

+            "covered": {
+                "label": "Coberto"
+            },

             "crossing": {
                 "label": "Tipo"
             },
             "crossing": {
                 "label": "Tipo"
             },


@@ -543,7 +584,7 @@
                 "label": "Descrição"
             },
             "elevation": {
                 "label": "Descrição"
             },
             "elevation": {

-                "label": "Elevação"
+                "label": "Altitude"

             },
             "emergency": {
                 "label": "Emergência"
             },
             "emergency": {
                 "label": "Emergência"


@@ -573,6 +614,17 @@
             "generator/type": {
                 "label": "Tipo"
             },
             "generator/type": {
                 "label": "Tipo"
             },

+            "glass": {
+                "label": "Aceita Vidro"
+            },
+            "golf_hole": {
+                "label": "Referência",
+                "placeholder": "Buraco numero (1-18)"
+            },
+            "handicap": {
+                "label": "Desvantagem",
+                "placeholder": "1-18"
+            },

             "highway": {
                 "label": "Tipo"
             },
             "highway": {
                 "label": "Tipo"
             },


@@ -586,7 +638,10 @@
                 "label": "Código ICAO"
             },
             "incline": {
                 "label": "Código ICAO"
             },
             "incline": {

-                "label": "Aclive"
+                "label": "Declividade"
+            },
+            "information": {
+                "label": "Tipo"

             },
             "internet_access": {
                 "label": "Acesso a Internet",
             },
             "internet_access": {
                 "label": "Acesso a Internet",


@@ -610,7 +665,7 @@
                 "label": "Tipo"
             },
             "levels": {
                 "label": "Tipo"
             },
             "levels": {

-                "label": "Níveis",
+                "label": "Número de andares",

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


@@ -654,6 +709,13 @@
             "operator": {
                 "label": "Operador"
             },
             "operator": {
                 "label": "Operador"
             },

+            "paper": {
+                "label": "Aceita Papel"
+            },
+            "par": {
+                "label": "par",
+                "placeholder": "3, 4, 5..."
+            },

             "park_ride": {
                 "label": "Estacionamento de Intercâmbio"
             },
             "park_ride": {
                 "label": "Estacionamento de Intercâmbio"
             },


@@ -664,6 +726,12 @@
                 "label": "Telefone",
                 "placeholder": "+55 11 0982 1098"
             },
                 "label": "Telefone",
                 "placeholder": "+55 11 0982 1098"
             },

+            "piste/difficulty": {
+                "label": "Dificuldade"
+            },
+            "piste/type": {
+                "label": "Modelo"
+            },

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


@@ -707,7 +775,7 @@
                 "label": "Tipo"
             },
             "shelter": {
                 "label": "Tipo"
             },
             "shelter": {

-                "label": "Abrigo"
+                "label": "Abrigo contra Intempéries"

             },
             "shelter_type": {
                 "label": "Tipo"
             },
             "shelter_type": {
                 "label": "Tipo"


@@ -727,7 +795,7 @@
                 "options": {
                     "bridge": "Ponte",
                     "tunnel": "Túnel",
                 "options": {
                     "bridge": "Ponte",
                     "tunnel": "Túnel",

-                    "embankment": "Aterro",
+                    "embankment": "Aterro Elevado",

                     "cutting": "Escavação"
                 }
             },
                     "cutting": "Escavação"
                 }
             },


@@ -807,7 +875,7 @@
                 "terms": "Hangar"
             },
             "aeroway/helipad": {
                 "terms": "Hangar"
             },
             "aeroway/helipad": {

-                "name": "Heliporto",
+                "name": "Heliponto",

                 "terms": "Heliporto, Heliponto, ponto de pouso de helicópteros"
             },
             "aeroway/runway": {
                 "terms": "Heliporto, Heliponto, ponto de pouso de helicópteros"
             },
             "aeroway/runway": {


@@ -815,8 +883,8 @@
                 "terms": "Pista de pouso e decolagem"
             },
             "aeroway/taxiway": {
                 "terms": "Pista de pouso e decolagem"
             },
             "aeroway/taxiway": {

-                "name": "Taxiway",
-                "terms": "Pista de taxiamento"
+                "name": "Pista de taxiamento",
+                "terms": "Taxiway"

             },
             "aeroway/terminal": {
                 "name": "Terminal de Aeroporto",
             },
             "aeroway/terminal": {
                 "name": "Terminal de Aeroporto",


@@ -827,15 +895,15 @@
                 "terms": "Serviço"
             },
             "amenity/arts_centre": {
                 "terms": "Serviço"
             },
             "amenity/arts_centre": {

-                "name": "Centro de Artes",
-                "terms": "Artes, Teatro, Cinema, Espetáculo, Exposições"
+                "name": "Centro/Escola de Artes",
+                "terms": "Centro de Artes, Escola de Artes, Artes, Centro Artístico, Escola Artística, Teatro, Cinema, Espetáculo, Exposições"

             },
             "amenity/atm": {
                 "name": "Caixa Eletrônico",
                 "terms": "Caixa eletrônico"
             },
             "amenity/bank": {
             },
             "amenity/atm": {
                 "name": "Caixa Eletrônico",
                 "terms": "Caixa eletrônico"
             },
             "amenity/bank": {

-                "name": "Banco",
+                "name": "Agência bancária",

                 "terms": "Banco"
             },
             "amenity/bar": {
                 "terms": "Banco"
             },
             "amenity/bar": {


@@ -890,6 +958,9 @@
                 "name": "Tribunal",
                 "terms": "Tribunal, Fórum"
             },
                 "name": "Tribunal",
                 "terms": "Tribunal, Fórum"
             },

+            "amenity/dentist": {
+                "name": "Dentista"
+            },

             "amenity/drinking_water": {
                 "name": "Água Potável",
                 "terms": "Água Potável, Bebedouro"
             "amenity/drinking_water": {
                 "name": "Água Potável",
                 "terms": "Água Potável, Bebedouro"


@@ -903,7 +974,7 @@
                 "terms": "fast food, lanchonete, lanches, Lancheria"
             },
             "amenity/fire_station": {
                 "terms": "fast food, lanchonete, lanches, Lancheria"
             },
             "amenity/fire_station": {

-                "name": "Bombeiros",
+                "name": "Posto de Bombeiros",

                 "terms": "Posto de Bombeiros, Bombeiros, Central de Bombeiros"
             },
             "amenity/fountain": {
                 "terms": "Posto de Bombeiros, Bombeiros, Central de Bombeiros"
             },
             "amenity/fountain": {


@@ -911,7 +982,7 @@
                 "terms": "Chafariz, Fonte Aquática"
             },
             "amenity/fuel": {
                 "terms": "Chafariz, Fonte Aquática"
             },
             "amenity/fuel": {

-                "name": "Posto de Gasolina",
+                "name": "Posto de Combustível",

                 "terms": "Posto de Gasolina"
             },
             "amenity/grave_yard": {
                 "terms": "Posto de Gasolina"
             },
             "amenity/grave_yard": {


@@ -943,7 +1014,7 @@
                 "terms": "Farmácia, Drogaria, Farmácia de Manipulação"
             },
             "amenity/place_of_worship": {
                 "terms": "Farmácia, Drogaria, Farmácia de Manipulação"
             },
             "amenity/place_of_worship": {

-                "name": "Templo",
+                "name": "Local de Prática Religiosa",

                 "terms": "Local de Culto, Lugar de Adoração, Abadia, Basílica, Betel, Catedral, Mor, Capela, Igreja, Aprisco, Casa de Deus, Casa de oração, Casa de adoração, Mesquita, Oratório, Paróquia, Santuário, Sinagoga, Tabernáculo, Templo"
             },
             "amenity/place_of_worship/buddhist": {
                 "terms": "Local de Culto, Lugar de Adoração, Abadia, Basílica, Betel, Catedral, Mor, Capela, Igreja, Aprisco, Casa de Deus, Casa de oração, Casa de adoração, Mesquita, Oratório, Paróquia, Santuário, Sinagoga, Tabernáculo, Templo"
             },
             "amenity/place_of_worship/buddhist": {


@@ -982,6 +1053,9 @@
                 "name": "Estação de Patrulha",
                 "terms": "Patrulha, Ranger"
             },
                 "name": "Estação de Patrulha",
                 "terms": "Patrulha, Ranger"
             },

+            "amenity/recycling": {
+                "name": "Reciclagem"
+            },

             "amenity/restaurant": {
                 "name": "Restaurante",
                 "terms": "Restaurante"
             "amenity/restaurant": {
                 "name": "Restaurante",
                 "terms": "Restaurante"


@@ -1003,7 +1077,7 @@
                 "terms": "Ponto de Táxi"
             },
             "amenity/telephone": {
                 "terms": "Ponto de Táxi"
             },
             "amenity/telephone": {

-                "name": "Telefone",
+                "name": "Telefone Público",

                 "terms": "Telefone"
             },
             "amenity/theatre": {
                 "terms": "Telefone"
             },
             "amenity/theatre": {


@@ -1011,11 +1085,11 @@
                 "terms": "Teatro"
             },
             "amenity/toilets": {
                 "terms": "Teatro"
             },
             "amenity/toilets": {

-                "name": "Banheiros",
+                "name": "Banheiros Públicos",

                 "terms": "Banheiros, Sanitário, WC, Toiletes, Toilettes, Lavabo, Toalete"
             },
             "amenity/townhall": {
                 "terms": "Banheiros, Sanitário, WC, Toiletes, Toilettes, Lavabo, Toalete"
             },
             "amenity/townhall": {

-                "name": "Prefeitura",
+                "name": "Paço Municipal",

                 "terms": "Prefeitura"
             },
             "amenity/university": {
                 "terms": "Prefeitura"
             },
             "amenity/university": {


@@ -1027,7 +1101,7 @@
                 "terms": "Totem de vendas, Máquina de Venda Automática"
             },
             "amenity/waste_basket": {
                 "terms": "Totem de vendas, Máquina de Venda Automática"
             },
             "amenity/waste_basket": {

-                "name": "Cesto de Lixo",
+                "name": "Lixeira",

                 "terms": "Cesto de Lixo, Lixeira, Balde de Lixo"
             },
             "area": {
                 "terms": "Cesto de Lixo, Lixeira, Balde de Lixo"
             },
             "area": {


@@ -1043,8 +1117,8 @@
                 "terms": "Bloco"
             },
             "barrier/bollard": {
                 "terms": "Bloco"
             },
             "barrier/bollard": {

-                "name": "Poste",
-                "terms": "Pilar, Poste, Cabeço"
+                "name": "Pilarete",
+                "terms": "Pilar, Poste, Cabeço, Pedestal, Estaca"

             },
             "barrier/cattle_grid": {
                 "name": "Mata-burro",
             },
             "barrier/cattle_grid": {
                 "name": "Mata-burro",


@@ -1079,23 +1153,23 @@
                 "terms": "Cerca viva"
             },
             "barrier/kissing_gate": {
                 "terms": "Cerca viva"
             },
             "barrier/kissing_gate": {

-                "name": "Porteira Giratória",
+                "name": "Kissing Gate",

                 "terms": "Porteira Giratória"
             },
             "barrier/lift_gate": {
                 "terms": "Porteira Giratória"
             },
             "barrier/lift_gate": {

-                "name": "Cancela",
+                "name": "Cancela Elevatória",

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

-                "name": "Barreira de Retenção",
-                "terms": "Muro de Contenção"
+                "name": "Muro de Contenção",
+                "terms": "Barreira de Retenção"

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

-                "name": "Passagem Fixa por Barreira",
+                "name": "Travessia em Cerca/Muro",

                 "terms": "Passagem Fixa por Barreira"
             },
             "barrier/toll_booth": {
                 "terms": "Passagem Fixa por Barreira"
             },
             "barrier/toll_booth": {

-                "name": "Pedágio",
+                "name": "Cabine de Pedágio",

                 "terms": "Pedágio"
             },
             "barrier/wall": {
                 "terms": "Pedágio"
             },
             "barrier/wall": {


@@ -1114,6 +1188,12 @@
                 "name": "Apartamentos",
                 "terms": "Apartamentos, Kit net"
             },
                 "name": "Apartamentos",
                 "terms": "Apartamentos, Kit net"
             },

+            "building/chapel": {
+                "name": "Capela"
+            },
+            "building/church": {
+                "name": "Igreja"
+            },

             "building/commercial": {
                 "name": "Edifício Comercial",
                 "terms": "Edifício Comercial, Prédio Comercial"
             "building/commercial": {
                 "name": "Edifício Comercial",
                 "terms": "Edifício Comercial, Prédio Comercial"


@@ -1123,9 +1203,13 @@
                 "terms": "Entrada"
             },
             "building/garage": {
                 "terms": "Entrada"
             },
             "building/garage": {

-                "name": "Garagem",
+                "name": "Garagem Individual",

                 "terms": "Garagem"
             },
                 "terms": "Garagem"
             },

+            "building/garages": {
+                "name": "Garagens",
+                "terms": "Garagens"
+            },

             "building/house": {
                 "name": "Casa",
                 "terms": "Casa"
             "building/house": {
                 "name": "Casa",
                 "terms": "Casa"


@@ -1142,8 +1226,29 @@
                 "name": "Edifício Residencial",
                 "terms": "Edifício Residencial"
             },
                 "name": "Edifício Residencial",
                 "terms": "Edifício Residencial"
             },

+            "building/roof": {
+                "name": "Teto"
+            },
+            "craft/beekeeper": {
+                "name": "Apicultor"
+            },
+            "craft/blacksmith": {
+                "name": "Ferreiro"
+            },
+            "craft/brewery": {
+                "name": "Cervejaria"
+            },
+            "craft/carpenter": {
+                "name": "Carpinteiro"
+            },
+            "craft/locksmith": {
+                "name": "Chaveiro"
+            },
+            "craft/photographer": {
+                "name": "Fotógrafo"
+            },

             "embankment": {
             "embankment": {

-                "name": "Aterro",
+                "name": "Aterro Elevado",

                 "terms": "aterro,terrapleno"
             },
             "emergency/ambulance_station": {
                 "terms": "aterro,terrapleno"
             },
             "emergency/ambulance_station": {


@@ -1163,8 +1268,8 @@
                 "terms": "Entrada"
             },
             "footway/crossing": {
                 "terms": "Entrada"
             },
             "footway/crossing": {

-                "name": "Cruzamento",
-                "terms": "cruzamento,passagem"
+                "name": "Travessia",
+                "terms": "faixa de segurança,cruzamento,passagem"

             },
             "footway/sidewalk": {
                 "name": "Calçada",
             },
             "footway/sidewalk": {
                 "name": "Calçada",


@@ -1175,27 +1280,27 @@
                 "terms": "Rodovia"
             },
             "highway/bridleway": {
                 "terms": "Rodovia"
             },
             "highway/bridleway": {

-                "name": "Trilha de Equitação",
-                "terms": "Hipovia, Picadeiro, Caminho para Calvagada"
+                "name": "Hipovia",
+                "terms": "Hipovia, Picadeiro, Caminho para Calvagada, Trilha de Equitação"

             },
             "highway/bus_stop": {
                 "name": "Ponto de Ônibus",
                 "terms": "Ponto de Ônibus, Parada de Ônibus"
             },
             "highway/crossing": {
             },
             "highway/bus_stop": {
                 "name": "Ponto de Ônibus",
                 "terms": "Ponto de Ônibus, Parada de Ônibus"
             },
             "highway/crossing": {

-                "name": "Cruzamento",
-                "terms": "Travessia, Faixa de Segurança"
+                "name": "Faixa de Pedestre",
+                "terms": "Interseção"

             },
             "highway/cycleway": {
                 "name": "Ciclovia",
                 "terms": "Ciclovia"
             },
             "highway/footway": {
             },
             "highway/cycleway": {
                 "name": "Ciclovia",
                 "terms": "Ciclovia"
             },
             "highway/footway": {

-                "name": "Via de Pedestre",
-                "terms": "Caminho de Pedestre, Passeio, Calçada"
+                "name": "Pista de Caminhada",
+                "terms": "Via de Pedestre, Caminho de Pedestre, Passeio, Calçada"

             },
             "highway/living_street": {
             },
             "highway/living_street": {

-                "name": "Rua Viva",
+                "name": "Via de Espaço Compartilhado",

                 "terms": "Rua Viva, Rua Preferencial a Pedestres"
             },
             "highway/mini_roundabout": {
                 "terms": "Rua Viva, Rua Preferencial a Pedestres"
             },
             "highway/mini_roundabout": {


@@ -1203,19 +1308,19 @@
                 "terms": "Mini-Rotatória"
             },
             "highway/motorway": {
                 "terms": "Mini-Rotatória"
             },
             "highway/motorway": {

-                "name": "Auto-Estrada",
-                "terms": "Autoestrada"
+                "name": "Autoestrada",
+                "terms": "Auto-estrada, auto estrada"

             },
             "highway/motorway_junction": {
                 "name": "Saída de Autoestrada",
                 "terms": "Saída de Autoestrada"
             },
             "highway/motorway_link": {
             },
             "highway/motorway_junction": {
                 "name": "Saída de Autoestrada",
                 "terms": "Saída de Autoestrada"
             },
             "highway/motorway_link": {

-                "name": "Acesso a Autoestrada",
+                "name": "Ligação de Autoestrada",

                 "terms": "Acesso a Autoestrada"
             },
             "highway/path": {
                 "terms": "Acesso a Autoestrada"
             },
             "highway/path": {

-                "name": "Caminho",
+                "name": "Trilha Não-Automotiva",

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


@@ -1227,8 +1332,8 @@
                 "terms": "Via Primária"
             },
             "highway/primary_link": {
                 "terms": "Via Primária"
             },
             "highway/primary_link": {

-                "name": "Acesso a Via Primária",
-                "terms": "Acesso Primário"
+                "name": "Ligação Primária",
+                "terms": "Acesso Primário, Acesso a Via Primária"

             },
             "highway/residential": {
                 "name": "Via Residencial",
             },
             "highway/residential": {
                 "name": "Via Residencial",


@@ -1243,8 +1348,8 @@
                 "terms": "Via Secundária"
             },
             "highway/secondary_link": {
                 "terms": "Via Secundária"
             },
             "highway/secondary_link": {

-                "name": "Acesso a Via Secundária",
-                "terms": "Acesso a Via Secundária"
+                "name": "Ligação Secundária",
+                "terms": "Acesso Secundário, Acesso a Via Secundária"

             },
             "highway/service": {
                 "name": "Via de Serviço",
             },
             "highway/service": {
                 "name": "Via de Serviço",


@@ -1271,8 +1376,8 @@
                 "terms": "Corredor de Estacionamento"
             },
             "highway/steps": {
                 "terms": "Corredor de Estacionamento"
             },
             "highway/steps": {

-                "name": "Escadaria",
-                "terms": "Degraus, Escada"
+                "name": "Via com Degraus",
+                "terms": "Degraus, Escada, Escadaria"

             },
             "highway/stop": {
                 "name": "Placa de Pare",
             },
             "highway/stop": {
                 "name": "Placa de Pare",


@@ -1283,12 +1388,12 @@
                 "terms": "Via Terciária"
             },
             "highway/tertiary_link": {
                 "terms": "Via Terciária"
             },
             "highway/tertiary_link": {

-                "name": "Acesso a Via Terciária",
-                "terms": "Acesso a Via Terciária"
+                "name": "Ligação Terciária",
+                "terms": "Acesso Terciário, Acesso a Via Terciária"

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

-                "name": "Trilha",
-                "terms": "Caminho"
+                "name": "Estrada Rústica",
+                "terms": "Trilha Automotiva, Estrada de Fazenda, Estrada Agrícola, Estrada Bucólica, Caminho"

             },
             "highway/traffic_signals": {
                 "name": "Semáforo",
             },
             "highway/traffic_signals": {
                 "name": "Semáforo",


@@ -1299,11 +1404,11 @@
                 "terms": "Via Expressa"
             },
             "highway/trunk_link": {
                 "terms": "Via Expressa"
             },
             "highway/trunk_link": {

-                "name": "Acesso a Via Expressa",
+                "name": "Ligação de Via Expressa",

                 "terms": "Acesso a Via Expressa"
             },
             "highway/turning_circle": {
                 "terms": "Acesso a Via Expressa"
             },
             "highway/turning_circle": {

-                "name": "Rotatória",
+                "name": "Balão de Retorno",

                 "terms": "Balão de Retorno"
             },
             "highway/unclassified": {
                 "terms": "Balão de Retorno"
             },
             "highway/unclassified": {


@@ -1340,11 +1445,11 @@
             },
             "historic/wayside_cross": {
                 "name": "Cruz de Beira de Estrada",
             },
             "historic/wayside_cross": {
                 "name": "Cruz de Beira de Estrada",

-                "terms": "Cruz de Beira de Estrada"
+                "terms": "Cruz de Beira de Estrada, Cruzeiro"

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

-                "name": "Ermida",
-                "terms": "Ermida"
+                "name": "Capelinha de Beira de Estrada",
+                "terms": "Ermida, Alminhas"

             },
             "landuse": {
                 "name": "Uso da Terra",
             },
             "landuse": {
                 "name": "Uso da Terra",


@@ -1359,7 +1464,7 @@
                 "terms": "Bacia"
             },
             "landuse/cemetery": {
                 "terms": "Bacia"
             },
             "landuse/cemetery": {

-                "name": "Cemitério",
+                "name": "Cemitério Secular",

                 "terms": "Sepulcrário, Cemitério"
             },
             "landuse/commercial": {
                 "terms": "Sepulcrário, Cemitério"
             },
             "landuse/commercial": {


@@ -1371,7 +1476,7 @@
                 "terms": "Construção"
             },
             "landuse/farm": {
                 "terms": "Construção"
             },
             "landuse/farm": {

-                "name": "Fazenda",
+                "name": "Lavoura",

                 "terms": "Fazenda"
             },
             "landuse/farmland": {
                 "terms": "Fazenda"
             },
             "landuse/farmland": {


@@ -1379,7 +1484,7 @@
                 "terms": "agricultura,terra,campo,roça"
             },
             "landuse/farmyard": {
                 "terms": "agricultura,terra,campo,roça"
             },
             "landuse/farmyard": {

-                "name": "Granja",
+                "name": "Pátio de Fazenda",

                 "terms": "Pátio de Fazenda"
             },
             "landuse/forest": {
                 "terms": "Pátio de Fazenda"
             },
             "landuse/forest": {


@@ -1396,7 +1501,7 @@
             },
             "landuse/meadow": {
                 "name": "Prado",
             },
             "landuse/meadow": {
                 "name": "Prado",

-                "terms": "Prado, Pasto"
+                "terms": "Prado, Pasto, Pradaria"

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


@@ -1411,11 +1516,11 @@
                 "terms": "Residencial"
             },
             "landuse/retail": {
                 "terms": "Residencial"
             },
             "landuse/retail": {

-                "name": "Comércio",
-                "terms": "Varejo"
+                "name": "Varejo",
+                "terms": "Varejo, comércio"

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

-                "name": "Vinhedo",
+                "name": "Vinha",

                 "terms": "Vinha, Vinhedo"
             },
             "leisure": {
                 "terms": "Vinha, Vinhedo"
             },
             "leisure": {


@@ -1427,8 +1532,8 @@
                 "terms": "Comum, Habitual, Frequente"
             },
             "leisure/dog_park": {
                 "terms": "Comum, Habitual, Frequente"
             },
             "leisure/dog_park": {

-                "name": "Parque de Cães",
-                "terms": "Parque de Cães"
+                "name": "Cachorródromo",
+                "terms": "Canódromo, Parque de Cães, Parque Canino"

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


@@ -1443,12 +1548,12 @@
                 "terms": "Marina"
             },
             "leisure/park": {
                 "terms": "Marina"
             },
             "leisure/park": {

-                "name": "Parque",
-                "terms": "Parque"
+                "name": "Parque/Praça",
+                "terms": "Parque, praça"

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

-                "name": "Campo de Esportes",
-                "terms": "Campo Esportivo, Quadra Esportiva"
+                "name": "Quadra Esportiva",
+                "terms": "Campo de Esportes, Campo Esportivo, Quadra Esportiva"

             },
             "leisure/pitch/american_football": {
                 "name": "Campo de Futebol Americano",
             },
             "leisure/pitch/american_football": {
                 "name": "Campo de Futebol Americano",


@@ -1487,8 +1592,8 @@
                 "terms": "Rampa Náutica"
             },
             "leisure/sports_center": {
                 "terms": "Rampa Náutica"
             },
             "leisure/sports_center": {

-                "name": "Centro Esportivo",
-                "terms": "Ginásio de Esportes, Ginásio Poliesportivo, Academia de Esportes,"
+                "name": "Centro/Clube Esportivo",
+                "terms": "Centro Esportivo, Clube Esportivo, Ginásio de Esportes, Ginásio Poliesportivo, Academia de Esportes, Academia de Ginástica"

             },
             "leisure/stadium": {
                 "name": "Estádio",
             },
             "leisure/stadium": {
                 "name": "Estádio",


@@ -1511,8 +1616,8 @@
                 "terms": "Construção Humana"
             },
             "man_made/breakwater": {
                 "terms": "Construção Humana"
             },
             "man_made/breakwater": {

-                "name": "Quebra-mar",
-                "terms": "Quebra-mar"
+                "name": "Molhe/Quebra-Mar",
+                "terms": "Molhe, Quebra-Mar"

             },
             "man_made/cutline": {
                 "name": "Linha de Corte em Floresta",
             },
             "man_made/cutline": {
                 "name": "Linha de Corte em Floresta",


@@ -1523,7 +1628,7 @@
                 "terms": "aterro,terrapleno"
             },
             "man_made/flagpole": {
                 "terms": "aterro,terrapleno"
             },
             "man_made/flagpole": {

-                "name": "Mastro",
+                "name": "Mastro de Bandeira",

                 "terms": "matro,bandeira,pau de bandeira"
             },
             "man_made/lighthouse": {
                 "terms": "matro,bandeira,pau de bandeira"
             },
             "man_made/lighthouse": {


@@ -1539,12 +1644,12 @@
                 "terms": "Píer"
             },
             "man_made/pipeline": {
                 "terms": "Píer"
             },
             "man_made/pipeline": {

-                "name": "Encanamento",
-                "terms": "Tubulação"
+                "name": "Tubulação",
+                "terms": "Encanamento"

             },
             "man_made/survey_point": {
             },
             "man_made/survey_point": {

-                "name": "Marco Geodésico",
-                "terms": "Marco Geodésico"
+                "name": "Ponto de Exame Geográfico",
+                "terms": "Marco Geodésico, Equipamento de GPS Diferencial"

             },
             "man_made/tower": {
                 "name": "Torre",
             },
             "man_made/tower": {
                 "name": "Torre",


@@ -1555,7 +1660,7 @@
                 "terms": "Estação de Tratamento de Esgoto"
             },
             "man_made/water_tower": {
                 "terms": "Estação de Tratamento de Esgoto"
             },
             "man_made/water_tower": {

-                "name": "Caixa d'água",
+                "name": "Caixa d'Ã\81gua",

                 "terms": "Caixa d'Água"
             },
             "man_made/water_well": {
                 "terms": "Caixa d'Água"
             },
             "man_made/water_well": {


@@ -1603,8 +1708,7 @@
                 "terms": "Orla Marítima, Linha Costeira"
             },
             "natural/fell": {
                 "terms": "Orla Marítima, Linha Costeira"
             },
             "natural/fell": {

-                "name": "Colina",
-                "terms": "Caiu"
+                "name": "Fell"

             },
             "natural/glacier": {
                 "name": "Geleira",
             },
             "natural/glacier": {
                 "name": "Geleira",


@@ -1615,20 +1719,20 @@
                 "terms": "Pradaria"
             },
             "natural/heath": {
                 "terms": "Pradaria"
             },
             "natural/heath": {

-                "name": "Matagal",
-                "terms": "Matagal"
+                "name": "Urzal",
+                "terms": "Urzal"

             },
             "natural/peak": {
             },
             "natural/peak": {

-                "name": "Pico",
+                "name": "Cume",

                 "terms": "Pico, Topo de Montanha, Serra, Montanha, Monte"
             },
             "natural/scree": {
                 "terms": "Pico, Topo de Montanha, Serra, Montanha, Monte"
             },
             "natural/scree": {

-                "name": "Cascalho",
-                "terms": "Seixos, Pedras"
+                "name": "Pedregulhos",
+                "terms": "Seixos, Pedras, Cascalho"

             },
             "natural/scrub": {
                 "name": "Arbustos",
             },
             "natural/scrub": {
                 "name": "Arbustos",

-                "terms": "Moita, Arbusto"
+                "terms": "Moita, Arbusto, Matagal"

             },
             "natural/spring": {
                 "name": "Nascente",
             },
             "natural/spring": {
                 "name": "Nascente",


@@ -1715,7 +1819,7 @@
                 "terms": "advogado,advocacia,escritório"
             },
             "office/newspaper": {
                 "terms": "advogado,advocacia,escritório"
             },
             "office/newspaper": {

-                "name": "Jornal",
+                "name": "Escritório de Jornal",

                 "terms": "jornal,notícia"
             },
             "office/ngo": {
                 "terms": "jornal,notícia"
             },
             "office/ngo": {


@@ -1751,8 +1855,8 @@
                 "terms": "Local"
             },
             "place/city": {
                 "terms": "Local"
             },
             "place/city": {

-                "name": "Cidade",
-                "terms": "Cidade"
+                "name": "Cidade Maior",
+                "terms": "Cidade, Município"

             },
             "place/hamlet": {
                 "name": "Lugarejo",
             },
             "place/hamlet": {
                 "name": "Lugarejo",


@@ -1771,8 +1875,8 @@
                 "terms": "Localidade"
             },
             "place/town": {
                 "terms": "Localidade"
             },
             "place/town": {

-                "name": "Vila",
-                "terms": "Vila, Cidade"
+                "name": "Cidade Menor",
+                "terms": "Vila, Cidade, Município"

             },
             "place/village": {
                 "name": "Povoado",
             },
             "place/village": {
                 "name": "Povoado",


@@ -1791,7 +1895,7 @@
                 "terms": "Gerador, Energia"
             },
             "power/line": {
                 "terms": "Gerador, Energia"
             },
             "power/line": {

-                "name": "Linha de Transmissão de Energia Elétrica",
+                "name": "Linha de Transmissão",

                 "terms": "Fio Elétrico"
             },
             "power/minor_line": {
                 "terms": "Fio Elétrico"
             },
             "power/minor_line": {


@@ -1799,7 +1903,7 @@
                 "terms": "Menor Linha de Energia"
             },
             "power/pole": {
                 "terms": "Menor Linha de Energia"
             },
             "power/pole": {

-                "name": "Poste Elétrico",
+                "name": "Poste de Transmissão",

                 "terms": "Poste Elétrico"
             },
             "power/sub_station": {
                 "terms": "Poste Elétrico"
             },
             "power/sub_station": {


@@ -1831,12 +1935,11 @@
                 "terms": "Ferrovia Abandonada"
             },
             "railway/disused": {
                 "terms": "Ferrovia Abandonada"
             },
             "railway/disused": {

-                "name": "Ferrovia em Desuso",
+                "name": "Ferrovia Inativa",

                 "terms": "Ferrovia em Desuso"
             },
             "railway/halt": {
                 "terms": "Ferrovia em Desuso"
             },
             "railway/halt": {

-                "name": "Interrupção de Ferrovia",
-                "terms": "Final de Ferrovia, Interrupção de Estrada de Ferro"
+                "name": "Parada de Ferrovia"

             },
             "railway/level_crossing": {
                 "name": "Passagem de Nível",
             },
             "railway/level_crossing": {
                 "name": "Passagem de Nível",


@@ -1851,7 +1954,7 @@
                 "terms": "Plataforma de Trem"
             },
             "railway/rail": {
                 "terms": "Plataforma de Trem"
             },
             "railway/rail": {

-                "name": "Trilho",
+                "name": "Trilho de trem",

                 "terms": "Trilho"
             },
             "railway/station": {
                 "terms": "Trilho"
             },
             "railway/station": {


@@ -1859,7 +1962,7 @@
                 "terms": "Estação Ferroviária"
             },
             "railway/subway": {
                 "terms": "Estação Ferroviária"
             },
             "railway/subway": {

-                "name": "Metrô",
+                "name": "Trilho de metrô",

                 "terms": "Metrô"
             },
             "railway/subway_entrance": {
                 "terms": "Metrô"
             },
             "railway/subway_entrance": {


@@ -1867,7 +1970,7 @@
                 "terms": "Entrada de Metrô"
             },
             "railway/tram": {
                 "terms": "Entrada de Metrô"
             },
             "railway/tram": {

-                "name": "Bonde",
+                "name": "Trilho de bonde",

                 "terms": "Bonde"
             },
             "relation": {
                 "terms": "Bonde"
             },
             "relation": {


@@ -1875,7 +1978,7 @@
                 "terms": "Relação"
             },
             "route/ferry": {
                 "terms": "Relação"
             },
             "route/ferry": {

-                "name": "Rota de Barco",
+                "name": "Rota de Balsa",

                 "terms": "Rota de Barco, Rota de Balsa"
             },
             "shop": {
                 "terms": "Rota de Barco, Rota de Balsa"
             },
             "shop": {


@@ -1915,7 +2018,7 @@
                 "terms": "Açougue"
             },
             "shop/car": {
                 "terms": "Açougue"
             },
             "shop/car": {

-                "name": "Concessionária de Automóveis",
+                "name": "Revenda de Automóveis",

                 "terms": "Concessionária de Automóveis"
             },
             "shop/car_parts": {
                 "terms": "Concessionária de Automóveis"
             },
             "shop/car_parts": {


@@ -1923,7 +2026,7 @@
                 "terms": "Loja de Peças Automotivas"
             },
             "shop/car_repair": {
                 "terms": "Loja de Peças Automotivas"
             },
             "shop/car_repair": {

-                "name": "Oficina Automotiva",
+                "name": "Oficina Mecânica",

                 "terms": "Oficina Automotiva"
             },
             "shop/chemist": {
                 "terms": "Oficina Automotiva"
             },
             "shop/chemist": {


@@ -1951,15 +2054,15 @@
                 "terms": "Delicatessen"
             },
             "shop/department_store": {
                 "terms": "Delicatessen"
             },
             "shop/department_store": {

-                "name": "Loja de Departamentos",
+                "name": "Loja de Departamento",

                 "terms": "Loja de Departamento"
             },
             "shop/doityourself": {
                 "terms": "Loja de Departamento"
             },
             "shop/doityourself": {

-                "name": "Loja de Bricolagem",
+                "name": "Loja de Ferragens/Bricolagem",

                 "terms": "Loja de Bricolagem, Faça você mesmo"
             },
             "shop/dry_cleaning": {
                 "terms": "Loja de Bricolagem, Faça você mesmo"
             },
             "shop/dry_cleaning": {

-                "name": "Limpeza a Seco",
+                "name": "Lavagem de Roupas a Seco",

                 "terms": "Limpeza a Seco, Lavagem a Seco"
             },
             "shop/electronics": {
                 "terms": "Limpeza a Seco, Lavagem a Seco"
             },
             "shop/electronics": {


@@ -1983,7 +2086,7 @@
                 "terms": "Loja de Móveis, Decoração"
             },
             "shop/garden_centre": {
                 "terms": "Loja de Móveis, Decoração"
             },
             "shop/garden_centre": {

-                "name": "Loja de Jardinagem",
+                "name": "Centro de Jardinagem",

                 "terms": "Loja de Jardinagem"
             },
             "shop/gift": {
                 "terms": "Loja de Jardinagem"
             },
             "shop/gift": {


@@ -1991,8 +2094,8 @@
                 "terms": "Loja de Presentes"
             },
             "shop/greengrocer": {
                 "terms": "Loja de Presentes"
             },
             "shop/greengrocer": {

-                "name": "Quitanda",
-                "terms": "Quitanda"
+                "name": "Verdureiro",
+                "terms": "Quitanda, Quitandeiro"

             },
             "shop/hairdresser": {
                 "name": "Cabeleireiro",
             },
             "shop/hairdresser": {
                 "name": "Cabeleireiro",


@@ -2003,15 +2106,15 @@
                 "terms": "Loja de Ferragens, Material de Construção, Loja de Tintas, Loja de Parafusos"
             },
             "shop/hifi": {
                 "terms": "Loja de Ferragens, Material de Construção, Loja de Tintas, Loja de Parafusos"
             },
             "shop/hifi": {

-                "name": "Loja de Equipamentos de Áudio",
-                "terms": "Loja de Equipamentos de Áudio"
+                "name": "Loja de Aparelhos Hi-Fi",
+                "terms": "Loja de Equipamentos de Áudio, Loja de Aparelhos de Alta Fidelidade"

             },
             "shop/jewelry": {
                 "name": "Joalheria",
                 "terms": "Joalheria"
             },
             "shop/kiosk": {
             },
             "shop/jewelry": {
                 "name": "Joalheria",
                 "terms": "Joalheria"
             },
             "shop/kiosk": {

-                "name": "Quiosque",
+                "name": "Quiosque Comercial",

                 "terms": "Quiosque"
             },
             "shop/laundry": {
                 "terms": "Quiosque"
             },
             "shop/laundry": {


@@ -2023,20 +2126,20 @@
                 "terms": "Técnico de Chaves e Cadeados, Cópia de Chaves, Conserto de Cadeados"
             },
             "shop/mall": {
                 "terms": "Técnico de Chaves e Cadeados, Cópia de Chaves, Conserto de Cadeados"
             },
             "shop/mall": {

-                "name": "Shopping Center",
-                "terms": "Centro Comercial, Galeria"
+                "name": "Centro Comercial",
+                "terms": "Shopping Center, Galeria"

             },
             "shop/mobile_phone": {
                 "name": "Loja de Celulares",
                 "terms": "Loja de Celulares, Loja de Telefones Celulares"
             },
             "shop/motorcycle": {
             },
             "shop/mobile_phone": {
                 "name": "Loja de Celulares",
                 "terms": "Loja de Celulares, Loja de Telefones Celulares"
             },
             "shop/motorcycle": {

-                "name": "Concessionária de Motos",
+                "name": "Revenda de Motos",

                 "terms": "Concessionária de Motos"
             },
             "shop/music": {
                 "terms": "Concessionária de Motos"
             },
             "shop/music": {

-                "name": "Loja Musical",
-                "terms": "Loja de Discos Musicais, Loja de CD's, Loja de Vinil"
+                "name": "Loja de Instrumentos Musicais",
+                "terms": "Loja de Discos Musicais, Loja de CD's, Loja de Vinil, Loja Musical"

             },
             "shop/newsagent": {
                 "name": "Banca de Jornal",
             },
             "shop/newsagent": {
                 "name": "Banca de Jornal",


@@ -2047,7 +2150,7 @@
                 "terms": "Ótica"
             },
             "shop/outdoor": {
                 "terms": "Ótica"
             },
             "shop/outdoor": {

-                "name": "Loja de Esportes de Aventura",
+                "name": "Loja de Esporte/Aventura",

                 "terms": "Loja de Esportes de Aventura"
             },
             "shop/pet": {
                 "terms": "Loja de Esportes de Aventura"
             },
             "shop/pet": {


@@ -2091,12 +2194,12 @@
                 "terms": "Loja Desocupada"
             },
             "shop/variety_store": {
                 "terms": "Loja Desocupada"
             },
             "shop/variety_store": {

-                "name": "Loja de Variedades",
-                "terms": "Loja de Variedades"
+                "name": "Loja de Variedades a 1,99",
+                "terms": "Loja de Variedades, Um e Noventa e Nove, 1.99, 199"

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

-                "name": "Loja ou Locadora de Vídeos",
-                "terms": "Loja de Vídeos"
+                "name": "Loja/Locadora de Vídeos",
+                "terms": "Loja de Vídeos, Locadora de Vídeos, Videolocadora"

             },
             "tourism": {
                 "name": "Turismo",
             },
             "tourism": {
                 "name": "Turismo",


@@ -2115,8 +2218,8 @@
                 "terms": "Atração Turística"
             },
             "tourism/camp_site": {
                 "terms": "Atração Turística"
             },
             "tourism/camp_site": {

-                "name": "Camping",
-                "terms": "Parque de Campismo, Acampamento"
+                "name": "Local de Acampamento",
+                "terms": "Parque de Campismo, Acampamento, Camping"

             },
             "tourism/caravan_site": {
                 "name": "Estacionamento de Trailers",
             },
             "tourism/caravan_site": {
                 "name": "Estacionamento de Trailers",


@@ -2131,12 +2234,12 @@
                 "terms": "Guesthouse"
             },
             "tourism/hostel": {
                 "terms": "Guesthouse"
             },
             "tourism/hostel": {

-                "name": "Albergue",
-                "terms": "Albergue, Hostel"
+                "name": "Hostel",
+                "terms": "Albergue"

             },
             "tourism/hotel": {
                 "name": "Hotel",
             },
             "tourism/hotel": {
                 "name": "Hotel",

-                "terms": "Hotel, Pousada"
+                "terms": "Hotel, Pousada, Motel"

             },
             "tourism/information": {
                 "name": "Informações Turísticas",
             },
             "tourism/information": {
                 "name": "Informações Turísticas",


@@ -2151,7 +2254,7 @@
                 "terms": "Museu"
             },
             "tourism/picnic_site": {
                 "terms": "Museu"
             },
             "tourism/picnic_site": {

-                "name": "Lugar de Piquenique",
+                "name": "Local de Piquenique",

                 "terms": "Lugar de Piquenique"
             },
             "tourism/theme_park": {
                 "terms": "Lugar de Piquenique"
             },
             "tourism/theme_park": {


@@ -2239,7 +2342,7 @@
                 "terms": "Outro"
             },
             "waterway": {
                 "terms": "Outro"
             },
             "waterway": {

-                "name": "Hidrovia",
+                "name": "Via Aquática",

                 "terms": "Canal, Hidrovia, Curso d'Água"
             },
             "waterway/canal": {
                 "terms": "Canal, Hidrovia, Curso d'Água"
             },
             "waterway/canal": {


@@ -2247,15 +2350,15 @@
                 "terms": "Canal"
             },
             "waterway/dam": {
                 "terms": "Canal"
             },
             "waterway/dam": {

-                "name": "Represa",
-                "terms": "Represa, Barragem"
+                "name": "Barragem",
+                "terms": "Represa"

             },
             "waterway/ditch": {
                 "name": "Vala",
                 "terms": "Vala"
             },
             "waterway/drain": {
             },
             "waterway/ditch": {
                 "name": "Vala",
                 "terms": "Vala"
             },
             "waterway/drain": {

-                "name": "Dreno",
+                "name": "Valeta de drenagem",

                 "terms": "Dreno"
             },
             "waterway/river": {
                 "terms": "Dreno"
             },
             "waterway/river": {

diff --git a/vendor/assets/iD/iD/locales/ru.json b/vendor/assets/iD/iD/locales/ru.json
index 2040d731b2b7160109ceb8b423af44c892b19096..53a6e44c243d66fb390cec6ca75ddb456454d7ab 100644 (file)
--- a/vendor/assets/iD/iD/locales/ru.json
+++ b/vendor/assets/iD/iD/locales/ru.json
@@ -134,7 +134,8 @@
             "annotation": "Объединены {n} линий.",
             "not_eligible": "Эти объекты нельзя склеить.",
             "not_adjacent": "Эти линии не склеить, потому что они не соединены.",
             "annotation": "Объединены {n} линий.",
             "not_eligible": "Эти объекты нельзя склеить.",
             "not_adjacent": "Эти линии не склеить, потому что они не соединены.",

-            "restriction": "Эти линии не склеить, потому что как минимум одна из них находится в отношении \"{relation}\""
+            "restriction": "Эти линии не склеить, потому что как минимум одна из них находится в отношении \"{relation}\"",
+            "incomplete_relation": "Эти объекты нельзя объединить, потому что как минимум один из них не был загружен целиком."

         },
         "move": {
             "title": "Сместить",
         },
         "move": {
             "title": "Сместить",


@@ -1099,7 +1100,8 @@
                 "terms": "Паб"
             },
             "amenity/recycling": {
                 "terms": "Паб"
             },
             "amenity/recycling": {

-                "name": "Переработка мусора"
+                "name": "Переработка мусора",
+                "terms": "Переработка мусора, Мусоропереработка, Утилизация мусора, Переработка отходов, Утилизация отходов"

             },
             "amenity/restaurant": {
                 "name": "Ресторан",
             },
             "amenity/restaurant": {
                 "name": "Ресторан",


@@ -1110,7 +1112,14 @@
                 "terms": "Школа, лицей, гимназия"
             },
             "amenity/shelter": {
                 "terms": "Школа, лицей, гимназия"
             },
             "amenity/shelter": {

-                "name": "Укрытие"
+                "name": "Укрытие",
+                "terms": "Укрытие, Навес, Защита от непогоды"
+            },
+            "amenity/social_facility": {
+                "name": "Социальное учреждение"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Ночлежка для бездомных"

             },
             "amenity/studio": {
                 "name": "Студия"
             },
             "amenity/studio": {
                 "name": "Студия"


@@ -1164,20 +1173,24 @@
                 "terms": "препятствие, преграда, барьер, заграждение"
             },
             "barrier/block": {
                 "terms": "препятствие, преграда, барьер, заграждение"
             },
             "barrier/block": {

-                "name": "Бетонный блок"
+                "name": "Бетонный блок",
+                "terms": "Блок, преграда"

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

-                "name": "Столбики"
+                "name": "Столбики",
+                "terms": "Столб, столбик, преграда"

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

-                "name": "Сетка для животных"
+                "name": "Сетка для животных",
+                "terms": "Сетка для животных, Препятствие для животных"

             },
             "barrier/city_wall": {
                 "name": "Городская стена",
                 "terms": "Городская стена"
             },
             "barrier/cycle_barrier": {
             },
             "barrier/city_wall": {
                 "name": "Городская стена",
                 "terms": "Городская стена"
             },
             "barrier/cycle_barrier": {

-                "name": "Барьер для велосипедистов"
+                "name": "Барьер для велосипедистов",
+                "terms": "Барьер для велосипедистов, Велосипедное препятствие"

             },
             "barrier/ditch": {
                 "name": "Траншея",
             },
             "barrier/ditch": {
                 "name": "Траншея",


@@ -1200,20 +1213,24 @@
                 "terms": "Живая изгородь, Зелёное ограждение"
             },
             "barrier/kissing_gate": {
                 "terms": "Живая изгородь, Зелёное ограждение"
             },
             "barrier/kissing_gate": {

-                "name": "Преграда для животных"
+                "name": "Преграда для животных",
+                "terms": "Ворота с защитой от животных, Преграда для животных"

             },
             "barrier/lift_gate": {
                 "name": "Шлагбаум",
                 "terms": "шлагбаум"
             },
             "barrier/retaining_wall": {
             },
             "barrier/lift_gate": {
                 "name": "Шлагбаум",
                 "terms": "шлагбаум"
             },
             "barrier/retaining_wall": {

-                "name": "Укрепляющая стена"
+                "name": "Укрепляющая стена",
+                "terms": "Подпорная стена"

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

-                "name": "Турникет"
+                "name": "Турникет",
+                "terms": "Турникет"

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

-                "name": "Пункт оплаты проезда"
+                "name": "Пункт оплаты проезда",
+                "terms": "Пункт оплаты проезда, Касса, Пропускной пункт"

             },
             "barrier/wall": {
                 "name": "Стена",
             },
             "barrier/wall": {
                 "name": "Стена",


@@ -1231,10 +1248,33 @@
                 "name": "Многоквартирный дом",
                 "terms": "многоэтажка, высотка"
             },
                 "name": "Многоквартирный дом",
                 "terms": "многоэтажка, высотка"
             },

+            "building/bunker": {
+                "name": "Бункер"
+            },
+            "building/cathedral": {
+                "name": "Собор",
+                "terms": "Собор, Храм"
+            },
+            "building/chapel": {
+                "name": "Капелла"
+            },
+            "building/church": {
+                "name": "Церковь, Храм",
+                "terms": "Церковь, Храм"
+            },

             "building/commercial": {
                 "name": "Деловое здание",
                 "terms": "Деловое здание, Коммерческое здание, Деловая недвижимость"
             },
             "building/commercial": {
                 "name": "Деловое здание",
                 "terms": "Деловое здание, Коммерческое здание, Деловая недвижимость"
             },

+            "building/construction": {
+                "name": "Строящееся здание"
+            },
+            "building/detached": {
+                "name": "Отдельностоящий частный жилой дом"
+            },
+            "building/dormitory": {
+                "name": "Общежитие"
+            },

             "building/entrance": {
                 "name": "Вход",
                 "terms": "вход, дверь, главный вход"
             "building/entrance": {
                 "name": "Вход",
                 "terms": "вход, дверь, главный вход"


@@ -1243,6 +1283,18 @@
                 "name": "Гараж",
                 "terms": "гараж, ракушка"
             },
                 "name": "Гараж",
                 "terms": "гараж, ракушка"
             },

+            "building/garages": {
+                "name": "Гаражи"
+            },
+            "building/greenhouse": {
+                "name": "Теплица"
+            },
+            "building/hospital": {
+                "name": "Здание больницы"
+            },
+            "building/hotel": {
+                "name": "Здание гостиницы"
+            },

             "building/house": {
                 "name": "Дом",
                 "terms": "дом, частный дом, изба, хата"
             "building/house": {
                 "name": "Дом",
                 "terms": "дом, частный дом, изба, хата"


@@ -1255,10 +1307,40 @@
                 "name": "Промышленное здание",
                 "terms": "Промышленное здание, Производственное здание, Индустриальное здание, Цех"
             },
                 "name": "Промышленное здание",
                 "terms": "Промышленное здание, Производственное здание, Индустриальное здание, Цех"
             },

+            "building/public": {
+                "name": "Общественное здание, Общественный центр"
+            },

             "building/residential": {
                 "name": "Жилой Дом",
                 "terms": "Жилой дом, Жилое здание"
             },
             "building/residential": {
                 "name": "Жилой Дом",
                 "terms": "Жилой дом, Жилое здание"
             },

+            "building/retail": {
+                "name": "Магазин розничной торговли"
+            },
+            "building/roof": {
+                "name": "Крыша"
+            },
+            "building/school": {
+                "name": "Здание школы"
+            },
+            "building/shed": {
+                "name": "Сарай"
+            },
+            "building/stable": {
+                "name": "Конюшня"
+            },
+            "building/terrace": {
+                "name": "Блокированные дома"
+            },
+            "building/train_station": {
+                "name": "Железнодорожный вокзал"
+            },
+            "building/university": {
+                "name": "Здание университета, института "
+            },
+            "building/warehouse": {
+                "name": "Склад"
+            },

             "craft/basket_maker": {
                 "name": "Корзина",
                 "terms": "корзинщик"
             "craft/basket_maker": {
                 "name": "Корзина",
                 "terms": "корзинщик"


@@ -1413,10 +1495,12 @@
                 "terms": "вход, дверь, главный вход"
             },
             "footway/crossing": {
                 "terms": "вход, дверь, главный вход"
             },
             "footway/crossing": {

-                "name": "Пешеходный переход"
+                "name": "Пешеходный переход",
+                "terms": "Пешеходный переход"

             },
             "footway/sidewalk": {
             },
             "footway/sidewalk": {

-                "name": "Тротуар с дорогой"
+                "name": "Тротуар",
+                "terms": "Тротуар, Тротуарчик, Пешеходная обочина"

             },
             "golf/bunker": {
                 "name": "Бункер",
             },
             "golf/bunker": {
                 "name": "Бункер",


@@ -1435,21 +1519,28 @@
                 "terms": "Лунка для гольфа"
             },
             "golf/lateral_water_hazard": {
                 "terms": "Лунка для гольфа"
             },
             "golf/lateral_water_hazard": {

-                "name": "Боковая водная преграда"
+                "name": "Боковая водная преграда",
+                "terms": "Боковая водная преграда, Боковое водное препятствие"

             },
             "golf/rough": {
                 "name": "Раф",
                 "terms": "Неровная площадка, Высокая трава"
             },
             },
             "golf/rough": {
                 "name": "Раф",
                 "terms": "Неровная площадка, Высокая трава"
             },

+            "golf/tee": {
+                "name": "Стартовая площадка",
+                "terms": "Стартовая площадка, Стартовая зона"
+            },

             "golf/water_hazard": {
             "golf/water_hazard": {

-                "name": "Водная преграда"
+                "name": "Прямая водная преграда",
+                "terms": "Водное препятствие, Водная преграда, Прямая водная преграда"

             },
             "highway": {
                 "name": "Дорога",
                 "terms": "шоссе, магистраль, автомагистраль, дорога, автодорога, трасса, путь, автострада"
             },
             "highway/bridleway": {
             },
             "highway": {
                 "name": "Дорога",
                 "terms": "шоссе, магистраль, автомагистраль, дорога, автодорога, трасса, путь, автострада"
             },
             "highway/bridleway": {

-                "name": "Конная тропа"
+                "name": "Конная тропа",
+                "terms": "Конная тропа, Дорога для верховой езды, Дорога для конной езды"

             },
             "highway/bus_stop": {
                 "name": "Автобусная остановка",
             },
             "highway/bus_stop": {
                 "name": "Автобусная остановка",


@@ -1464,28 +1555,35 @@
                 "terms": "велодорожка, велосипедная дорожка"
             },
             "highway/footway": {
                 "terms": "велодорожка, велосипедная дорожка"
             },
             "highway/footway": {

-                "name": "Пешеходная дорожка"
+                "name": "Пешеходная дорожка",
+                "terms": "Пешеходная тропа, Пешая тропа"

             },
             "highway/living_street": {
             },
             "highway/living_street": {

-                "name": "Жилая улица"
+                "name": "Жилая улица",
+                "terms": "Жилая улица, Улица в жилой застройке, Жилая зона"

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

-                "name": "Миникруг"
+                "name": "Миникруг",
+                "terms": "Мини круговое движение, Маленький поворотный круг"

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

-                "name": "Автомагистраль"
+                "name": "Автомагистраль",
+                "terms": "Автомагистраль, Скоростная автострада, Скоростное шоссе, Автобан, Скоростная автодорога, Хайвэй, Скоростна автотрасса"

             },
             "highway/motorway_junction": {
                 "name": "Автомагистраль"
             },
             "highway/motorway_link": {
             },
             "highway/motorway_junction": {
                 "name": "Автомагистраль"
             },
             "highway/motorway_link": {

-                "name": "Съезд с автомагистрали"
+                "name": "Съезд с автомагистрали",
+                "terms": "Съезд с автомагистрали, Съезд со скоростной автострады, Съезд со скоростного шоссе, Съезд с автобана, Съезд со скоростной автодороги, Съезд с хайвэя, Съезд со скоростной автотрассы"

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

-                "name": "Тропа"
+                "name": "Тропа",
+                "terms": "Тропа, Тропинка, Тропка"

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

-                "name": "Пешеходная дорога"
+                "name": "Пешеходная дорога",
+                "terms": "Пешеходная улица"

             },
             "highway/primary": {
                 "name": "Дорога регионального значения",
             },
             "highway/primary": {
                 "name": "Дорога регионального значения",


@@ -1495,7 +1593,8 @@
                 "name": "Съезд с дороги регионального значения"
             },
             "highway/residential": {
                 "name": "Съезд с дороги регионального значения"
             },
             "highway/residential": {

-                "name": "Улица"
+                "name": "Улица",
+                "terms": "Улица, Жилая улица"

             },
             "highway/road": {
                 "name": "Дорога неизвестного класса",
             },
             "highway/road": {
                 "name": "Дорога неизвестного класса",


@@ -1508,16 +1607,20 @@
                 "name": "Съезд с важной дороги"
             },
             "highway/service": {
                 "name": "Съезд с важной дороги"
             },
             "highway/service": {

-                "name": "Проезд"
+                "name": "Проезд",
+                "terms": "Проезд, Автопроезд"

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

-                "name": "Аллея"
+                "name": "Служебный проезд",
+                "terms": "Служебный проезд, Сервисный проезд, Второстепенный проезд"

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

-                "name": "Сервис не выходя из машины"
+                "name": "Сервис не выходя из машины",
+                "terms": "Сервис не выходя из машины, Обслуживание не выходя из машины"

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

-                "name": "Дорога"
+                "name": "Дорога",
+                "terms": "Подъездная дорога, Подъезд к чему-либо"

             },
             "highway/service/emergency_access": {
                 "name": "Неотложная помощь"
             },
             "highway/service/emergency_access": {
                 "name": "Неотложная помощь"


@@ -1555,23 +1658,27 @@
                 "terms": "Заезд на магистраль, Съезд с магистрали"
             },
             "highway/turning_circle": {
                 "terms": "Заезд на магистраль, Съезд с магистрали"
             },
             "highway/turning_circle": {

-                "name": "Разворот"
+                "name": "Разворот",
+                "terms": "Площадка ля разворота, Разворотный круг, Разворотный тупик"

             },
             "highway/unclassified": {
                 "name": "Обычная дорога"
             },
             "historic": {
             },
             "highway/unclassified": {
                 "name": "Обычная дорога"
             },
             "historic": {

-                "name": "Историческое место"
+                "name": "Историческое место",
+                "terms": "Археологическая площадка, Археологические раскопки"

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

-                "name": "Археологические раскопки"
+                "name": "Археологические раскопки",
+                "terms": "Археологическая площадка, Археологические раскопки"

             },
             "historic/boundary_stone": {
                 "name": "Пограничный камень",
                 "terms": "межевой камень"
             },
             "historic/castle": {
             },
             "historic/boundary_stone": {
                 "name": "Пограничный камень",
                 "terms": "межевой камень"
             },
             "historic/castle": {

-                "name": "Замок"
+                "name": "Замок",
+                "terms": "Замок, Форт, Укрепление"

             },
             "historic/memorial": {
                 "name": "Памятник, мемориал",
             },
             "historic/memorial": {
                 "name": "Памятник, мемориал",


@@ -1586,33 +1693,40 @@
                 "terms": "руины, развалины"
             },
             "historic/wayside_cross": {
                 "terms": "руины, развалины"
             },
             "historic/wayside_cross": {

-                "name": "Придорожный крест"
+                "name": "Придорожный крест",
+                "terms": "Придорожный крест"

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

-                "name": "Придорожная часовня"
+                "name": "Придорожная часовня",
+                "terms": "Придорожная часовня"

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

-                "name": "Землепользование"
+                "name": "Землепользование",
+                "terms": "Землепользование"

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

-                "name": "Садовые участки"
+                "name": "Садовые участки",
+                "terms": "Участки садов и огородов, Сады и огороды"

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

-                "name": "Хранилище сточных вод"
+                "name": "Хранилище сточных вод",
+                "terms": "Бассейн, Искусственный водоём, Копаный пруд"

             },
             "landuse/cemetery": {
                 "name": "Кладбище",
                 "terms": "кладбище"
             },
             "landuse/commercial": {
             },
             "landuse/cemetery": {
                 "name": "Кладбище",
                 "terms": "кладбище"
             },
             "landuse/commercial": {

-                "name": "Коммерческая застройка"
+                "name": "Коммерческая застройка",
+                "terms": "Коммерческое землепользование, Территории торгово-офисного назначения"

             },
             "landuse/construction": {
                 "name": "Стройплощадка",
                 "terms": "стройка, строительство"
             },
             "landuse/farm": {
             },
             "landuse/construction": {
                 "name": "Стройплощадка",
                 "terms": "стройка, строительство"
             },
             "landuse/farm": {

-                "name": "Земельные угодья"
+                "name": "Земельные угодья",
+                "terms": "Ферма, Сельхоз предприятие"

             },
             "landuse/farmland": {
                 "name": "Сельскохозяйственные угодья"
             },
             "landuse/farmland": {
                 "name": "Сельскохозяйственные угодья"


@@ -1625,10 +1739,12 @@
                 "terms": "лес, лесной массив"
             },
             "landuse/grass": {
                 "terms": "лес, лесной массив"
             },
             "landuse/grass": {

-                "name": "Трава"
+                "name": "Трава",
+                "terms": "Газон, Искусственный газон, Земля используемая под газон"

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

-                "name": "Промышленная застройка"
+                "name": "Промышленная застройка",
+                "terms": "Промышленная территория, Производственная территория, Промышленное землепользование"

             },
             "landuse/meadow": {
                 "name": "Луг",
             },
             "landuse/meadow": {
                 "name": "Луг",


@@ -1643,7 +1759,8 @@
                 "terms": "карьер, каменоломня, открытая разработка"
             },
             "landuse/residential": {
                 "terms": "карьер, каменоломня, открытая разработка"
             },
             "landuse/residential": {

-                "name": "Жилой квартал"
+                "name": "Жилой квартал",
+                "terms": "Жилая территория, Селитебная территория, Жилые земли, Селитебные земли"

             },
             "landuse/retail": {
                 "name": "Торговля"
             },
             "landuse/retail": {
                 "name": "Торговля"


@@ -1653,7 +1770,8 @@
                 "terms": "виноградник"
             },
             "leisure": {
                 "terms": "виноградник"
             },
             "leisure": {

-                "name": "Отдых"
+                "name": "Отдых",
+                "terms": "Территории для отдыха"

             },
             "leisure/dog_park": {
                 "name": "Площадка для Выгула Собак",
             },
             "leisure/dog_park": {
                 "name": "Площадка для Выгула Собак",


@@ -1664,10 +1782,12 @@
                 "terms": "Парк, Сквер"
             },
             "leisure/golf_course": {
                 "terms": "Парк, Сквер"
             },
             "leisure/golf_course": {

-                "name": "Площадка для гольфа"
+                "name": "Площадка для гольфа",
+                "terms": "Поле для гольфа, Гольфполе"

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

-                "name": "Яхтклуб"
+                "name": "Яхтклуб",
+                "terms": "Марина, Стоянка для яхт"

             },
             "leisure/park": {
                 "name": "Парк",
             },
             "leisure/park": {
                 "name": "Парк",


@@ -1682,7 +1802,8 @@
                 "terms": "поле для американского футбола"
             },
             "leisure/pitch/baseball": {
                 "terms": "поле для американского футбола"
             },
             "leisure/pitch/baseball": {

-                "name": "Бейсбольная площадка"
+                "name": "Бейсбольная площадка",
+                "terms": "Бейсбол"

             },
             "leisure/pitch/basketball": {
                 "name": "Баскетбольная площадка",
             },
             "leisure/pitch/basketball": {
                 "name": "Баскетбольная площадка",


@@ -1709,7 +1830,8 @@
                 "terms": "детская площадка, игровая площадка"
             },
             "leisure/slipway": {
                 "terms": "детская площадка, игровая площадка"
             },
             "leisure/slipway": {

-                "name": "Стапель"
+                "name": "Стапель",
+                "terms": "Стапель"

             },
             "leisure/sports_center": {
                 "name": "Спортивный Комплекс",
             },
             "leisure/sports_center": {
                 "name": "Спортивный Комплекс",


@@ -1728,13 +1850,16 @@
                 "terms": "Трасса для Гонок, Трек, Трасса, Автодром"
             },
             "line": {
                 "terms": "Трасса для Гонок, Трек, Трасса, Автодром"
             },
             "line": {

-                "name": "Линия"
+                "name": "Линия",
+                "terms": "Линия"

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

-                "name": "Сооружения"
+                "name": "Сооружения",
+                "terms": "рукотворное"

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

-                "name": "Волнорез"
+                "name": "Волнорез",
+                "terms": "Мол, Оградительное гидросооружение"

             },
             "man_made/cutline": {
                 "name": "Просека",
             },
             "man_made/cutline": {
                 "name": "Просека",


@@ -1765,10 +1890,12 @@
                 "terms": "трубопровод"
             },
             "man_made/survey_point": {
                 "terms": "трубопровод"
             },
             "man_made/survey_point": {

-                "name": "Тригонометрический пункт"
+                "name": "Тригонометрический пункт",
+                "terms": "Тригонометрический пункт"

             },
             "man_made/tower": {
             },
             "man_made/tower": {

-                "name": "Башня"
+                "name": "Башня",
+                "terms": "Башня"

             },
             "man_made/wastewater_plant": {
                 "name": "Станция водоочистки",
             },
             "man_made/wastewater_plant": {
                 "name": "Станция водоочистки",


@@ -1783,22 +1910,27 @@
                 "terms": "колодец"
             },
             "man_made/water_works": {
                 "terms": "колодец"
             },
             "man_made/water_works": {

-                "name": "Станция водоподготовки"
+                "name": "Станция водоподготовки",
+                "terms": "Водозабор"

             },
             "military/airfield": {
                 "name": "Аэродром"
             },
             "military/barracks": {
             },
             "military/airfield": {
                 "name": "Аэродром"
             },
             "military/barracks": {

-                "name": "Бараки"
+                "name": "Бараки",
+                "terms": "Бараки, Казарма"

             },
             "military/bunker": {
             },
             "military/bunker": {

-                "name": "Бункер"
+                "name": "Бункер",
+                "terms": "Бункер, Подземное убежище, Подземное укрытие"

             },
             "military/range": {
             },
             "military/range": {

-                "name": "Военный полигон"
+                "name": "Военный полигон",
+                "terms": "Военный полигон, Стрельбище"

             },
             "natural": {
             },
             "natural": {

-                "name": "Природа"
+                "name": "Природа",
+                "terms": "Природные объекты"

             },
             "natural/bay": {
                 "name": "Бухта",
             },
             "natural/bay": {
                 "name": "Бухта",


@@ -1809,7 +1941,8 @@
                 "terms": "пляж"
             },
             "natural/cliff": {
                 "terms": "пляж"
             },
             "natural/cliff": {

-                "name": "Скала"
+                "name": "Скала",
+                "terms": "Скала, Утёс, Шхеры"

             },
             "natural/coastline": {
                 "name": "Береговая линия",
             },
             "natural/coastline": {
                 "name": "Береговая линия",


@@ -1820,10 +1953,12 @@
                 "terms": "ледник"
             },
             "natural/grassland": {
                 "terms": "ледник"
             },
             "natural/grassland": {

-                "name": "Травяной луг"
+                "name": "Травяной луг",
+                "terms": "Травяной луг, Луговина, Лужок, Выкос, Перелесье"

             },
             "natural/heath": {
             },
             "natural/heath": {

-                "name": "Поросший луг"
+                "name": "Поросший луг",
+                "terms": "Поросший луг"

             },
             "natural/peak": {
                 "name": "Вершина",
             },
             "natural/peak": {
                 "name": "Вершина",


@@ -1833,17 +1968,20 @@
                 "name": "Осыпь"
             },
             "natural/scrub": {
                 "name": "Осыпь"
             },
             "natural/scrub": {

-                "name": "Кустарник"
+                "name": "Кустарник",
+                "terms": "Кустарник, Кусты, Кустовник, Подлесок, Лозняк, Чапыжник"

             },
             "natural/spring": {
             },
             "natural/spring": {

-                "name": "Родник"
+                "name": "Родник",
+                "terms": "Ручей, Ключ"

             },
             "natural/tree": {
                 "name": "Дерево",
                 "terms": "дерево"
             },
             "natural/water": {
             },
             "natural/tree": {
                 "name": "Дерево",
                 "terms": "дерево"
             },
             "natural/water": {

-                "name": "Водоём"
+                "name": "Водоём",
+                "terms": "Вода, Водоём"

             },
             "natural/water/lake": {
                 "name": "Озеро",
             },
             "natural/water/lake": {
                 "name": "Озеро",


@@ -1854,17 +1992,20 @@
                 "terms": "пруд"
             },
             "natural/water/reservoir": {
                 "terms": "пруд"
             },
             "natural/water/reservoir": {

-                "name": "Водохранилище"
+                "name": "Водохранилище",
+                "terms": "Водохранилище, Рукотворное озеро, Водоместилище,"

             },
             "natural/wetland": {
                 "name": "Болото",
                 "terms": "болото, заболоченная территория"
             },
             "natural/wood": {
             },
             "natural/wetland": {
                 "name": "Болото",
                 "terms": "болото, заболоченная территория"
             },
             "natural/wood": {

-                "name": "Лес"
+                "name": "Лес",
+                "terms": "Лес, Деревья, Роща, Чаща"

             },
             "office": {
             },
             "office": {

-                "name": "Офисы"
+                "name": "Офисы",
+                "terms": "Офисы, Офис, Контора, Канцелярия"

             },
             "office/accountant": {
                 "name": "Бухгалтерская контора",
             },
             "office/accountant": {
                 "name": "Бухгалтерская контора",


@@ -1893,7 +2034,8 @@
                 "terms": "Бюро по недвижимости, Риелтор, Риелторская фирма, Риелторская компания,"
             },
             "office/financial": {
                 "terms": "Бюро по недвижимости, Риелтор, Риелторская фирма, Риелторская компания,"
             },
             "office/financial": {

-                "name": "Финансовая организация"
+                "name": "Финансовая организация",
+                "terms": "финансовая организация"

             },
             "office/government": {
                 "name": "Правительственное учреждение"
             },
             "office/government": {
                 "name": "Правительственное учреждение"


@@ -1915,7 +2057,8 @@
                 "terms": "Общественное движение, НКО, Неправительственная организация, Некоммерческая организация, Общественный фонд, Общественное учреждение,"
             },
             "office/physician": {
                 "terms": "Общественное движение, НКО, Неправительственная организация, Некоммерческая организация, Общественный фонд, Общественное учреждение,"
             },
             "office/physician": {

-                "name": "Фельдшер"
+                "name": "Фельдшер",
+                "terms": "врач"

             },
             "office/political_party": {
                 "name": "Политическая партия",
             },
             "office/political_party": {
                 "name": "Политическая партия",


@@ -1926,7 +2069,8 @@
                 "terms": "Научно-исследовательская организация, Научно-исследовательский институт, Центр передовых исследований и разработки"
             },
             "office/telecommunication": {
                 "terms": "Научно-исследовательская организация, Научно-исследовательский институт, Центр передовых исследований и разработки"
             },
             "office/telecommunication": {

-                "name": "Телеком"
+                "name": "Телеком",
+                "terms": "Телеком"

             },
             "office/therapist": {
                 "name": "Терапевт"
             },
             "office/therapist": {
                 "name": "Терапевт"


@@ -1935,38 +2079,48 @@
                 "name": "Турагентство",
                 "terms": "Туристическое агентство, Бюро путешествий, Турфирма, Туристическая фирма"
             },
                 "name": "Турагентство",
                 "terms": "Туристическое агентство, Бюро путешествий, Турфирма, Туристическая фирма"
             },

+            "piste": {
+                "name": "Лыжная трасса"
+            },

             "place": {
             "place": {

-                "name": "Населённый пункт"
+                "name": "Населённый пункт",
+                "terms": "Населённый пункт, Местность"

             },
             "place/city": {
                 "name": "Большой город",
                 "terms": "город"
             },
             "place/hamlet": {
             },
             "place/city": {
                 "name": "Большой город",
                 "terms": "город"
             },
             "place/hamlet": {

-                "name": "Малое село"
+                "name": "Малое село",
+                "terms": "Деревня"

             },
             "place/island": {
                 "name": "Остров",
                 "terms": "остров"
             },
             "place/isolated_dwelling": {
             },
             "place/island": {
                 "name": "Остров",
                 "terms": "остров"
             },
             "place/isolated_dwelling": {

-                "name": "Изолированное жильё"
+                "name": "Изолированное жильё",
+                "terms": "Хутор, Заимка"

             },
             "place/locality": {
             },
             "place/locality": {

-                "name": "Местность"
+                "name": "Местность",
+                "terms": "Урочище, Заброшенное поселение"

             },
             "place/town": {
             },
             "place/town": {

-                "name": "Город"
+                "name": "Город",
+                "terms": "Город"

             },
             "place/village": {
             },
             "place/village": {

-                "name": "Деревня"
+                "name": "Деревня",
+                "terms": "Село, Станица, Поселение, Посёлок городского типа"

             },
             "point": {
                 "name": "Точка",
                 "terms": "точка"
             },
             "power": {
             },
             "point": {
                 "name": "Точка",
                 "terms": "точка"
             },
             "power": {

-                "name": "Электричество"
+                "name": "Электричество",
+                "terms": "Электроэнергетика"

             },
             "power/generator": {
                 "name": "Силовой Генератор",
             },
             "power/generator": {
                 "name": "Силовой Генератор",


@@ -1980,21 +2134,24 @@
                 "name": "Низковольтная ЛЭП"
             },
             "power/pole": {
                 "name": "Низковольтная ЛЭП"
             },
             "power/pole": {

-                "name": "Столб ЛЭП"
+                "name": "Столб ЛЭП",
+                "terms": "Столб линии электропередачи, Опора маломощной линии электропередачи"

             },
             "power/sub_station": {
                 "name": "Трансформаторная подстанция",
                 "terms": "подстанция"
             },
             "power/tower": {
             },
             "power/sub_station": {
                 "name": "Трансформаторная подстанция",
                 "terms": "подстанция"
             },
             "power/tower": {

-                "name": "Опора ЛЭП"
+                "name": "Опора ЛЭП",
+                "terms": "Опора ЛЭП, Опора линии электропередачи"

             },
             "power/transformer": {
                 "name": "Трансформатор",
                 "terms": "трансформатор"
             },
             "public_transport/platform": {
             },
             "power/transformer": {
                 "name": "Трансформатор",
                 "terms": "трансформатор"
             },
             "public_transport/platform": {

-                "name": "Платформа"
+                "name": "Платформа",
+                "terms": "Платформа, Остановка, Посадочная платформа, Место посадки и высадки пассажиров"

             },
             "public_transport/stop_position": {
                 "name": "Место остановки транспорта",
             },
             "public_transport/stop_position": {
                 "name": "Место остановки транспорта",


@@ -2005,10 +2162,12 @@
                 "terms": "железная дорога"
             },
             "railway/abandoned": {
                 "terms": "железная дорога"
             },
             "railway/abandoned": {

-                "name": "Разобранная железная дорога"
+                "name": "Разобранная железная дорога",
+                "terms": "Разобранная железнодорожная ветка,"

             },
             "railway/disused": {
             },
             "railway/disused": {

-                "name": "Заброшенная железная дорога"
+                "name": "Заброшенная железная дорога",
+                "terms": "Неиспользуемая железнодорожная ветка"

             },
             "railway/funicular": {
                 "name": "Фуникулёр",
             },
             "railway/funicular": {
                 "name": "Фуникулёр",


@@ -2019,7 +2178,8 @@
                 "terms": "Железнодорожная станция, ЖД станция"
             },
             "railway/level_crossing": {
                 "terms": "Железнодорожная станция, ЖД станция"
             },
             "railway/level_crossing": {

-                "name": "Переезд"
+                "name": "Переезд",
+                "terms": "Железнодорожный переезд"

             },
             "railway/monorail": {
                 "name": "Монорельс",
             },
             "railway/monorail": {
                 "name": "Монорельс",


@@ -2053,44 +2213,52 @@
                 "terms": "трамвай"
             },
             "relation": {
                 "terms": "трамвай"
             },
             "relation": {

-                "name": "Отношение"
+                "name": "Отношение",
+                "terms": "отношение"

             },
             "route/ferry": {
                 "name": "Паромный маршрут",
                 "terms": "паром, паромная переправа"
             },
             "shop": {
             },
             "route/ferry": {
                 "name": "Паромный маршрут",
                 "terms": "паром, паромная переправа"
             },
             "shop": {

-                "name": "Магазин"
+                "name": "Магазин",
+                "terms": "Магазин, Торговая лавка, Точка продаж"

             },
             "shop/alcohol": {
             },
             "shop/alcohol": {

-                "name": "Винный магазин"
+                "name": "Винный магазин",
+                "terms": "Винный магазин, Винная лавка, Вино-водочный магазин"

             },
             "shop/bakery": {
             },
             "shop/bakery": {

-                "name": "Хлебный"
+                "name": "Хлебный",
+                "terms": "Булочная, Хлебный магазин"

             },
             "shop/beauty": {
                 "name": "Салон красоты",
                 "terms": "салон красоты"
             },
             "shop/beverages": {
             },
             "shop/beauty": {
                 "name": "Салон красоты",
                 "terms": "салон красоты"
             },
             "shop/beverages": {

-                "name": "Магазин напитков"
+                "name": "Магазин напитков",
+                "terms": "Магазин напитков, Продажа напитков"

             },
             "shop/bicycle": {
             },
             "shop/bicycle": {

-                "name": "Веломагазин"
+                "name": "Веломагазин",
+                "terms": "Веломагазин"

             },
             "shop/books": {
                 "name": "Книжный",
                 "terms": "книги, книжный"
             },
             "shop/boutique": {
             },
             "shop/books": {
                 "name": "Книжный",
                 "terms": "книги, книжный"
             },
             "shop/boutique": {

-                "name": "Бутик"
+                "name": "Бутик",
+                "terms": "Бутик, Фирменный магазин"

             },
             "shop/butcher": {
                 "name": "Мясной",
                 "terms": "мясной, мясная лавка, мясник"
             },
             "shop/car": {
             },
             "shop/butcher": {
                 "name": "Мясной",
                 "terms": "мясной, мясная лавка, мясник"
             },
             "shop/car": {

-                "name": "Автодилер"
+                "name": "Автодилер",
+                "terms": "Автомобильный салон, Диллерский автоцентр "

             },
             "shop/car_parts": {
                 "name": "Автозапчасти",
             },
             "shop/car_parts": {
                 "name": "Автозапчасти",


@@ -2101,65 +2269,83 @@
                 "terms": "автомастерская, ремонт авто, станция техобслуживания, автосервис"
             },
             "shop/chemist": {
                 "terms": "автомастерская, ремонт авто, станция техобслуживания, автосервис"
             },
             "shop/chemist": {

-                "name": "Бытовая химия"
+                "name": "Бытовая химия",
+                "terms": "Бытовая химия"

             },
             "shop/clothes": {
             },
             "shop/clothes": {

-                "name": "Одежда"
+                "name": "Одежда",
+                "terms": "магазин одежды"

             },
             "shop/computer": {
             },
             "shop/computer": {

-                "name": "Компьютерный магазин"
+                "name": "Компьютерный магазин",
+                "terms": "Компьютерный магазин"

             },
             "shop/confectionery": {
             },
             "shop/confectionery": {

-                "name": "Кондитерская"
+                "name": "Кондитерская",
+                "terms": "Кондитерская"

             },
             "shop/convenience": {
             },
             "shop/convenience": {

-                "name": "Продуктовый"
+                "name": "Продуктовый",
+                "terms": "Продуктовый магазин, Магазин шаговой доступности"

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

-                "name": "Кулинария"
+                "name": "Кулинария",
+                "terms": "Кулинария, Гастрономия"

             },
             "shop/department_store": {
             },
             "shop/department_store": {

-                "name": "Универсам"
+                "name": "Универсам",
+                "terms": "Универсам"

             },
             "shop/doityourself": {
             },
             "shop/doityourself": {

-                "name": "Магазин \"Сделай сам\""
+                "name": "Магазин \"Сделай сам\"",
+                "terms": "Магазин \"Сделай Сам\", Всё для ремонта"

             },
             "shop/dry_cleaning": {
                 "name": "пылесосы",
                 "terms": "химчистка"
             },
             "shop/electronics": {
             },
             "shop/dry_cleaning": {
                 "name": "пылесосы",
                 "terms": "химчистка"
             },
             "shop/electronics": {

-                "name": "Магазин электроники"
+                "name": "Магазин электроники",
+                "terms": "Магазин электроники"

             },
             "shop/farm": {
                 "name": "Продуктовый Лоток"
             },
             "shop/fishmonger": {
             },
             "shop/farm": {
                 "name": "Продуктовый Лоток"
             },
             "shop/fishmonger": {

-                "name": "Рыбный магазин"
+                "name": "Рыбный магазин",
+                "terms": "рыботорговец"

             },
             "shop/florist": {
             },
             "shop/florist": {

-                "name": "Цветочный"
+                "name": "Цветочный",
+                "terms": "Цветочный магазин"

             },
             "shop/furniture": {
             },
             "shop/furniture": {

-                "name": "Мебельный"
+                "name": "Мебельный",
+                "terms": "Мебельный магазин"

             },
             "shop/garden_centre": {
             },
             "shop/garden_centre": {

-                "name": "Садовые принадлежности"
+                "name": "Садовые принадлежности",
+                "terms": "садовый центр"

             },
             "shop/gift": {
             },
             "shop/gift": {

-                "name": "Подарки"
+                "name": "Подарки",
+                "terms": "Магазин подарков"

             },
             "shop/greengrocer": {
             },
             "shop/greengrocer": {

-                "name": "Овощи, фрукты"
+                "name": "Овощи, фрукты",
+                "terms": "Овощи-фрукты"

             },
             "shop/hairdresser": {
             },
             "shop/hairdresser": {

-                "name": "Парикмахерская"
+                "name": "Парикмахерская",
+                "terms": "Парикмахерская, Парикмахер, Парикмахерский салон, Стилист"

             },
             "shop/hardware": {
             },
             "shop/hardware": {

-                "name": "Хозяйственный магазин"
+                "name": "Хозяйственный магазин",
+                "terms": "Хозяйственный магазин, Хозмаг"

             },
             "shop/hifi": {
             },
             "shop/hifi": {

-                "name": "Техника Hi-fi"
+                "name": "Техника Hi-fi",
+                "terms": "Техника Hi-fi, Акустика Hi-fi"

             },
             "shop/jewelry": {
                 "name": "Ювелирный",
             },
             "shop/jewelry": {
                 "name": "Ювелирный",


@@ -2173,27 +2359,36 @@
                 "name": "Прачечная",
                 "terms": "прачечная"
             },
                 "name": "Прачечная",
                 "terms": "прачечная"
             },

+            "shop/locksmith": {
+                "name": "Изготовление ключей"
+            },

             "shop/mall": {
             "shop/mall": {

-                "name": "Торговый центр"
+                "name": "Торговый центр",
+                "terms": "Торговый центр, Торговый дом"

             },
             "shop/mobile_phone": {
             },
             "shop/mobile_phone": {

-                "name": "Мобильные телефоны"
+                "name": "Мобильные телефоны",
+                "terms": "Салон сотовой связи, Продажа сотовых телефонов"

             },
             "shop/motorcycle": {
             },
             "shop/motorcycle": {

-                "name": "Магазин мотоциклов"
+                "name": "Магазин мотоциклов",
+                "terms": "Магазин мотоциклов, Мотодиллер"

             },
             "shop/music": {
             },
             "shop/music": {

-                "name": "Музыкальный магазин"
+                "name": "Музыкальный магазин",
+                "terms": "Музыкальный магазин, Аудио салон"

             },
             "shop/newsagent": {
             },
             "shop/newsagent": {

-                "name": "Газеты-журналы"
+                "name": "Газеты-журналы",
+                "terms": "Газеты-журналы, Новостной киоск, Пресса, Союзпечать"

             },
             "shop/optician": {
                 "name": "Оптика",
                 "terms": "оптика, очки"
             },
             "shop/outdoor": {
             },
             "shop/optician": {
                 "name": "Оптика",
                 "terms": "оптика, очки"
             },
             "shop/outdoor": {

-                "name": "Товары для отдыха и туризма"
+                "name": "Товары для отдыха и туризма",
+                "terms": "Товары для отдыха и туризма, Товары для кэмпинга, Туристическое снаряжение"

             },
             "shop/pet": {
                 "name": "Зоомагазин",
             },
             "shop/pet": {
                 "name": "Зоомагазин",


@@ -2204,13 +2399,16 @@
                 "terms": "Фототовары, Фототехника"
             },
             "shop/shoes": {
                 "terms": "Фототовары, Фототехника"
             },
             "shop/shoes": {

-                "name": "Обувной"
+                "name": "Обувной",
+                "terms": "Обувной магазин"

             },
             "shop/sports": {
             },
             "shop/sports": {

-                "name": "Спорттовары"
+                "name": "Спорттовары",
+                "terms": "магазин спорттоваров, Спорттовары, Спортивные товары"

             },
             "shop/stationery": {
             },
             "shop/stationery": {

-                "name": "Канцелярский магазин"
+                "name": "Канцелярский магазин",
+                "terms": "Канцелярский магазин, Канцтовары"

             },
             "shop/supermarket": {
                 "name": "Гипермаркет",
             },
             "shop/supermarket": {
                 "name": "Гипермаркет",


@@ -2221,34 +2419,42 @@
                 "terms": "магазин игрушек"
             },
             "shop/travel_agency": {
                 "terms": "магазин игрушек"
             },
             "shop/travel_agency": {

-                "name": "Бюро путешествий"
+                "name": "Бюро путешествий",
+                "terms": "Турагенство"

             },
             "shop/tyres": {
             },
             "shop/tyres": {

-                "name": "Шины, покрышки"
+                "name": "Шины, покрышки",
+                "terms": "Шины, Покрышки, Автопокрышки, Автошины"

             },
             "shop/vacant": {
                 "name": "Закрытый магазин"
             },
             "shop/variety_store": {
             },
             "shop/vacant": {
                 "name": "Закрытый магазин"
             },
             "shop/variety_store": {

-                "name": "Товары по одной цене"
+                "name": "Товары по одной цене",
+                "terms": "Товары по одной цене, \"Всё по одной цене\", Магазин фиксированной цены"

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

-                "name": "Видеомагазин"
+                "name": "Видеомагазин",
+                "terms": "Видео салон, Продажа фильмов и видеозаписей"

             },
             "tourism": {
             },
             "tourism": {

-                "name": "Туризм"
+                "name": "Туризм",
+                "terms": "Туризм, Отдых, Путешествия"

             },
             "tourism/alpine_hut": {
                 "name": "Альпийский домик"
             },
             "tourism/artwork": {
             },
             "tourism/alpine_hut": {
                 "name": "Альпийский домик"
             },
             "tourism/artwork": {

-                "name": "Произведение искусства"
+                "name": "Произведение искусства",
+                "terms": "Произведение искусства"

             },
             "tourism/attraction": {
             },
             "tourism/attraction": {

-                "name": "Достопримечательность"
+                "name": "Достопримечательность",
+                "terms": "Достопримечательность"

             },
             "tourism/camp_site": {
             },
             "tourism/camp_site": {

-                "name": "Кемпинг"
+                "name": "Кемпинг",
+                "terms": "лагерь, палаточный лагерь, турбаза, место для лагеря"

             },
             "tourism/caravan_site": {
                 "name": "Стоянка автодомов"
             },
             "tourism/caravan_site": {
                 "name": "Стоянка автодомов"


@@ -2257,7 +2463,8 @@
                 "name": "Сельский домик, шале"
             },
             "tourism/guest_house": {
                 "name": "Сельский домик, шале"
             },
             "tourism/guest_house": {

-                "name": "Гостевой дом"
+                "name": "Гостевой дом",
+                "terms": "Гостевой дом"

             },
             "tourism/hostel": {
                 "name": "Хостел",
             },
             "tourism/hostel": {
                 "name": "Хостел",


@@ -2268,7 +2475,8 @@
                 "terms": "гостиница, отель"
             },
             "tourism/information": {
                 "terms": "гостиница, отель"
             },
             "tourism/information": {

-                "name": "Инфопункт"
+                "name": "Инфопункт",
+                "terms": "Инфопункт, Инфостэнд, Информационный пункт"

             },
             "tourism/motel": {
                 "name": "Мотель",
             },
             "tourism/motel": {
                 "name": "Мотель",


@@ -2279,7 +2487,8 @@
                 "terms": "музей"
             },
             "tourism/picnic_site": {
                 "terms": "музей"
             },
             "tourism/picnic_site": {

-                "name": "Место для пикника"
+                "name": "Место для пикника",
+                "terms": "Место для пикника, Поляна для пикника"

             },
             "tourism/theme_park": {
                 "name": "Парк развлечений"
             },
             "tourism/theme_park": {
                 "name": "Парк развлечений"


@@ -2292,25 +2501,32 @@
                 "terms": "зоопарк"
             },
             "type/boundary": {
                 "terms": "зоопарк"
             },
             "type/boundary": {

-                "name": "Граница"
+                "name": "Граница",
+                "terms": "Граница"

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

-                "name": "Административная граница"
+                "name": "Административная граница",
+                "terms": "Административная граница"

             },
             "type/multipolygon": {
             },
             "type/multipolygon": {

-                "name": "Многоугольник"
+                "name": "Многоугольник",
+                "terms": "Мультиполигон, Многоугольник"

             },
             "type/restriction": {
             },
             "type/restriction": {

-                "name": "Ограничение"
+                "name": "Ограничение",
+                "terms": "Ограничение, Ограничение направлений движения, Ограничение манёвра"

             },
             "type/route": {
             },
             "type/route": {

-                "name": "Маршрут"
+                "name": "Маршрут",
+                "terms": "Маршрут"

             },
             "type/route/bicycle": {
             },
             "type/route/bicycle": {

-                "name": "Велосипедный маршрут"
+                "name": "Велосипедный маршрут",
+                "terms": "Вело маршрут, Велосипедный маршрут"

             },
             "type/route/bus": {
             },
             "type/route/bus": {

-                "name": "Автобусный маршрут"
+                "name": "Автобусный маршрут",
+                "terms": "Автобусный маршрут"

             },
             "type/route/detour": {
                 "name": "Объезд"
             },
             "type/route/detour": {
                 "name": "Объезд"


@@ -2320,7 +2536,8 @@
                 "terms": "паром, паромная переправа"
             },
             "type/route/foot": {
                 "terms": "паром, паромная переправа"
             },
             "type/route/foot": {

-                "name": "Пешеходный маршрут"
+                "name": "Пешеходный маршрут",
+                "terms": "Пеший маршрут, Пешеходный маршрут"

             },
             "type/route/hiking": {
                 "name": "Пешеходный Маршрут"
             },
             "type/route/hiking": {
                 "name": "Пешеходный Маршрут"


@@ -2339,7 +2556,8 @@
                 "name": "Железнодорожный маршрут"
             },
             "type/route/tram": {
                 "name": "Железнодорожный маршрут"
             },
             "type/route/tram": {

-                "name": "Трамвайный маршрут"
+                "name": "Трамвайный маршрут",
+                "terms": "Трамвайный маршрут"

             },
             "type/route_master": {
                 "name": "Главное Отношение Маршрута"
             },
             "type/route_master": {
                 "name": "Главное Отношение Маршрута"


@@ -2349,7 +2567,8 @@
                 "terms": "другое"
             },
             "waterway": {
                 "terms": "другое"
             },
             "waterway": {

-                "name": "Водный путь"
+                "name": "Водный путь",
+                "terms": "Водоток, Водное русло"

             },
             "waterway/canal": {
                 "name": "Канал",
             },
             "waterway/canal": {
                 "name": "Канал",


@@ -2364,20 +2583,24 @@
                 "terms": "канава, ров"
             },
             "waterway/drain": {
                 "terms": "канава, ров"
             },
             "waterway/drain": {

-                "name": "Дренажный канал"
+                "name": "Дренажный канал",
+                "terms": "Канава, Дождевая канава"

             },
             "waterway/river": {
                 "name": "Река",
                 "terms": "река"
             },
             "waterway/riverbank": {
             },
             "waterway/river": {
                 "name": "Река",
                 "terms": "река"
             },
             "waterway/riverbank": {

-                "name": "Поверхность реки"
+                "name": "Поверхность реки",
+                "terms": "Урез берега реки"

             },
             "waterway/stream": {
             },
             "waterway/stream": {

-                "name": "Ручей"
+                "name": "Ручей",
+                "terms": "Ручей"

             },
             "waterway/weir": {
             },
             "waterway/weir": {

-                "name": "Плотина"
+                "name": "Плотина",
+                "terms": "Плотина, Гидроплотина"

             }
         }
     }
             }
         }
     }

diff --git a/vendor/assets/iD/iD/locales/sk.json b/vendor/assets/iD/iD/locales/sk.json
index 9696e7c18343a4f5f3ab7952a155f7b9ed313e72..29b8610f73c2604c089cfca2ed40388dd1b7eb3b 100644 (file)
--- a/vendor/assets/iD/iD/locales/sk.json
+++ b/vendor/assets/iD/iD/locales/sk.json
@@ -1284,6 +1284,9 @@
                 "name": "Bytovka",
                 "terms": "Bytovka,obytna budova,panelak,panelák,vežiak,veziak,barak,barák,činžiak,cinziak,apartmany,apartmány"
             },
                 "name": "Bytovka",
                 "terms": "Bytovka,obytna budova,panelak,panelák,vežiak,veziak,barak,barák,činžiak,cinziak,apartmany,apartmány"
             },

+            "building/barn": {
+                "name": "Stodola"
+            },

             "building/commercial": {
                 "name": "Komerčná budova",
                 "terms": "Obchody,firmy,firma,predaj,podnik,podniky,kancelarie,kancelárie"
             "building/commercial": {
                 "name": "Komerčná budova",
                 "terms": "Obchody,firmy,firma,predaj,podnik,podniky,kancelarie,kancelárie"

diff --git a/vendor/assets/iD/iD/locales/sv.json b/vendor/assets/iD/iD/locales/sv.json
index e4bd6fa495a88e258f88bd44afa833cca00a1a81..088216154313f5ab706df5e6248c3d40692ebe77 100644 (file)
--- a/vendor/assets/iD/iD/locales/sv.json
+++ b/vendor/assets/iD/iD/locales/sv.json
@@ -41,9 +41,11 @@
             }
         },
         "continue": {
             }
         },
         "continue": {

+            "key": "A",

             "title": "Fortsätt",
             "description": "Fortsätt denna linje.",
             "not_eligible": "Ingen linje kan fortsätta här.",
             "title": "Fortsätt",
             "description": "Fortsätt denna linje.",
             "not_eligible": "Ingen linje kan fortsätta här.",

+            "multiple": "Flera linjer kan fortsätta härifrån. För att välja en linje, tryck på tangenten Skift och klicka på den för att välja.",

             "annotation": {
                 "line": "Fortsatte en linje.",
                 "area": "Fortsatt ett område."
             "annotation": {
                 "line": "Fortsatte en linje.",
                 "area": "Fortsatt ett område."


@@ -72,15 +74,24 @@
             "not_closed": "Denna kan inte göras rund då den inte är en loop."
         },
         "orthogonalize": {
             "not_closed": "Denna kan inte göras rund då den inte är en loop."
         },
         "orthogonalize": {

+            "title": "Räta upp",
+            "description": {
+                "line": "Räta upp hörnen på denna linje.",
+                "area": "Räta upp hörnen på denna ytan."
+            },
+            "key": "S",

             "annotation": {
                 "line": "Gjort hörnen på en linje fyrkantiga.",
                 "area": "Gjort hörnen på ett område fyrkantiga."
             "annotation": {
                 "line": "Gjort hörnen på en linje fyrkantiga.",
                 "area": "Gjort hörnen på ett område fyrkantiga."

-            }
+            },
+            "not_squarish": "Denna kan inte rätas upp då den inte är fyrkantig."

         },
         "straighten": {
             "title": "Räta ut",
             "description": "Räta ut denna linje.",
         },
         "straighten": {
             "title": "Räta ut",
             "description": "Räta ut denna linje.",

-            "annotation": "Rätade ut en linje."
+            "key": "S",
+            "annotation": "Rätade ut en linje.",
+            "too_bendy": "Den kan inte rätas upp då den är för böjd."

         },
         "delete": {
             "title": "Ta bort",
         },
         "delete": {
             "title": "Ta bort",


@@ -123,7 +134,8 @@
             "annotation": "Sammanfogade {n} linjer.",
             "not_eligible": "Dessa objekt kan inte slås samman.",
             "not_adjacent": "Dessa linjer kan inte slås ihop då dem inte är ihopsatta.",
             "annotation": "Sammanfogade {n} linjer.",
             "not_eligible": "Dessa objekt kan inte slås samman.",
             "not_adjacent": "Dessa linjer kan inte slås ihop då dem inte är ihopsatta.",

-            "restriction": "Dessa linjer kan inte slås samman då minst en av dem tillhör relationen \"{relation}\"."
+            "restriction": "Dessa linjer kan inte slås samman då minst en av dem tillhör relationen \"{relation}\".",
+            "incomplete_relation": "Dessa objekt kan inte sammanfogas då åtminstone ett inte hämtats fullständigt."

         },
         "move": {
             "title": "Flytta",
         },
         "move": {
             "title": "Flytta",


@@ -236,18 +248,24 @@
         "back_tooltip": "Ändra objekt",
         "remove": "Ta bort",
         "search": "Sök",
         "back_tooltip": "Ändra objekt",
         "remove": "Ta bort",
         "search": "Sök",

+        "multiselect": "Välj objekt",

         "unknown": "Okänd",
         "incomplete": "<inte hämtad>",
         "feature_list": "Sök efter egenskaper",
         "edit": "Ändra objekt",
         "unknown": "Okänd",
         "incomplete": "<inte hämtad>",
         "feature_list": "Sök efter egenskaper",
         "edit": "Ändra objekt",

+        "none": "Ingen",
+        "node": "Nod",

         "way": "Väg",
         "way": "Väg",

-        "relation": "Relation"
+        "relation": "Relation",
+        "location": "Plats"

     },
     "background": {
         "title": "Bakgrund",
         "description": "Bakgrundsinställningar",
         "percent_brightness": "{opacity}% ljusstyrka",
     },
     "background": {
         "title": "Bakgrund",
         "description": "Bakgrundsinställningar",
         "percent_brightness": "{opacity}% ljusstyrka",

+        "none": "Ingen",

         "custom": "Anpassa",
         "custom": "Anpassa",

+        "fix_misalignment": "Justera bildplacering",

         "reset": "ta bort"
     },
     "restore": {
         "reset": "ta bort"
     },
     "restore": {


@@ -297,6 +315,7 @@
         "untagged_area": "Otaggat område",
         "many_deletions": "Du håller på att ta bort {n} objekt. Är du helt säker? Detta tar bort dem för alla som använder openstreetmap.org.",
         "tag_suggests_area": "Taggen {tag} indikerar att detta borde vara ett område istället för en linje",
         "untagged_area": "Otaggat område",
         "many_deletions": "Du håller på att ta bort {n} objekt. Är du helt säker? Detta tar bort dem för alla som använder openstreetmap.org.",
         "tag_suggests_area": "Taggen {tag} indikerar att detta borde vara ett område istället för en linje",

+        "untagged_tooltip": "Välj en typ som beskriver vad denna {geometry} är.",

         "deprecated_tags": "Borttagna taggar: {tags}"
     },
     "zoom": {
         "deprecated_tags": "Borttagna taggar: {tags}"
     },
     "zoom": {


@@ -306,11 +325,15 @@
     "cannot_zoom": "Går ej att zooma ut ytterligare med nuvarande sätt.",
     "gpx": {
         "local_layer": "Lokal gpx-fil",
     "cannot_zoom": "Går ej att zooma ut ytterligare med nuvarande sätt.",
     "gpx": {
         "local_layer": "Lokal gpx-fil",

+        "drag_drop": "Dra och släpp en .gpx-fil på sidan, eller klicka på knappen till höger för att bläddra",

         "zoom": "Zooma till GPX-spår",
         "browse": "Bläddra efter en .gpx-fil"
     },
     "help": {
         "zoom": "Zooma till GPX-spår",
         "browse": "Bläddra efter en .gpx-fil"
     },
     "help": {

-        "title": "Hjälp"
+        "title": "Hjälp",
+        "help": "# Hjälp\n\nDetta är en redigerare för [OpenStreetMap](http://www.openstreetmap.org/), den\nfri och redigerbara världskartan. Du kan använda den för att lägga till och uppdatera\ndata i ditt närområde, allt för att ytterligare förbättra en världskarta för alla baserad på öppen källkod och data.\n\nÄndringar du gör i den här kartan kommer att visas för alla som använder\nOpenStreetMap. För att göra en ändring behöver du ett\n[gratis OpenStreetMap-konto](https://www.openstreetmap.org/user/new).\n\n[iD editor](http://ideditor.com/) är ett samarbetsprojekt med [källkodkod \ntillgänglig på GitHub](https://github.com/openstreetmap/iD).\n",
+        "gps": "# GPS \n\nGPS-data är den mest pålitliga källan för uppgifter till OpenStreetMap. Denna redigerare \nstödjer lokala spår – ”.GPX”-filer på din lokala dator. Du kan skapa \ndenna typ av GPS-spår med ett flertal smartphone-appar samt med\npersonlig GPS-hårdvara. \n\nFör information om hur man skapar en GPS-spårning, läs \n[Kartläggning med en GPS](http://learnosm.org/en/beginner/using-gps/). \n\nFör att använda ett GPX-spår för kartläggning, dra och släpp GPX-filen på \nkartredigeraren. Om den känns igen kommer den att läggas till på kartan som en klargrön \nlinje. Klicka på menyn \"Bakgrundsinställningar\" på höger sida för att aktivera, \navaktivera eller zooma till detta nya GPX-drivna lager. \n\nGPX spår överförs inte direkt till OpenStreetMap - det bästa sättet att \nanvända dem är att rita på kartan, använda den som en guide för de nya objekt som \ndu lägger till, och också [ladda upp dem till OpenStreetMap](http://www.openstreetmap.org/trace/create) \nför att användas av andra.\n",
+        "buildings": "# Byggnader\n\nOpenStreetMap är världens största databas över byggnader. Du kan skapa\noch förbättra denna databas.\n\n### Markering\n\nDu kan markera en byggnad genom att klicka på dess kant. Detta kommer att markera \nbyggnaden och öppna en litet verktygsmeny och ett sidofält som visar mer information\nom byggnaden.\n\n### Modifiering\n\nIbland är byggnader felaktigt placerade eller har felaktiga taggar.\n\nFör att flytta en hel byggnad, markera den och klicka sedan på \"Flytta\"-verktyget. flytta\nmus för att flytta byggnaden, och klicka när den är korrekt placerad.\n\nFör att fixa den specifika formen av en byggnad, klicka och dra noderna som bildar\nramen till bättre platser.\n\n### Skapa\n\nEn av de viktigaste frågorna att tänka på vid tilläggning av byggnader till kartan är att\nOpenStreetMap registrerar byggnader både som form och punkt. Tumregeln\när att _kartlägga en byggnad som en form när möjligt_ och kartlägg företag, bostäder,\nfacilitet, och andra saker finns i byggandena som punkter placerade\ninuti byggnadernas ram.\n\nBörja rita en byggnad som en ram genom att klicka på knappen \"område\" högst upp till vänster\ngränssnittet, och avsluta det antingen genom att trycka på \"Retur\" på tangentbordet\neller genom att klicka på den första ritade noden för att stänga formen.\n\n### Radering\n\nOm en byggnad är helt fel – du kan se att den inte finns med i någon satellitbild\noch helst har bekräftat lokalt att det inte finns – kan du ta bort\nden, vilket tar bort det från kartan. Var försiktig när du tar bort objekt –\nlikt alla ändringar kommer resultatet ses av alla och satellitbilder\när ofta föråldrad, så byggnaden kan helt enkelt vara nybyggd.\n\nDu kan ta bort en byggnad genom att klicka på den för att markera den och sedan klicka på\nikonen papperskorg eller trycka på \"Delete\"-tangenten.\n"

     },
     "intro": {
         "navigation": {
     },
     "intro": {
         "navigation": {


@@ -344,6 +367,7 @@
         },
         "lines": {
             "title": "Linjer",
         },
         "lines": {
             "title": "Linjer",

+            "add": "Linjer används för att representera objekt så som vägar, järnvägar och floder. **Klicka på knappen Linje för att lägga till en ny linje.***",

             "start": "**Påbörja linjen genom att klicka på slutet av vägen.**",
             "intersect": "Klicka för att lägga till fler punkter på linjen (vägen). Du kan flytta kartan under tiden du ritar. Vägar och många andra typer av linjer är en del av ett större nät med linjer. Det är därför viktigt att linjer blir korrekt anslutna till varandra för att exempelvis körinstruktioner ska fungera.**Klicka på Flower Street för att skapa en anslutning mellan de två linjerna (vägarna).**",
             "finish": "Linjer avslutas genom att klicka på slutpunkten en gång till.**Avsluta linjen.**",
             "start": "**Påbörja linjen genom att klicka på slutet av vägen.**",
             "intersect": "Klicka för att lägga till fler punkter på linjen (vägen). Du kan flytta kartan under tiden du ritar. Vägar och många andra typer av linjer är en del av ett större nät med linjer. Det är därför viktigt att linjer blir korrekt anslutna till varandra för att exempelvis körinstruktioner ska fungera.**Klicka på Flower Street för att skapa en anslutning mellan de två linjerna (vägarna).**",
             "finish": "Linjer avslutas genom att klicka på slutpunkten en gång till.**Avsluta linjen.**",


@@ -372,11 +396,15 @@
             },
             "category-road": {
                 "name": "Väg"
             },
             "category-road": {
                 "name": "Väg"

+            },
+            "category-route": {
+                "name": "Rutt"

             }
         },
         "fields": {
             "access": {
                 "label": "Tillgång",
             }
         },
         "fields": {
             "access": {
                 "label": "Tillgång",

+                "placeholder": "Okänt",

                 "types": {
                     "access": "Generell",
                     "foot": "Fotgängare",
                 "types": {
                     "access": "Generell",
                     "foot": "Fotgängare",


@@ -439,6 +467,9 @@
             "bicycle_parking": {
                 "label": "Typ"
             },
             "bicycle_parking": {
                 "label": "Typ"
             },

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

             "building": {
                 "label": "Byggnad"
             },
             "building": {
                 "label": "Byggnad"
             },


@@ -552,7 +583,8 @@
                 "placeholder": "50, 70, 90..."
             },
             "name": {
                 "placeholder": "50, 70, 90..."
             },
             "name": {

-                "label": "Namn"
+                "label": "Namn",
+                "placeholder": "Vanligt namn (om något)"

             },
             "natural": {
                 "label": "Natur"
             },
             "natural": {
                 "label": "Natur"


@@ -600,6 +632,9 @@
             "ref": {
                 "label": "Referens"
             },
             "ref": {
                 "label": "Referens"
             },

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

             "religion": {
                 "label": "Religion",
                 "options": {
             "religion": {
                 "label": "Religion",
                 "options": {


@@ -612,6 +647,15 @@
                     "taoist": "Taoism"
                 }
             },
                     "taoist": "Taoism"
                 }
             },

+            "restriction": {
+                "label": "Typ"
+            },
+            "route": {
+                "label": "Typ"
+            },
+            "route_master": {
+                "label": "Typ"
+            },

             "sac_scale": {
                 "label": "Svårighetsgrad"
             },
             "sac_scale": {
                 "label": "Svårighetsgrad"
             },


@@ -632,6 +676,7 @@
             },
             "structure": {
                 "label": "Struktur",
             },
             "structure": {
                 "label": "Struktur",

+                "placeholder": "Okänt",

                 "options": {
                     "bridge": "Bro",
                     "tunnel": "Tunnel",
                 "options": {
                     "bridge": "Bro",
                     "tunnel": "Tunnel",


@@ -681,11 +726,16 @@
             }
         },
         "presets": {
             }
         },
         "presets": {

+            "address": {
+                "name": "Adress",
+                "terms": "Adress, husnummer, destination, gatuadress, postnummer, postort"
+            },

             "aeroway": {
                 "name": "Flygbana"
             },
             "aeroway/aerodrome": {
             "aeroway": {
                 "name": "Flygbana"
             },
             "aeroway/aerodrome": {

-                "name": "Flygplats"
+                "name": "Flygplats",
+                "terms": "flygplats, flygfält, flyghamn, aerodrom, landningsplats, lufthamn"

             },
             "aeroway/apron": {
                 "name": "Parkering av flygplan (Apron)"
             },
             "aeroway/apron": {
                 "name": "Parkering av flygplan (Apron)"


@@ -719,7 +769,8 @@
                 "name": "Bank"
             },
             "amenity/bar": {
                 "name": "Bank"
             },
             "amenity/bar": {

-                "name": "Bar"
+                "name": "Bar",
+                "terms": "Bar, krog, servering, matställe, pub, cocktailsalong, saloon"

             },
             "amenity/bench": {
                 "name": "Bänk"
             },
             "amenity/bench": {
                 "name": "Bänk"


@@ -736,6 +787,9 @@
             "amenity/car_rental": {
                 "name": "Biluthyrning"
             },
             "amenity/car_rental": {
                 "name": "Biluthyrning"
             },

+            "amenity/car_sharing": {
+                "name": "Bilpool"
+            },

             "amenity/car_wash": {
                 "name": "Biltvätt"
             },
             "amenity/car_wash": {
                 "name": "Biltvätt"
             },


@@ -774,6 +828,9 @@
             "amenity/hospital": {
                 "name": "Sjukhus"
             },
             "amenity/hospital": {
                 "name": "Sjukhus"
             },

+            "amenity/kindergarten": {
+                "name": "Förskola"
+            },

             "amenity/library": {
                 "name": "Bibliotek"
             },
             "amenity/library": {
                 "name": "Bibliotek"
             },


@@ -786,6 +843,9 @@
             "amenity/place_of_worship": {
                 "name": "Plats för tillbedjan"
             },
             "amenity/place_of_worship": {
                 "name": "Plats för tillbedjan"
             },

+            "amenity/place_of_worship/buddhist": {
+                "name": "Buddhisttempel"
+            },

             "amenity/place_of_worship/christian": {
                 "name": "Kyrka"
             },
             "amenity/place_of_worship/christian": {
                 "name": "Kyrka"
             },


@@ -816,6 +876,9 @@
             "amenity/swimming_pool": {
                 "name": "Simbassäng"
             },
             "amenity/swimming_pool": {
                 "name": "Simbassäng"
             },

+            "amenity/taxi": {
+                "name": "Taxihållplats"
+            },

             "amenity/telephone": {
                 "name": "Telefon"
             },
             "amenity/telephone": {
                 "name": "Telefon"
             },


@@ -900,9 +963,15 @@
             "building/entrance": {
                 "name": "Entré"
             },
             "building/entrance": {
                 "name": "Entré"
             },

+            "building/garage": {
+                "name": "Garage"
+            },

             "building/house": {
                 "name": "Hus"
             },
             "building/house": {
                 "name": "Hus"
             },

+            "building/industrial": {
+                "name": "Industribyggnad"
+            },

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


@@ -1112,6 +1181,9 @@
             "leisure": {
                 "name": "Nöje"
             },
             "leisure": {
                 "name": "Nöje"
             },

+            "leisure/dog_park": {
+                "name": "Hundpark"
+            },

             "leisure/garden": {
                 "name": "Trädgård"
             },
             "leisure/garden": {
                 "name": "Trädgård"
             },


@@ -1163,21 +1235,36 @@
             "man_made": {
                 "name": "Människoskapad"
             },
             "man_made": {
                 "name": "Människoskapad"
             },

+            "man_made/breakwater": {
+                "name": "Vågbrytare"
+            },
+            "man_made/cutline": {
+                "name": "Snittlinje"
+            },

             "man_made/lighthouse": {
                 "name": "Fyr"
             },
             "man_made/pier": {
                 "name": "Pir"
             },
             "man_made/lighthouse": {
                 "name": "Fyr"
             },
             "man_made/pier": {
                 "name": "Pir"
             },

+            "man_made/pipeline": {
+                "name": "Pipeline"
+            },

             "man_made/survey_point": {
                 "name": "Trianguleringspunkt"
             },
             "man_made/survey_point": {
                 "name": "Trianguleringspunkt"
             },

+            "man_made/tower": {
+                "name": "Torn"
+            },

             "man_made/wastewater_plant": {
                 "name": "Avloppsreningsverk"
             },
             "man_made/water_tower": {
                 "name": "Vattentorn"
             },
             "man_made/wastewater_plant": {
                 "name": "Avloppsreningsverk"
             },
             "man_made/water_tower": {
                 "name": "Vattentorn"
             },

+            "man_made/water_well": {
+                "name": "Brunn"
+            },

             "man_made/water_works": {
                 "name": "Vattenverk"
             },
             "man_made/water_works": {
                 "name": "Vattenverk"
             },


@@ -1322,6 +1409,9 @@
             "relation": {
                 "name": "Relation"
             },
             "relation": {
                 "name": "Relation"
             },

+            "route/ferry": {
+                "name": "Färjerutt"
+            },

             "shop": {
                 "name": "Affär"
             },
             "shop": {
                 "name": "Affär"
             },


@@ -1388,6 +1478,9 @@
             "shop/electronics": {
                 "name": "Elektronikbutik"
             },
             "shop/electronics": {
                 "name": "Elektronikbutik"
             },

+            "shop/farm": {
+                "name": "Gårdsbutik"
+            },

             "shop/fishmonger": {
                 "name": "Fiskhandlare"
             },
             "shop/fishmonger": {
                 "name": "Fiskhandlare"
             },


@@ -1529,6 +1622,57 @@
             "tourism/zoo": {
                 "name": "Zoo"
             },
             "tourism/zoo": {
                 "name": "Zoo"
             },

+            "type/boundary": {
+                "name": "Gräns"
+            },
+            "type/boundary/administrative": {
+                "name": "Administrativ gräns"
+            },
+            "type/multipolygon": {
+                "name": "Multipolygon"
+            },
+            "type/restriction": {
+                "name": "Restriktion"
+            },
+            "type/route": {
+                "name": "Rutt"
+            },
+            "type/route/bicycle": {
+                "name": "cykelrutt"
+            },
+            "type/route/bus": {
+                "name": "Bussrutt"
+            },
+            "type/route/detour": {
+                "name": "Alternativ rutt"
+            },
+            "type/route/ferry": {
+                "name": "Färjerutt"
+            },
+            "type/route/foot": {
+                "name": "Vandringsrutt"
+            },
+            "type/route/pipeline": {
+                "name": "Rörledningsrutt"
+            },
+            "type/route/power": {
+                "name": "Kraftledningsrutt"
+            },
+            "type/route/road": {
+                "name": "Vägrutt"
+            },
+            "type/route/train": {
+                "name": "Tågrutt"
+            },
+            "type/route/tram": {
+                "name": "Spårvagnsrutt"
+            },
+            "type/route_master": {
+                "name": "Huvudrutt"
+            },
+            "vertex": {
+                "name": "Annat"
+            },

             "waterway": {
                 "name": "Vattenväg"
             },
             "waterway": {
                 "name": "Vattenväg"
             },

diff --git a/vendor/assets/iD/iD/locales/ta.json b/vendor/assets/iD/iD/locales/ta.json
index cbb357d801be9ecf7210ea46c888276e077dbfb6..4361cf0b3471547de315fbc2eb458de94c64de2a 100644 (file)
--- a/vendor/assets/iD/iD/locales/ta.json
+++ b/vendor/assets/iD/iD/locales/ta.json
@@ -112,6 +112,7 @@
             "address": {
                 "label": "முகவரி",
                 "placeholders": {
             "address": {
                 "label": "முகவரி",
                 "placeholders": {

+                    "housename": "வீட்டின் பெயர்",

                     "number": "123",
                     "street": "தெரு",
                     "city": "மாநகரம்"
                     "number": "123",
                     "street": "தெரு",
                     "city": "மாநகரம்"


@@ -138,6 +139,9 @@
             "artwork_type": {
                 "label": "வகை"
             },
             "artwork_type": {
                 "label": "வகை"
             },

+            "atm": {
+                "label": "ஏ.டி.எம்"
+            },

             "barrier": {
                 "label": "வகை"
             },
             "barrier": {
                 "label": "வகை"
             },


@@ -206,6 +210,7 @@
                 "label": "வகை"
             },
             "lanes": {
                 "label": "வகை"
             },
             "lanes": {

+                "label": "சந்துகள்",

                 "placeholder": "1, 2, 3..."
             },
             "leisure": {
                 "placeholder": "1, 2, 3..."
             },
             "leisure": {


@@ -221,11 +226,15 @@
                 "label": "வகை"
             },
             "maxspeed": {
                 "label": "வகை"
             },
             "maxspeed": {

+                "label": "வேக எல்லை",

                 "placeholder": "40, 50, 60..."
             },
             "name": {
                 "label": "பெயர்"
             },
                 "placeholder": "40, 50, 60..."
             },
             "name": {
                 "label": "பெயர்"
             },

+            "natural": {
+                "label": "இயற்கையான"
+            },

             "note": {
                 "label": "குறிப்பு"
             },
             "note": {
                 "label": "குறிப்பு"
             },


@@ -346,6 +355,9 @@
             "amenity/bank": {
                 "name": "வங்கி"
             },
             "amenity/bank": {
                 "name": "வங்கி"
             },

+            "amenity/bicycle_parking": {
+                "name": "ஈருருளை நிறுத்தகம்"
+            },

             "amenity/cafe": {
                 "name": "டீக்கடை"
             },
             "amenity/cafe": {
                 "name": "டீக்கடை"
             },


@@ -358,6 +370,12 @@
             "amenity/college": {
                 "name": "கல்லூரி"
             },
             "amenity/college": {
                 "name": "கல்லூரி"
             },

+            "amenity/fire_station": {
+                "name": "தீயணைப்பு நிலையம்"
+            },
+            "amenity/grave_yard": {
+                "name": "இடுகாடு"
+            },

             "amenity/hospital": {
                 "name": "மருத்துவமனை"
             },
             "amenity/hospital": {
                 "name": "மருத்துவமனை"
             },


@@ -379,6 +397,9 @@
             "amenity/police": {
                 "name": "காவல்"
             },
             "amenity/police": {
                 "name": "காவல்"
             },

+            "amenity/post_box": {
+                "name": "அஞ்சல்பெட்டி"
+            },

             "amenity/post_office": {
                 "name": "அஞ்சலகம்"
             },
             "amenity/post_office": {
                 "name": "அஞ்சலகம்"
             },


@@ -439,6 +460,9 @@
             "highway/bus_stop": {
                 "name": "பேருந்து நிலையம்"
             },
             "highway/bus_stop": {
                 "name": "பேருந்து நிலையம்"
             },

+            "highway/footway": {
+                "name": "நடைபாதை"
+            },

             "highway/path": {
                 "name": "வழி"
             },
             "highway/path": {
                 "name": "வழி"
             },


@@ -451,9 +475,15 @@
             "historic/castle": {
                 "name": "கோட்டை"
             },
             "historic/castle": {
                 "name": "கோட்டை"
             },

+            "landuse/construction": {
+                "name": "கட்டுமானம்"
+            },

             "landuse/farm": {
                 "name": "பண்ணை"
             },
             "landuse/farm": {
                 "name": "பண்ணை"
             },

+            "landuse/farmyard": {
+                "name": "பண்ணை"
+            },

             "landuse/forest": {
                 "name": "காடு"
             },
             "landuse/forest": {
                 "name": "காடு"
             },


@@ -496,9 +526,15 @@
             "man_made/water_tower": {
                 "name": "தண்ணீர்த் தொட்டி"
             },
             "man_made/water_tower": {
                 "name": "தண்ணீர்த் தொட்டி"
             },

+            "natural": {
+                "name": "இயற்கையான"
+            },

             "natural/beach": {
                 "name": "கடற்கரை"
             },
             "natural/beach": {
                 "name": "கடற்கரை"
             },

+            "natural/coastline": {
+                "name": "கடற்கரை"
+            },

             "natural/glacier": {
                 "name": "பனிப் பாறை"
             },
             "natural/glacier": {
                 "name": "பனிப் பாறை"
             },


@@ -535,6 +571,9 @@
             "place/city": {
                 "name": "மாநகரம்"
             },
             "place/city": {
                 "name": "மாநகரம்"
             },

+            "place/island": {
+                "name": "தீவு"
+            },

             "place/town": {
                 "name": "நகரம்"
             },
             "place/town": {
                 "name": "நகரம்"
             },


@@ -565,6 +604,12 @@
             "railway/station": {
                 "name": "இரயில் நிலையம்"
             },
             "railway/station": {
                 "name": "இரயில் நிலையம்"
             },

+            "railway/subway": {
+                "name": "சுரங்கப்பாதை"
+            },
+            "railway/subway_entrance": {
+                "name": "சுரங்கப்பாதை நுழைவுவாயில்"
+            },

             "relation": {
                 "name": "தொடர்பு"
             },
             "relation": {
                 "name": "தொடர்பு"
             },


@@ -598,6 +643,9 @@
             "shop/shoes": {
                 "name": "காலணியகம்"
             },
             "shop/shoes": {
                 "name": "காலணியகம்"
             },

+            "tourism": {
+                "name": "சுற்றுலா"
+            },

             "tourism/artwork": {
                 "name": "ஓவியம்"
             },
             "tourism/artwork": {
                 "name": "ஓவியம்"
             },

diff --git a/vendor/assets/iD/iD/locales/te.json b/vendor/assets/iD/iD/locales/te.json
index 1ff531ad34ca4f96eda3647824c8c8954f6fa9f8..706c1342e484e7e73f8e1b3e94a810c7231f3290 100644 (file)
--- a/vendor/assets/iD/iD/locales/te.json
+++ b/vendor/assets/iD/iD/locales/te.json
@@ -153,6 +153,7 @@
         "truncated_list": "మార్పులు చేసినవారు {users} మరియు {count} మంది"
     },
     "geocoder": {
         "truncated_list": "మార్పులు చేసినవారు {users} మరియు {count} మంది"
     },
     "geocoder": {

+        "search": "విశ్వవ్యాప్తంగా వెతుకు",

         "no_results_visible": "కనిపిస్తూన్న పటంలో ఫలితాలు ఏమీ లేవు",
         "no_results_worldwide": "ఫలితాలు ఏమీ లేవు"
     },
         "no_results_visible": "కనిపిస్తూన్న పటంలో ఫలితాలు ఏమీ లేవు",
         "no_results_worldwide": "ఫలితాలు ఏమీ లేవు"
     },


@@ -177,6 +178,8 @@
         "search": "వెతుకు",
         "multiselect": "ఎన్నుకున్న అంశాలు",
         "unknown": "గుర్తు తెలియని",
         "search": "వెతుకు",
         "multiselect": "ఎన్నుకున్న అంశాలు",
         "unknown": "గుర్తు తెలియని",

+        "feature_list": "విశేషాలు వెతుకు",
+        "edit": "విశేషం మార్చు",

         "none": "ఏవీ కాదు",
         "way": "దారి",
         "relation": "సంబంధం",
         "none": "ఏవీ కాదు",
         "way": "దారి",
         "relation": "సంబంధం",


@@ -198,6 +201,8 @@
         "unsaved_changes": "భద్రపరచని మార్పులు ఉన్నాయి"
     },
     "success": {
         "unsaved_changes": "భద్రపరచని మార్పులు ఉన్నాయి"
     },
     "success": {

+        "just_edited": "మీరు ఇప్పుడే OpenStreetMapను మార్చారు",
+        "view_on_osm": "OSM/ఓఎస్ఎం లో వీక్షించు",

         "facebook": "ఫేస్‌బుక్‌లో పంచుకోండి",
         "twitter": "ట్విట్టర్లో పంచుకోండి",
         "google": "గూగుల్+లో పంచుకోండి"
         "facebook": "ఫేస్‌బుక్‌లో పంచుకోండి",
         "twitter": "ట్విట్టర్లో పంచుకోండి",
         "google": "గూగుల్+లో పంచుకోండి"


@@ -227,6 +232,7 @@
         },
         "areas": {
             "title": "ప్రదేశాలు",
         },
         "areas": {
             "title": "ప్రదేశాలు",

+            "search": "**'{name}' కొరకు వెతుకు**",

             "choose": "జాబితా నుండి మైదానం ఎంచుకోండి"
         },
         "lines": {
             "choose": "జాబితా నుండి మైదానం ఎంచుకోండి"
         },
         "lines": {


@@ -236,7 +242,8 @@
         "startediting": {
             "title": "కూర్పు మొదలుపెట్టు",
             "help": "మరిన్ని వివరాలు ఇక్కడ లబించును",
         "startediting": {
             "title": "కూర్పు మొదలుపెట్టు",
             "help": "మరిన్ని వివరాలు ఇక్కడ లబించును",

-            "save": "మీరు మార్చిన విశేషాలను భద్రపరచడం మరచిపోకండి!"
+            "save": "మీరు మార్చిన విశేషాలను భద్రపరచడం మరచిపోకండి!",
+            "start": "మ్యాప్ చేయడం మొదలుపెట్టు"

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

diff --git a/vendor/assets/iD/iD/locales/vi.json b/vendor/assets/iD/iD/locales/vi.json
index 3a523822b8566b2516d00757168e0ec7f3cf1f05..0a00c6e4aad6ae5acecf23cb8ae6b00f3f82c3b4 100644 (file)
--- a/vendor/assets/iD/iD/locales/vi.json
+++ b/vendor/assets/iD/iD/locales/vi.json
@@ -134,7 +134,8 @@
             "annotation": "gộp {n} đường kẻ",
             "not_eligible": "Không thể gộp các đối tượng này.",
             "not_adjacent": "Không thể gộp các đường kẻ không nối liền với nhau.",
             "annotation": "gộp {n} đường kẻ",
             "not_eligible": "Không thể gộp các đối tượng này.",
             "not_adjacent": "Không thể gộp các đường kẻ không nối liền với nhau.",

-            "restriction": "Không thể gộp các đường kẻ này vì ít nhất một trong những đường kẻ trực thuộc quan hệ “{relation}”."
+            "restriction": "Không thể gộp các đường kẻ này vì ít nhất một trong những đường kẻ trực thuộc quan hệ “{relation}”.",
+            "incomplete_relation": "Không thể gộp vì một trong số đối tượng này chưa được tải về hoàn toàn."

         },
         "move": {
             "title": "Di chuyển",
         },
         "move": {
             "title": "Di chuyển",


@@ -1284,10 +1285,46 @@
                 "name": "Khu chung cư",
                 "terms": "khu chung cư, khu chung cu"
             },
                 "name": "Khu chung cư",
                 "terms": "khu chung cư, khu chung cu"
             },

+            "building/barn": {
+                "name": "Chuồng",
+                "terms": "chuồng, chuồng trâu bò, chuồng ngựa, kho thóc, chuong, chuong trau bo, chuong ngua, kho thoc"
+            },
+            "building/bunker": {
+                "name": "Boong ke",
+                "terms": "boong ke, boong-ke, boongke"
+            },
+            "building/cabin": {
+                "name": "Nhà tranh",
+                "terms": "nhà tranh, túp lều, nhà gỗ, nha tranh, tup leu, nha go"
+            },
+            "building/cathedral": {
+                "name": "Nhà thờ Chánh tòa",
+                "terms": "nhà thờ chánh tòa, nhà thờ chánh toà, nhà thờ chính tòa, nhà thờ chính toà, vương cung thánh đường, đại vương cung thánh đường, tiểu vương cung thánh đường, nha tho chanh toa, nha tho chinh toa, vuong cung thanh duong, dai vuong cung thanh duong, tieu vuong cung thanh duong"
+            },
+            "building/chapel": {
+                "name": "Nhà nguyện",
+                "terms": "nhà nguyện, nhà thờ nhỏ, nha nguyen, nha tho nho"
+            },
+            "building/church": {
+                "name": "Nhà thờ",
+                "terms": "nhà thờ, Ki-tô giáo, Kitô giáo, Thiên Chúa giáo, đạo Thiên Chúa, Công giáo, Tin Lành, giáo xứ, thánh đường, nha tho, Ki-to giao, Kito giao, Thien Chua giao, dao Thien Chua, Cong giao, Tin Lanh, giao xu, thanh duong"
+            },

             "building/commercial": {
                 "name": "Tòa nhà Thương mại",
                 "terms": "tòa nhà thương mại, toà nhà thương mại, toa nha thuong mai"
             },
             "building/commercial": {
                 "name": "Tòa nhà Thương mại",
                 "terms": "tòa nhà thương mại, toà nhà thương mại, toa nha thuong mai"
             },

+            "building/construction": {
+                "name": "Tòa nhà đang Xây dựng",
+                "terms": "tòa nhà đang xây dựng, toà nhà đang xây dựng, nhà đang xây, toa nha dang xay dung, nha dang xay"
+            },
+            "building/detached": {
+                "name": "Nhà Tách biệt",
+                "terms": "nhà tách biệt, nhà biệt lập, nha tach biet, nha biet lap"
+            },
+            "building/dormitory": {
+                "name": "Ký túc xá",
+                "terms": "ký túc xá, kí túc xá, ký túc sá, kí túc sá, cư xá, ky tuc xa, ki tuc xa, ky tuc sa, ki tuc sa, cu xa"
+            },

             "building/entrance": {
                 "name": "Cửa vào",
                 "terms": "cửa vào, lối vào, cua vao, loi vao"
             "building/entrance": {
                 "name": "Cửa vào",
                 "terms": "cửa vào, lối vào, cua vao, loi vao"


@@ -1296,6 +1333,22 @@
                 "name": "Ga ra",
                 "terms": "ga ra, ga-ra"
             },
                 "name": "Ga ra",
                 "terms": "ga ra, ga-ra"
             },

+            "building/garages": {
+                "name": "Dãy Ga ra",
+                "terms": "dãy ga ra, dãy ga-ra, dãy nhà để xe, day ga ra, day ga-ra, day nha de xe"
+            },
+            "building/greenhouse": {
+                "name": "Nhà kính",
+                "terms": "nhà kính, nhà kiếng, nhà trồng rau, nhà trồng hoa, nha kinh, nha kieng, nha trong rau, nha trong hoa"
+            },
+            "building/hospital": {
+                "name": "Tòa nhà Bệnh viện",
+                "terms": "tòa nhà bệnh viện, toà nhà bệnh viện, tòa nhà nhà thường, toà nhà nhà thường"
+            },
+            "building/hotel": {
+                "name": "Tòa nhà Khách sạn",
+                "terms": "tòa nhà khách sạn, toà nhà khách sạn"
+            },

             "building/house": {
                 "name": "Nhà ở",
                 "terms": "nhà ở, căn nhà, tòa nhà, toà nhà, nha o, can nha, toa nha"
             "building/house": {
                 "name": "Nhà ở",
                 "terms": "nhà ở, căn nhà, tòa nhà, toà nhà, nha o, can nha, toa nha"


@@ -1308,10 +1361,54 @@
                 "name": "Tòa nhà Công nghiệp",
                 "terms": "tòa nhà công nghiệp, toà nhà công nghiệp, toa nha cong nghiep"
             },
                 "name": "Tòa nhà Công nghiệp",
                 "terms": "tòa nhà công nghiệp, toà nhà công nghiệp, toa nha cong nghiep"
             },

+            "building/public": {
+                "name": "Tòa nhà Công cộng",
+                "terms": "tòa nhà công cộng, toà nhà công cộng"
+            },

             "building/residential": {
                 "name": "Tòa nhà Dân cư",
                 "terms": "tòa nhà dân cư, toà nhà dân cư, nhà ở, căn nhà, toa nha dan cu, nha o, can nha"
             },
             "building/residential": {
                 "name": "Tòa nhà Dân cư",
                 "terms": "tòa nhà dân cư, toà nhà dân cư, nhà ở, căn nhà, toa nha dan cu, nha o, can nha"
             },

+            "building/retail": {
+                "name": "Tòa nhà Bán lẻ",
+                "terms": "tòa nhà bán lẻ, toà nhà bán lẻ, toa nha ban le"
+            },
+            "building/roof": {
+                "name": "Mái Che",
+                "terms": "mái che, mái, mái nhà, nóc, mai che, mai, mai nha, noc"
+            },
+            "building/school": {
+                "name": "Nhà Trường",
+                "terms": "nhà trường, trường học, học viện, nha truong, truong học, hoc vien"
+            },
+            "building/shed": {
+                "name": "Lán",
+                "terms": "lán, lán trại, lều lán, túp lều, chuồng, lan, lan trai, leu lan, tup leu, chuong"
+            },
+            "building/stable": {
+                "name": "Chuồng Ngựa",
+                "terms": "chuồng ngựa, chuong ngua"
+            },
+            "building/static_caravan": {
+                "name": "Nhà Lưu động để Một Chỗ",
+                "terms": "nhà lưu động để một chỗ, nhà di động để một chỗ, nha luu dong de mot cho, nha di dong de mot cho"
+            },
+            "building/terrace": {
+                "name": "Dãy Nhà",
+                "terms": "dãy nhà, day nha"
+            },
+            "building/train_station": {
+                "name": "Nhà ga",
+                "terms": "nhà ga,nha ga"
+            },
+            "building/university": {
+                "name": "Tòa nhà Đại học",
+                "terms": "tòa nhà đại học, toà nhà đại học, tòa nhà trường đại học, toà nhà trường đại học, toa nha dai hoc, toa nha truong dai hoc"
+            },
+            "building/warehouse": {
+                "name": "Nhà kho",
+                "terms": "nhà kho, kho, kho tàng, kho bãi, nha kho, kho tang, kho bai"
+            },

             "craft/basket_maker": {
                 "name": "Đan Rổ rá",
                 "terms": "nghề đan rổ rá, người đan rổ rá, tiệm đan rổ rá, nghe dan ro ra, nguoi dan ro ra, tiem dan ro ra"
             "craft/basket_maker": {
                 "name": "Đan Rổ rá",
                 "terms": "nghề đan rổ rá, người đan rổ rá, tiệm đan rổ rá, nghe dan ro ra, nguoi dan ro ra, tiem dan ro ra"


@@ -2288,6 +2385,10 @@
                 "name": "Tiệm Rượu",
                 "terms": "tiệm rượu, nơi bán rượu, chỗ bán rượu, quầy bán rượu, cửa hàng rượu, cửa hàng bán rượu, tiệm bán rượu, tiem ruou, noi ban ruou, cho ban ruou, quay ban ruou, cua hang ruou, cua hang ban ruou, tiem ban ruou"
             },
                 "name": "Tiệm Rượu",
                 "terms": "tiệm rượu, nơi bán rượu, chỗ bán rượu, quầy bán rượu, cửa hàng rượu, cửa hàng bán rượu, tiệm bán rượu, tiem ruou, noi ban ruou, cho ban ruou, quay ban ruou, cua hang ruou, cua hang ban ruou, tiem ban ruou"
             },

+            "shop/art": {
+                "name": "Tiệm Nghệ phẩm",
+                "terms": "tiệm nghệ phẩm, tiệm bức tranh, tiệm bức vẽ, cửa hàng nghệ phẩm, cửa hàng bức tranh, cửa hàng bức vẽ, quán nghệ phẩm, quán bức tranh, quán bức vẽ, nơi bán nghệ phẩm, nơi bán bức tranh, nơi bán bức vẽ, tiem nghe pham, tiem buc tranh, tiem buc ve, cua hang nghe pham, cua hang buc tranh, cua hang buc ve, quan nghe pham, quan buc tranh, quan buc ve, noi ban nghe pham, noi ban buc tranh, noi ban buc ve"
+            },

             "shop/bakery": {
                 "name": "Tiệm Bánh",
                 "terms": "tiệm bánh, tiệm bánh mì, tiệm bán bánh, nơi bán bánh, chỗ bán bánh, quầy bán bánh, nhà bán bánh, tiem banh, tiem banh mi, tiem ban banh, noi ban banh, cho ban banh, quay ban banh, nha ban banh"
             "shop/bakery": {
                 "name": "Tiệm Bánh",
                 "terms": "tiệm bánh, tiệm bánh mì, tiệm bán bánh, nơi bán bánh, chỗ bán bánh, quầy bán bánh, nhà bán bánh, tiem banh, tiem banh mi, tiem ban banh, noi ban banh, cho ban banh, quay ban banh, nha ban banh"


@@ -2304,6 +2405,10 @@
                 "name": "Tiệm Xe đạp",
                 "terms": "tiệm xe đạp, cửa hàng xe đạp, chỗ bán xe đạp, tiem xe dap, cua hang xe dap, cho ban xe dap"
             },
                 "name": "Tiệm Xe đạp",
                 "terms": "tiệm xe đạp, cửa hàng xe đạp, chỗ bán xe đạp, tiem xe dap, cua hang xe dap, cho ban xe dap"
             },

+            "shop/bookmaker": {
+                "name": "Phòng Đánh cá Ngựa",
+                "terms": "phòng đánh cá ngựa, văn phòng đánh cá ngựa, cửa sổ đánh cá ngựa, tiệm đánh cá ngựa, cửa hàng đánh cá ngựa, nơi đánh cá ngựa, phong danh ca ngua, van phong danh ca ngua, cua so danh ca ngua, tiem danh ca ngua, cua hang danh ca ngua, noi danh ca ngua"
+            },

             "shop/books": {
                 "name": "Hiệu Sách",
                 "terms": "hiệu sách, tiệm sách, chỗ bán sách vở, hieu sach, tiem sach, cho ban sach vo"
             "shop/books": {
                 "name": "Hiệu Sách",
                 "terms": "hiệu sách, tiệm sách, chỗ bán sách vở, hieu sach, tiem sach, cho ban sach vo"


@@ -2424,6 +2529,10 @@
                 "name": "Thợ khóa",
                 "terms": "thợ khóa, thợ sửa khóa, thợ khoá, trợ sửa khoá, thợ kim khí, tho khoa, tho sua khoa, tho kim khi"
             },
                 "name": "Thợ khóa",
                 "terms": "thợ khóa, thợ sửa khóa, thợ khoá, trợ sửa khoá, thợ kim khí, tho khoa, tho sua khoa, tho kim khi"
             },

+            "shop/lottery": {
+                "name": "Tiệm Xổ số",
+                "terms": "quầy xổ số, quầy vé xổ số, tiệm xổ số, tiệm vé xổ số, cửa hàng xổ số, cửa hàng vé xổ số, quán xổ số, quán vé xổ số, nơi bán vé xổ số, nơi mua vé xổ số, quay xo so, quay ve xo so, tiem xo so, tiem ve xo so, cua hang xo so, cua hang ve xo so, quan xo so, quan ve xo so, noi ban ve xo so, noi mua ve xo so"
+            },

             "shop/mall": {
                 "name": "Trung tâm Thương mại",
                 "terms": "trung tâm thương mại, khu thương mại, trung tam thuong mai, khu thuong mai"
             "shop/mall": {
                 "name": "Trung tâm Thương mại",
                 "terms": "trung tâm thương mại, khu thương mại, trung tam thuong mai, khu thuong mai"

diff --git a/vendor/assets/iD/iD/locales/zh-CN.json b/vendor/assets/iD/iD/locales/zh-CN.json
index 6a7d139be7f92bb60906ddb2f6fdadbf3bce3ffe..e3b45f21add5f8263a088a455944ddf073a0b2e3 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-CN.json
+++ b/vendor/assets/iD/iD/locales/zh-CN.json
@@ -297,7 +297,7 @@
     "splash": {
         "welcome": "欢迎使用OpenStreetMap iD编辑器",
         "text": "ID编辑器是一个既易用而又功能强大的工具，以助您编辑世界上最好的自由世界地图。这是{version}版本。欲知详情，请浏览{website}及在{github}报告程序错误。“",
     "splash": {
         "welcome": "欢迎使用OpenStreetMap iD编辑器",
         "text": "ID编辑器是一个既易用而又功能强大的工具，以助您编辑世界上最好的自由世界地图。这是{version}版本。欲知详情，请浏览{website}及在{github}报告程序错误。“",

-        "walkthrough": "开始导览",
+        "walkthrough": "开始演练",

         "start": "现在编辑"
     },
     "source_switch": {
         "start": "现在编辑"
     },
     "source_switch": {


@@ -836,6 +836,9 @@
                 "name": "缆车线路",
                 "terms": "缆车线路"
             },
                 "name": "缆车线路",
                 "terms": "缆车线路"
             },

+            "aerialway/cable_car": {
+                "name": "缆车"
+            },

             "aerialway/pylon": {
                 "name": "缆车塔",
                 "terms": "缆车塔"
             "aerialway/pylon": {
                 "name": "缆车塔",
                 "terms": "缆车塔"

diff --git a/vendor/assets/iD/iD/locales/zh-TW.json b/vendor/assets/iD/iD/locales/zh-TW.json
index ea593741601eb8f4754db719ae9fc899c9f5ae90..ee017637c0eb1e76690641835b3a49238f218120 100644 (file)
--- a/vendor/assets/iD/iD/locales/zh-TW.json
+++ b/vendor/assets/iD/iD/locales/zh-TW.json
@@ -45,7 +45,7 @@
             "title": "繼續繪製",
             "description": "繼續繪製此線段",
             "not_eligible": "無法在此繼續繪製線段",
             "title": "繼續繪製",
             "description": "繼續繪製此線段",
             "not_eligible": "無法在此繼續繪製線段",

-            "multiple": "有多條線段可在此被繼續繪製。要選擇其中一條，請按 Shift 鍵並點擊它。",
+            "multiple": "有多條線段可在此延續。要選擇其中一條，請按 Shift 鍵並點擊它。",

             "annotation": {
                 "line": "繼續繪製一線段。",
                 "area": "繼續繪製一區域。"
             "annotation": {
                 "line": "繼續繪製一線段。",
                 "area": "繼續繪製一區域。"


@@ -74,17 +74,17 @@
             "not_closed": "非圈狀物件，不能環形化。"
         },
         "orthogonalize": {
             "not_closed": "非圈狀物件，不能環形化。"
         },
         "orthogonalize": {

-            "title": "方形化",
+            "title": "方角化",

             "description": {
             "description": {

-                "line": "方形化此線。",
-                "area": "方形化此區域。"
+                "line": "將此線方角化。",
+                "area": "將此區域方角化。"

             },
             "key": "S",
             "annotation": {
                 "line": "已將線段上的彎角換成直角。",
                 "area": "已將區域的彎角換成直角。"
             },
             },
             "key": "S",
             "annotation": {
                 "line": "已將線段上的彎角換成直角。",
                 "area": "已將區域的彎角換成直角。"
             },

-            "not_squarish": "這個區域無法被方形化，因為它並非近似方形。"
+            "not_squarish": "物件無法被方角化，因為它並非近似方形。"

         },
         "straighten": {
             "title": "拉直",
         },
         "straighten": {
             "title": "拉直",


@@ -134,7 +134,8 @@
             "annotation": "合併了 {n} 條線段。",
             "not_eligible": "不能合併這些物件。",
             "not_adjacent": "這些線段並不連接，不能合併。",
             "annotation": "合併了 {n} 條線段。",
             "not_eligible": "不能合併這些物件。",
             "not_adjacent": "這些線段並不連接，不能合併。",

-            "restriction": "這些線段不能合併，因為其中最少有一條線段是\"{relation}\" 關係的成員。"
+            "restriction": "這些線段不能合併，因為其中最少有一條線段是\"{relation}\" 關係的成員。",
+            "incomplete_relation": "這些物件不能合併，因為其中最少有一件未有完全下載。"

         },
         "move": {
             "title": "移動",
         },
         "move": {
             "title": "移動",


@@ -151,7 +152,7 @@
         },
         "rotate": {
             "title": "旋轉",
         },
         "rotate": {
             "title": "旋轉",

-            "description": "以物件中心點為圓心旋轉",
+            "description": "以物件中心點為軸心旋轉物件",

             "key": "R",
             "annotation": {
                 "line": "旋轉了一線段。",
             "key": "R",
             "annotation": {
                 "line": "旋轉了一線段。",


@@ -200,7 +201,7 @@
     "zoom_in_edit": "放大以開始編輯",
     "logout": "登出",
     "loading_auth": "正在連接 OpenStreetMap...",
     "zoom_in_edit": "放大以開始編輯",
     "logout": "登出",
     "loading_auth": "正在連接 OpenStreetMap...",

-    "report_a_bug": "回報錯誤",
+    "report_a_bug": "回報編輯器問題",

     "status": {
         "error": "未能連接至伺服器介面。",
         "offline": "伺服器介面離線，請稍後再嘗試編輯。",
     "status": {
         "error": "未能連接至伺服器介面。",
         "offline": "伺服器介面離線，請稍後再嘗試編輯。",


@@ -225,8 +226,8 @@
     },
     "geocoder": {
         "search": "搜尋全世界...",
     },
     "geocoder": {
         "search": "搜尋全世界...",

-        "no_results_visible": "å\8f¯è¦\8bç\9a\84å\9c°å\9c\96å\8d\80å\9f\9f中æ²\92æ\9c\89æ\90\9cå°\8bç\9b®æ¨\99",
-        "no_results_worldwide": "æ\89¾ä¸\8då\88°æ\90\9cå°\8bç\9b®æ¨\99"
+        "no_results_visible": "å\8f¯è¦\8bç\9a\84å\9c°å\9c\96å\8d\80å\9f\9f中æ²\92æ\9c\89æ\90\9cå°\8bçµ\90æ\9e\9c",
+        "no_results_worldwide": "æ\89¾ä¸\8då\88°æ\90\9cå°\8bçµ\90æ\9e\9c"

     },
     "geolocate": {
         "title": "顯示我的位置"
     },
     "geolocate": {
         "title": "顯示我的位置"


@@ -247,7 +248,7 @@
         "back_tooltip": "修改物件",
         "remove": "移除",
         "search": "搜尋",
         "back_tooltip": "修改物件",
         "remove": "移除",
         "search": "搜尋",

-        "multiselect": "選擇多物件",
+        "multiselect": "已選擇的物件",

         "unknown": "未知種類",
         "incomplete": "<未有下載>",
         "feature_list": "搜尋物件",
         "unknown": "未知種類",
         "incomplete": "<未有下載>",
         "feature_list": "搜尋物件",


@@ -264,7 +265,7 @@
         "percent_brightness": "{opacity}%的光度",
         "none": "無",
         "custom": "客製化",
         "percent_brightness": "{opacity}%的光度",
         "none": "無",
         "custom": "客製化",

-        "custom_prompt": "輸入一個暫時標題名稱。因為{z}、{x}、{y}代表著 Z/X/Y 主題，{u}代表 quadtile 主題所以無法使用。",
+        "custom_prompt": "輸入地圖影像區塊的模版。以 Z/X/Y 方式存取區塊的伺服器，可在模版中使用{z}, {x}, {y}作參數，而以quadtile存取區塊的伺服器，則可使用{u}作參數。",

         "fix_misalignment": "校準",
         "reset": "重設"
     },
         "fix_misalignment": "校準",
         "reset": "重設"
     },


@@ -289,7 +290,7 @@
         "facebook": "在 Facebook 上分享",
         "twitter": "分享到 Twitter",
         "google": "分享到 Google+",
         "facebook": "在 Facebook 上分享",
         "twitter": "分享到 Twitter",
         "google": "分享到 Google+",

-        "help_html": "您的修改將在幾分鐘內出現在\"標準\"圖層中。其它圖層和一些物件可能會花較久時間。\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>details</a>).\n"
+        "help_html": "您的修改應會在數分鐘內在\"標準\"圖層中出現。其他圖層和某些物件則可能會花較長時間。\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>details</a>).\n"

     },
     "confirm": {
         "okay": "確定"
     },
     "confirm": {
         "okay": "確定"


@@ -316,7 +317,7 @@
         "untagged_area": "未有標籤的區域",
         "many_deletions": "你正在刪除 {n} 個物件。這些物件會從openstreetmap.org上所有人可以看見的地圖上刪除，你是否確定需要這樣做？",
         "tag_suggests_area": "{tag} 標籤所建議的線段應為區域，但這個不是一區域",
         "untagged_area": "未有標籤的區域",
         "many_deletions": "你正在刪除 {n} 個物件。這些物件會從openstreetmap.org上所有人可以看見的地圖上刪除，你是否確定需要這樣做？",
         "tag_suggests_area": "{tag} 標籤所建議的線段應為區域，但這個不是一區域",

-        "untagged_tooltip": "選擇一個物件類型符合這個{geometry}。",
+        "untagged_tooltip": "選擇可描述這個{geometry}的一個物件種類。",

         "deprecated_tags": "已棄用的標籤︰{tags}"
     },
     "zoom": {
         "deprecated_tags": "已棄用的標籤︰{tags}"
     },
     "zoom": {


@@ -326,8 +327,8 @@
     "cannot_zoom": "在此模式下不能再縮小。",
     "gpx": {
         "local_layer": "本機GPX檔案",
     "cannot_zoom": "在此模式下不能再縮小。",
     "gpx": {
         "local_layer": "本機GPX檔案",

-        "drag_drop": "拖移一個 .gpx 檔案到頁面上，或是點擊右方的按紐",
-        "zoom": "移至 GPX 軌跡",
+        "drag_drop": "拖移一個 .gpx 檔案到頁面上，或是點擊右方的按鈕以瀏覽",
+        "zoom": "放大至 GPX 軌跡",

         "browse": "開啟一個 .gpx 檔案"
     },
     "help": {
         "browse": "開啟一個 .gpx 檔案"
     },
     "help": {


@@ -336,11 +337,11 @@
         "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": "# 道路\n\n您可以利用這個編輯器創建，修復，及刪除道路。道路可以有很多種：路徑，公路，郊遊徑，單車徑，和更多 － 任何經常使用的路段都可製圖。\n\n### 選擇道路\n\n點擊圖上的道路以選擇該道路。道路的輪廓會以高亮度顯示，而同時地圖上會出現小工具選單，旁邊亦會彈出面板，顯示有關該道路的資訊。\n\n### 修訂道路\n\n您或會經常注意到，道路並非對齊在背景中顯示的衛星圖像或GPS軌跡。您可以調整這些道路，讓他們位於正確的位置。\n\n首先，點擊您想修訂的道路。這會將道路以高亮度顯示，並顯示沿著這道路的節點，你可以拖曳這些節點到更好的位置。如果您想增加細節，可以為道路添加新的節點，點擊兩下道路上沒有節點的部分，便可在該處増加節點。\n\n如果道路連接到另一條道路，但在地圖上並未妥善連接，你可以拖曳道路的其中一個節點到另一條道路上，以連接兩條道路。連接好道路，對地圖非常重要，特別是對提供駕駛指示的應用程序而言，是必要的。\n\n您也可以點擊'移動'工具或按`M`快速鍵，來移動整條道路，然後點擊一下以完成移動的動作。\n\n### 刪除道路\n\n如果一條道路完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將道路刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該道路或許只是新建的。\n\n要刪除道路，您可以點擊它以選擇，然後點擊垃圾桶圖標，或按 ’Delete’ 鍵。\n\n### 繪製新道路\n\n發現某處應有一條道路，但地圖上沒有？點擊編輯器左上方的'線'圖標，或按下`2`快速鍵，以開始繪製線段。\n\n在地圖上點擊道路的開端，以開始繪製道路。如果道路從一條現有的道路分支出來，應點擊兩者連接的地方，以開始繪製。\n\n然後點擊沿著道路的點，以根據衛星影像或GPS軌跡，正確地繪製道路。如果您繪製的道路如果與另一條道路交匯，請點擊相交點以將它們連接起來。當您完成繪製後，可點擊兩下或按鍵盤上的 'Return' 或 ’Enter’ 鍵。\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",
         "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": "# 道路\n\n您可以利用這個編輯器創建，修復，及刪除道路。道路可以有很多種：路徑，公路，郊遊徑，單車徑，和更多 － 任何經常使用的路段都可製圖。\n\n### 選擇道路\n\n點擊圖上的道路以選擇該道路。道路的輪廓會以高亮度顯示，而同時地圖上會出現小工具選單，旁邊亦會彈出面板，顯示有關該道路的資訊。\n\n### 修訂道路\n\n您或會經常注意到，道路並非對齊在背景中顯示的衛星圖像或GPS軌跡。您可以調整這些道路，讓他們位於正確的位置。\n\n首先，點擊您想修訂的道路。這會將道路以高亮度顯示，並顯示沿著這道路的節點，你可以拖曳這些節點到更好的位置。如果您想增加細節，可以為道路添加新的節點，點擊兩下道路上沒有節點的部分，便可在該處増加節點。\n\n如果道路連接到另一條道路，但在地圖上並未妥善連接，你可以拖曳道路的其中一個節點到另一條道路上，以連接兩條道路。連接好道路，對地圖非常重要，特別是對提供駕駛指示的應用程序而言，是必要的。\n\n您也可以點擊'移動'工具或按`M`快速鍵，來移動整條道路，然後點擊一下以完成移動的動作。\n\n### 刪除道路\n\n如果一條道路完全不正確 － 您看到它在衛星圖像上不存在，並最好實地證實它根本不存在 － 您可以將道路刪除，這會從地圖中將之移除。刪除物件時務必要小心 － 像任何其他的編輯，結果會被大家看見，而衛星圖像往往會過時，因此該道路或許只是新建的。\n\n要刪除道路，您可以點擊它以選擇，然後點擊垃圾桶圖標，或按 ’Delete’ 鍵。\n\n### 繪製新道路\n\n發現某處應有一條道路，但地圖上沒有？點擊編輯器左上方的'線'圖標，或按下`2`快速鍵，以開始繪製線段。\n\n在地圖上點擊道路的開端，以開始繪製道路。如果道路從一條現有的道路分支出來，應點擊兩者連接的地方，以開始繪製。\n\n然後點擊沿著道路的點，以根據衛星影像或GPS軌跡，正確地繪製道路。如果您繪製的道路如果與另一條道路交匯，請點擊相交點以將它們連接起來。當您完成繪製後，可點擊兩下或按鍵盤上的 'Return' 或 ’Enter’ 鍵。\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他們分別為空照圖、衛星影像和自由編輯的資源。\n\n編輯器原始設定為[Bing Maps](http://www.bing.com/maps/)的衛星圖層，\n但當您平移或縮放地圖至一個新的地理區域，新的資源將可被使用。\n在有些國家的一些區域，像是美國、法國或丹麥就有非常高品質的圖像。\n\n圖像有時候會對不上地圖資料，那是因為提供圖像的人犯了點小錯。\n如果您看到有很多路與背景是平移錯位的，請不要立刻將它們移至符合背景。\n您所要做的，只需要利用背景圖像設定介面底部的'校準'，\n來調整圖像讓它符合現有資料。\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",
         "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它們會在面板及地圖上標誌出來。\n\n在大多時候，iD會自動維持您編輯的關係。\n最主要的是須注意當您為了繪製出更精確的道路而刪除舊有的，\n您必須確保新的元素必須同樣是原本關係的成員。\n\n## 編輯關係\n\n如果您想編輯關係，以下是基本要領。\n\n要增加物件至一種關係中，選擇該物件，\n點擊面板中\"所有關係\"的\"+\"按鈕，並選擇或輸入一種關係的名稱。\n\n要增加一種新關係，點選第一個物件作為成員，\n點擊面板中\"所有關係\"的\"+\"按鈕，並選擇\"建立新關係...\"。\n\n要物件從一種關係中移除，選擇該物件，\n點擊您想移除的關係旁的垃圾桶按鈕。\n\n您可以運用\"合併\"工具創建內含空缺的多重多邊形。\n繪製兩個區域(內部與外部)，按住 Shift 鍵並分別點擊它們，\n然後點擊 \"合併\"(+)按鈕。\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"

     },
     "intro": {
         "navigation": {
     },
     "intro": {
         "navigation": {


@@ -374,7 +375,7 @@
         },
         "lines": {
             "title": "線",
         },
         "lines": {
             "title": "線",

-            "add": "線用於表現如道路、鐵路以及河流。 **點擊線按鈕來新增一條線段。**",
+            "add": "線後可用於表示如道路、鐵路以及河流。 **點擊線按鈕來新增一條線段。**",

             "start": "**點擊道路末端，以開始繪製線段。**",
             "intersect": "點擊以為線段添加更多的節點。在繪圖是，如有需要，您可以拖曳地圖。道路和許多其他類型的線段，是整個體系的一部分。這些線段正確地連接起來，對導航的應用程序的運作相當重要。**點擊Flower Street，建立連接這兩條線段的相交點。**",
             "finish": "再次點擊最後的節點，可完成繪製線段。**完成繪製此道路**",
             "start": "**點擊道路末端，以開始繪製線段。**",
             "intersect": "點擊以為線段添加更多的節點。在繪圖是，如有需要，您可以拖曳地圖。道路和許多其他類型的線段，是整個體系的一部分。這些線段正確地連接起來，對導航的應用程序的運作相當重要。**點擊Flower Street，建立連接這兩條線段的相交點。**",
             "finish": "再次點擊最後的節點，可完成繪製線段。**完成繪製此道路**",


@@ -382,7 +383,7 @@
             "residential": "道路有不同種類，最常見的為住宅區道路。**選擇住宅區道路**",
             "describe": "**給道路一個名稱，並關閉物件編輯器。**",
             "restart": "這道路須與Flower Street相交。",
             "residential": "道路有不同種類，最常見的為住宅區道路。**選擇住宅區道路**",
             "describe": "**給道路一個名稱，並關閉物件編輯器。**",
             "restart": "這道路須與Flower Street相交。",

-            "wrong_preset": "æ\82¨å°\9aæ\9cªé\81¸æ\93\87ä½\8få®\85å\8d\80é\81\93è·¯ã\80\82**é»\9eæ\93\8aé\80\99裡並再次選擇**"
+            "wrong_preset": "æ\82¨å°\9aæ\9cªé\81¸æ\93\87ä½\8få®\85å\8d\80é\81\93è·¯ã\80\82**é»\9eæ\93\8aé\80\99裡以再次選擇**"

         },
         "startediting": {
             "title": "開始編輯",
         },
         "startediting": {
             "title": "開始編輯",


@@ -393,6 +394,12 @@
     },
     "presets": {
         "categories": {
     },
     "presets": {
         "categories": {

+            "category-building": {
+                "name": "樓宇"
+            },
+            "category-golf": {
+                "name": "高爾夫球"
+            },

             "category-landuse": {
                 "name": "土地用途"
             },
             "category-landuse": {
                 "name": "土地用途"
             },


@@ -407,6 +414,12 @@
             },
             "category-route": {
                 "name": "路線"
             },
             "category-route": {
                 "name": "路線"

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

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


@@ -447,6 +460,9 @@
                     }
                 }
             },
                     }
                 }
             },

+            "access_simple": {
+                "label": "通行限制"
+            },

             "address": {
                 "label": "地址",
                 "placeholders": {
             "address": {
                 "label": "地址",
                 "placeholders": {


@@ -460,15 +476,51 @@
             "admin_level": {
                 "label": "行政級別"
             },
             "admin_level": {
                 "label": "行政級別"
             },

+            "aerialway": {
+                "label": "種類"
+            },
+            "aerialway/access": {
+                "label": "通行方向"
+            },
+            "aerialway/bubble": {
+                "label": "椅罩"
+            },
+            "aerialway/capacity": {
+                "label": "輸送客量（每小時）",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "時間（分鐘）",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "暖氣"
+            },
+            "aerialway/occupancy": {
+                "label": "載客數",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "通行方向（夏季）"
+            },

             "aeroway": {
                 "label": "種類"
             },
             "amenity": {
                 "label": "種類"
             },
             "aeroway": {
                 "label": "種類"
             },
             "amenity": {
                 "label": "種類"
             },

+            "artist": {
+                "label": "藝術家"
+            },
+            "artwork_type": {
+                "label": "種類"
+            },

             "atm": {
                 "label": "自動櫃員機"
             },
             "atm": {
                 "label": "自動櫃員機"
             },

+            "backrest": {
+                "label": "椅背"
+            },

             "barrier": {
                 "label": "種類"
             },
             "barrier": {
                 "label": "種類"
             },


@@ -484,6 +536,9 @@
             "building_area": {
                 "label": "建築物"
             },
             "building_area": {
                 "label": "建築物"
             },

+            "cans": {
+                "label": "接受金屬罐"
+            },

             "capacity": {
                 "label": "容量",
                 "placeholder": "50, 100, 200..."
             "capacity": {
                 "label": "容量",
                 "placeholder": "50, 100, 200..."


@@ -498,6 +553,9 @@
                     "anticlockwise": "反時針"
                 }
             },
                     "anticlockwise": "反時針"
                 }
             },

+            "clothes": {
+                "label": "接受衣物"
+            },

             "collection_times": {
                 "label": "收集時間"
             },
             "collection_times": {
                 "label": "收集時間"
             },


@@ -507,6 +565,9 @@
             "country": {
                 "label": "國家"
             },
             "country": {
                 "label": "國家"
             },

+            "covered": {
+                "label": "有蓋"
+            },

             "crossing": {
                 "label": "種類"
             },
             "crossing": {
                 "label": "種類"
             },


@@ -522,8 +583,11 @@
             "description": {
                 "label": "描述"
             },
             "description": {
                 "label": "描述"
             },

+            "electrified": {
+                "label": "電氣化"
+            },

             "elevation": {
             "elevation": {

-                "label": "高度"
+                "label": "海拔"

             },
             "emergency": {
                 "label": "緊急"
             },
             "emergency": {
                 "label": "緊急"


@@ -538,9 +602,35 @@
             "fee": {
                 "label": "費用"
             },
             "fee": {
                 "label": "費用"
             },

+            "fire_hydrant/type": {
+                "label": "種類"
+            },

             "fixme": {
                 "label": "Fix Me"
             },
             "fixme": {
                 "label": "Fix Me"
             },

+            "gauge": {
+                "label": "軌距"
+            },
+            "generator/method": {
+                "label": "方法"
+            },
+            "generator/source": {
+                "label": "來源"
+            },
+            "generator/type": {
+                "label": "種類"
+            },
+            "glass": {
+                "label": "接受玻璃"
+            },
+            "golf_hole": {
+                "label": "參考編號",
+                "placeholder": "球洞編號(1－18)"
+            },
+            "handicap": {
+                "label": "差點",
+                "placeholder": "1-18"
+            },

             "highway": {
                 "label": "種類"
             },
             "highway": {
                 "label": "種類"
             },


@@ -556,6 +646,9 @@
             "incline": {
                 "label": "斜度"
             },
             "incline": {
                 "label": "斜度"
             },

+            "information": {
+                "label": "種類"
+            },

             "internet_access": {
                 "label": "網際網絡連接",
                 "options": {
             "internet_access": {
                 "label": "網際網絡連接",
                 "options": {


@@ -581,6 +674,9 @@
                 "label": "屋宇層數",
                 "placeholder": "2, 4, 6..."
             },
                 "label": "屋宇層數",
                 "placeholder": "2, 4, 6..."
             },

+            "lit": {
+                "label": "照明"
+            },

             "location": {
                 "label": "位置"
             },
             "location": {
                 "label": "位置"
             },


@@ -608,7 +704,7 @@
                 "label": "種類"
             },
             "oneway": {
                 "label": "種類"
             },
             "oneway": {

-                "label": "單程路"
+                "label": "單行道"

             },
             "oneway_yes": {
                 "label": "單程路"
             },
             "oneway_yes": {
                 "label": "單程路"


@@ -619,6 +715,13 @@
             "operator": {
                 "label": "營運商"
             },
             "operator": {
                 "label": "營運商"
             },

+            "paper": {
+                "label": "接受廢紙"
+            },
+            "par": {
+                "label": "標準桿數",
+                "placeholder": "3,4,5..."
+            },

             "park_ride": {
                 "label": "泊車轉乘"
             },
             "park_ride": {
                 "label": "泊車轉乘"
             },


@@ -629,6 +732,15 @@
                 "label": "電話",
                 "placeholder": "+31 42 123 4567"
             },
                 "label": "電話",
                 "placeholder": "+31 42 123 4567"
             },

+            "piste/difficulty": {
+                "label": "難度"
+            },
+            "piste/grooming": {
+                "label": "雪道種類"
+            },
+            "piste/type": {
+                "label": "種類"
+            },

             "place": {
                 "label": "種類"
             },
             "place": {
                 "label": "種類"
             },


@@ -652,7 +764,7 @@
                     "buddhist": "佛教",
                     "jewish": "猶太教",
                     "hindu": "印度教",
                     "buddhist": "佛教",
                     "jewish": "猶太教",
                     "hindu": "印度教",

-                    "shinto": "神道教徒",
+                    "shinto": "神道教",

                     "taoist": "道教"
                 }
             },
                     "taoist": "道教"
                 }
             },


@@ -674,9 +786,16 @@
             "shelter": {
                 "label": "遮雨棚／涼亭"
             },
             "shelter": {
                 "label": "遮雨棚／涼亭"
             },

+            "shelter_type": {
+                "label": "種類"
+            },

             "shop": {
                 "label": "種類"
             },
             "shop": {
                 "label": "種類"
             },

+            "social_facility_for": {
+                "label": "服務對象",
+                "placeholder": "露宿者，殘疾人士，小童等"
+            },

             "source": {
                 "label": "來源"
             },
             "source": {
                 "label": "來源"
             },


@@ -693,12 +812,18 @@
                     "cutting": "挖土"
                 }
             },
                     "cutting": "挖土"
                 }
             },

+            "studio_type": {
+                "label": "種類"
+            },

             "supervised": {
                 "label": "受監察"
             },
             "surface": {
                 "label": "路面鋪設"
             },
             "supervised": {
                 "label": "受監察"
             },
             "surface": {
                 "label": "路面鋪設"
             },

+            "toilets/disposal": {
+                "label": "處置方式"
+            },

             "tourism": {
                 "label": "種類"
             },
             "tourism": {
                 "label": "種類"
             },


@@ -711,6 +836,15 @@
             "trail_visibility": {
                 "label": "路徑可見度"
             },
             "trail_visibility": {
                 "label": "路徑可見度"
             },

+            "tree_type": {
+                "label": "種類"
+            },
+            "tunnel": {
+                "label": "隧道"
+            },
+            "vending": {
+                "label": "貨品種類"
+            },

             "water": {
                 "label": "種類"
             },
             "water": {
                 "label": "種類"
             },


@@ -739,6 +873,36 @@
                 "name": "地址",
                 "terms": "地址,位置,位址"
             },
                 "name": "地址",
                 "terms": "地址,位置,位址"
             },

+            "aerialway": {
+                "name": "吊道"
+            },
+            "aerialway/cable_car": {
+                "name": "纜車"
+            },
+            "aerialway/chair_lift": {
+                "name": "吊椅"
+            },
+            "aerialway/gondola": {
+                "name": "吊車"
+            },
+            "aerialway/magic_carpet": {
+                "name": "輸送帶"
+            },
+            "aerialway/platter": {
+                "name": "吊盤"
+            },
+            "aerialway/pylon": {
+                "name": "吊道塔"
+            },
+            "aerialway/rope_tow": {
+                "name": "牽繩"
+            },
+            "aerialway/station": {
+                "name": "車站"
+            },
+            "aerialway/t-bar": {
+                "name": "T型吊桿"
+            },

             "aeroway": {
                 "name": "機場相關設施"
             },
             "aeroway": {
                 "name": "機場相關設施"
             },


@@ -756,7 +920,7 @@
                 "name": "飛機庫"
             },
             "aeroway/helipad": {
                 "name": "飛機庫"
             },
             "aeroway/helipad": {

-                "name": "ç\9b´æ\98\87æ©\9få ´"
+                "name": "ç\9b´æ\98\87æ©\9få\9dª"

             },
             "aeroway/runway": {
                 "name": "跑道"
             },
             "aeroway/runway": {
                 "name": "跑道"


@@ -770,6 +934,9 @@
             "amenity": {
                 "name": "便利設施"
             },
             "amenity": {
                 "name": "便利設施"
             },

+            "amenity/arts_centre": {
+                "name": "藝術中心"
+            },

             "amenity/atm": {
                 "name": "自動櫃員機"
             },
             "amenity/atm": {
                 "name": "自動櫃員機"
             },


@@ -780,7 +947,7 @@
                 "name": "酒吧"
             },
             "amenity/bench": {
                 "name": "酒吧"
             },
             "amenity/bench": {

-                "name": "長凳"
+                "name": "長椅"

             },
             "amenity/bicycle_parking": {
                 "name": "單車停泊處"
             },
             "amenity/bicycle_parking": {
                 "name": "單車停泊處"


@@ -788,6 +955,9 @@
             "amenity/bicycle_rental": {
                 "name": "單車租賃"
             },
             "amenity/bicycle_rental": {
                 "name": "單車租賃"
             },

+            "amenity/boat_rental": {
+                "name": "小艇租賃"
+            },

             "amenity/cafe": {
                 "name": "咖啡廳"
             },
             "amenity/cafe": {
                 "name": "咖啡廳"
             },


@@ -804,12 +974,18 @@
                 "terms": "洗車行,洗車店"
             },
             "amenity/childcare": {
                 "terms": "洗車行,洗車店"
             },
             "amenity/childcare": {

-                "name": "幼兒園",
+                "name": "托兒所",

                 "terms": "幼兒園,托兒所"
             },
             "amenity/cinema": {
                 "name": "戲院"
             },
                 "terms": "幼兒園,托兒所"
             },
             "amenity/cinema": {
                 "name": "戲院"
             },

+            "amenity/clinic": {
+                "name": "診所"
+            },
+            "amenity/clock": {
+                "name": "時鐘"
+            },

             "amenity/college": {
                 "name": "書院",
                 "terms": "學院,大學,專校,大專"
             "amenity/college": {
                 "name": "書院",
                 "terms": "學院,大學,專校,大專"


@@ -817,8 +993,14 @@
             "amenity/courthouse": {
                 "name": "法院"
             },
             "amenity/courthouse": {
                 "name": "法院"
             },

+            "amenity/dentist": {
+                "name": "牙醫"
+            },
+            "amenity/doctor": {
+                "name": "醫生"
+            },

             "amenity/drinking_water": {
             "amenity/drinking_water": {

-                "name": "飲水處",
+                "name": "飲處",

                 "terms": "飲水,水源,活水"
             },
             "amenity/embassy": {
                 "terms": "飲水,水源,活水"
             },
             "amenity/embassy": {


@@ -890,6 +1072,12 @@
             "amenity/pub": {
                 "name": "酒館"
             },
             "amenity/pub": {
                 "name": "酒館"
             },

+            "amenity/ranger_station": {
+                "name": "郊野公園管理站"
+            },
+            "amenity/recycling": {
+                "name": "回收設施"
+            },

             "amenity/restaurant": {
                 "name": "餐廳",
                 "terms": "飯店,飯館,酒樓,餐館"
             "amenity/restaurant": {
                 "name": "餐廳",
                 "terms": "飯店,飯館,酒樓,餐館"


@@ -898,6 +1086,24 @@
                 "name": "學校",
                 "terms": "學校,小學,中學,國小,國中,高中,校園,校區"
             },
                 "name": "學校",
                 "terms": "學校,小學,中學,國小,國中,高中,校園,校區"
             },

+            "amenity/shelter": {
+                "name": "亭"
+            },
+            "amenity/social_facility": {
+                "name": "社福設施"
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "食物銀行"
+            },
+            "amenity/social_facility/group_home": {
+                "name": "安老院"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "露宿者中心"
+            },
+            "amenity/studio": {
+                "name": "工作室"
+            },

             "amenity/swimming_pool": {
                 "name": "游泳池",
                 "terms": "游泳池,泳池"
             "amenity/swimming_pool": {
                 "name": "游泳池",
                 "terms": "游泳池,泳池"


@@ -923,6 +1129,12 @@
                 "name": "大學",
                 "terms": "大專"
             },
                 "name": "大學",
                 "terms": "大專"
             },

+            "amenity/vending_machine": {
+                "name": "自動販賣機"
+            },
+            "amenity/veterinary": {
+                "name": "獸醫"
+            },

             "amenity/waste_basket": {
                 "name": "廢物箱"
             },
             "amenity/waste_basket": {
                 "name": "廢物箱"
             },


@@ -963,7 +1175,7 @@
                 "name": "樹籬"
             },
             "barrier/kissing_gate": {
                 "name": "樹籬"
             },
             "barrier/kissing_gate": {

-                "name": "單人轉門 "
+                "name": "單人轉門"

             },
             "barrier/lift_gate": {
                 "name": "道閘"
             },
             "barrier/lift_gate": {
                 "name": "道閘"


@@ -984,25 +1196,247 @@
                 "name": "行政界線"
             },
             "building": {
                 "name": "行政界線"
             },
             "building": {

-                "name": "建築物"
+                "name": "樓宇"

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

-                "name": "分層屋宇"
+                "name": "分層公寓"
+            },
+            "building/commercial": {
+                "name": "商用樓宇"

             },
             "building/entrance": {
                 "name": "入口"
             },
             },
             "building/entrance": {
                 "name": "入口"
             },

+            "building/garage": {
+                "name": "車庫"
+            },
+            "building/garages": {
+                "name": "車庫"
+            },
+            "building/greenhouse": {
+                "name": "溫室"
+            },
+            "building/hospital": {
+                "name": "醫院建築物"
+            },
+            "building/hotel": {
+                "name": "酒店建築物"
+            },

             "building/house": {
                 "name": "洋房"
             },
             "building/house": {
                 "name": "洋房"
             },

+            "building/hut": {
+                "name": "棚屋"
+            },
+            "building/industrial": {
+                "name": "工業樓宇"
+            },
+            "building/public": {
+                "name": "公共建築物"
+            },
+            "building/residential": {
+                "name": "住宅屋宇"
+            },
+            "building/retail": {
+                "name": "零售樓宇"
+            },
+            "building/roof": {
+                "name": "上蓋"
+            },
+            "building/school": {
+                "name": "學校建築物"
+            },
+            "building/shed": {
+                "name": "小屋"
+            },
+            "building/stable": {
+                "name": "馬房"
+            },
+            "building/static_caravan": {
+                "name": "固定的拖掛式房車"
+            },
+            "building/terrace": {
+                "name": "排屋"
+            },
+            "building/train_station": {
+                "name": "鐵路站建築物"
+            },
+            "building/university": {
+                "name": "大學建築物"
+            },
+            "building/warehouse": {
+                "name": "倉庫"
+            },
+            "craft/boatbuilder": {
+                "name": "造船廠"
+            },
+            "craft/brewery": {
+                "name": "釀酒廠"
+            },
+            "craft/carpenter": {
+                "name": "木匠"
+            },
+            "craft/carpet_layer": {
+                "name": "地氈工程"
+            },
+            "craft/caterer": {
+                "name": "到會服務"
+            },
+            "craft/clockmaker": {
+                "name": "製鐘廠"
+            },
+            "craft/confectionary": {
+                "name": "甜品店"
+            },
+            "craft/dressmaker": {
+                "name": "製衣店"
+            },
+            "craft/electrician": {
+                "name": "電氣工程"
+            },
+            "craft/gardener": {
+                "name": "園藝師"
+            },
+            "craft/glaziery": {
+                "name": "玻璃工程"
+            },
+            "craft/handicraft": {
+                "name": "手工藝"
+            },
+            "craft/hvac": {
+                "name": "空調工程"
+            },
+            "craft/insulator": {
+                "name": "隔熱工程"
+            },
+            "craft/jeweler": {
+                "name": "首飾店"
+            },
+            "craft/key_cutter": {
+                "name": "配匙店"
+            },
+            "craft/locksmith": {
+                "name": "鎖匠"
+            },
+            "craft/metal_construction": {
+                "name": "鐵工工程"
+            },
+            "craft/optician": {
+                "name": "眼鏡行"
+            },
+            "craft/painter": {
+                "name": "油漆工程"
+            },
+            "craft/photographer": {
+                "name": "攝影店"
+            },
+            "craft/photographic_labratory": {
+                "name": "沖印店"
+            },
+            "craft/plasterer": {
+                "name": "批盪工程"
+            },
+            "craft/plumber": {
+                "name": "水喉匠"
+            },
+            "craft/pottery": {
+                "name": "陶器工場"
+            },
+            "craft/rigger": {
+                "name": "吊運服務"
+            },
+            "craft/roofer": {
+                "name": "屋頂工程"
+            },
+            "craft/saddler": {
+                "name": "車船坐椅"
+            },
+            "craft/sailmaker": {
+                "name": "遊艇廠"
+            },
+            "craft/sawmill": {
+                "name": "鋸木廠"
+            },
+            "craft/scaffolder": {
+                "name": "棚架工程"
+            },
+            "craft/sculpter": {
+                "name": "雕塑工程"
+            },
+            "craft/shoemaker": {
+                "name": "鞋匠"
+            },
+            "craft/stonemason": {
+                "name": "切石廠"
+            },
+            "craft/sweep": {
+                "name": "煙囪清掃工"
+            },
+            "craft/tailor": {
+                "name": "裁縫"
+            },
+            "craft/tiler": {
+                "name": "地磚鋪設工程"
+            },
+            "craft/tinsmith": {
+                "name": "錫匠"
+            },
+            "craft/upholsterer": {
+                "name": "室内裝修"
+            },
+            "craft/watchmaker": {
+                "name": "鐘錶匠"
+            },
+            "craft/window_construction": {
+                "name": "製窗廠"
+            },
+            "embankment": {
+                "name": "基堤"
+            },
+            "emergency/ambulance_station": {
+                "name": "救護站"
+            },
+            "emergency/fire_hydrant": {
+                "name": "消防栓"
+            },

             "emergency/phone": {
                 "name": "緊急電話"
             },
             "entrance": {
                 "name": "入口"
             },
             "emergency/phone": {
                 "name": "緊急電話"
             },
             "entrance": {
                 "name": "入口"
             },

+            "footway/crossing": {
+                "name": "行人過路線"
+            },
+            "footway/sidewalk": {
+                "name": "路邊行人路"
+            },
+            "golf/bunker": {
+                "name": "沙坑"
+            },
+            "golf/fairway": {
+                "name": "球道"
+            },
+            "golf/green": {
+                "name": "果嶺"
+            },
+            "golf/hole": {
+                "name": "球洞"
+            },
+            "golf/lateral_water_hazard": {
+                "name": "側面水障礙區"
+            },
+            "golf/rough": {
+                "name": "深草區"
+            },
+            "golf/tee": {
+                "name": "開球區"
+            },
+            "golf/water_hazard": {
+                "name": "水障礙區"
+            },

             "highway": {
             "highway": {

-                "name": "公路"
+                "name": "道路"

             },
             "highway/bridleway": {
                 "name": "馬道"
             },
             "highway/bridleway": {
                 "name": "馬道"


@@ -1049,6 +1483,9 @@
             "highway/residential": {
                 "name": "住宅區道路"
             },
             "highway/residential": {
                 "name": "住宅區道路"
             },

+            "highway/rest_area": {
+                "name": "公路休憩區"
+            },

             "highway/road": {
                 "name": "未知種類的道路"
             },
             "highway/road": {
                 "name": "未知種類的道路"
             },


@@ -1062,7 +1499,8 @@
                 "name": "輔助道路"
             },
             "highway/service/alley": {
                 "name": "輔助道路"
             },
             "highway/service/alley": {

-                "name": "巷弄"
+                "name": "巷弄",
+                "terms": "小巷,巷弄,後巷,橫巷,窄巷,胡同"

             },
             "highway/service/drive-through": {
                 "name": "駕駛通過以獲取服務"
             },
             "highway/service/drive-through": {
                 "name": "駕駛通過以獲取服務"


@@ -1076,10 +1514,16 @@
             "highway/service/parking_aisle": {
                 "name": "停車場通道"
             },
             "highway/service/parking_aisle": {
                 "name": "停車場通道"
             },

+            "highway/services": {
+                "name": "公路服務區"
+            },

             "highway/steps": {
                 "name": "樓梯",
                 "terms": "樓梯,階梯,石階"
             },
             "highway/steps": {
                 "name": "樓梯",
                 "terms": "樓梯,階梯,石階"
             },

+            "highway/stop": {
+                "name": "停車標誌"
+            },

             "highway/tertiary": {
                 "name": "三級道路"
             },
             "highway/tertiary": {
                 "name": "三級道路"
             },


@@ -1153,6 +1597,9 @@
                 "name": "農場",
                 "terms": "農田,稻田,農地,田"
             },
                 "name": "農場",
                 "terms": "農田,稻田,農地,田"
             },

+            "landuse/farmland": {
+                "name": "耕地"
+            },

             "landuse/farmyard": {
                 "name": "農莊"
             },
             "landuse/farmyard": {
                 "name": "農莊"
             },


@@ -1186,6 +1633,12 @@
             "leisure": {
                 "name": "休閒設施"
             },
             "leisure": {
                 "name": "休閒設施"
             },

+            "leisure/common": {
+                "name": "公共用地"
+            },
+            "leisure/dog_park": {
+                "name": "狗公園"
+            },

             "leisure/garden": {
                 "name": "花園",
                 "terms": "花園,果園,菜園,植物園,公園"
             "leisure/garden": {
                 "name": "花園",
                 "terms": "花園,果園,菜園,植物園,公園"


@@ -1212,6 +1665,9 @@
                 "name": "籃球場",
                 "terms": "籃球場,球場"
             },
                 "name": "籃球場",
                 "terms": "籃球場,球場"
             },

+            "leisure/pitch/skateboard": {
+                "name": "滑板公園"
+            },

             "leisure/pitch/soccer": {
                 "name": "足球場"
             },
             "leisure/pitch/soccer": {
                 "name": "足球場"
             },


@@ -1227,12 +1683,18 @@
             "leisure/slipway": {
                 "name": "船架滑道"
             },
             "leisure/slipway": {
                 "name": "船架滑道"
             },

+            "leisure/sports_center": {
+                "name": "體肓中心"
+            },

             "leisure/stadium": {
                 "name": "體育場"
             },
             "leisure/swimming_pool": {
                 "name": "游泳池"
             },
             "leisure/stadium": {
                 "name": "體育場"
             },
             "leisure/swimming_pool": {
                 "name": "游泳池"
             },

+            "leisure/track": {
+                "name": "賽道"
+            },

             "line": {
                 "name": "線"
             },
             "line": {
                 "name": "線"
             },


@@ -1245,9 +1707,18 @@
             "man_made/cutline": {
                 "name": "山林分界線"
             },
             "man_made/cutline": {
                 "name": "山林分界線"
             },

+            "man_made/embankment": {
+                "name": "基堤"
+            },
+            "man_made/flagpole": {
+                "name": "旗桿"
+            },

             "man_made/lighthouse": {
                 "name": "燈塔"
             },
             "man_made/lighthouse": {
                 "name": "燈塔"
             },

+            "man_made/observation": {
+                "name": "瞭望塔"
+            },

             "man_made/pier": {
                 "name": "碼頭"
             },
             "man_made/pier": {
                 "name": "碼頭"
             },


@@ -1272,6 +1743,18 @@
             "man_made/water_works": {
                 "name": "水務設施"
             },
             "man_made/water_works": {
                 "name": "水務設施"
             },

+            "military/airfield": {
+                "name": "軍用機場"
+            },
+            "military/barracks": {
+                "name": "軍營"
+            },
+            "military/bunker": {
+                "name": "地堡"
+            },
+            "military/range": {
+                "name": "軍事靶場"
+            },

             "natural": {
                 "name": "自然物件"
             },
             "natural": {
                 "name": "自然物件"
             },


@@ -1287,6 +1770,9 @@
             "natural/coastline": {
                 "name": "海岸線"
             },
             "natural/coastline": {
                 "name": "海岸線"
             },

+            "natural/fell": {
+                "name": "高原荒地"
+            },

             "natural/glacier": {
                 "name": "冰川",
                 "terms": "冰川,冰河"
             "natural/glacier": {
                 "name": "冰川",
                 "terms": "冰川,冰河"


@@ -1300,6 +1786,9 @@
             "natural/peak": {
                 "name": "山頂"
             },
             "natural/peak": {
                 "name": "山頂"
             },

+            "natural/scree": {
+                "name": "碎石崖錐"
+            },

             "natural/scrub": {
                 "name": "灌木叢"
             },
             "natural/scrub": {
                 "name": "灌木叢"
             },


@@ -1307,7 +1796,7 @@
                 "name": "溫泉"
             },
             "natural/tree": {
                 "name": "溫泉"
             },
             "natural/tree": {

-                "name": "樹"
+                "name": "樹木"

             },
             "natural/water": {
                 "name": "水"
             },
             "natural/water": {
                 "name": "水"


@@ -1319,7 +1808,8 @@
                 "name": "池塘"
             },
             "natural/water/reservoir": {
                 "name": "池塘"
             },
             "natural/water/reservoir": {

-                "name": "水塘"
+                "name": "貯水庫",
+                "terms": "水塘"

             },
             "natural/wetland": {
                 "name": "濕地",
             },
             "natural/wetland": {
                 "name": "濕地",


@@ -1331,6 +1821,71 @@
             "office": {
                 "name": "辦公室"
             },
             "office": {
                 "name": "辦公室"
             },

+            "office/accountant": {
+                "name": "會計師樓"
+            },
+            "office/administrative": {
+                "name": "行政辦公室"
+            },
+            "office/architect": {
+                "name": "建築師樓"
+            },
+            "office/company": {
+                "name": "公司辦事處"
+            },
+            "office/educational_institution": {
+                "name": "教育機構"
+            },
+            "office/employment_agency": {
+                "name": "職業介紹所"
+            },
+            "office/estate_agent": {
+                "name": "地產代理"
+            },
+            "office/financial": {
+                "name": "金融機構辦公室"
+            },
+            "office/government": {
+                "name": "政府辦公室"
+            },
+            "office/insurance": {
+                "name": "保險公司辦公室"
+            },
+            "office/it": {
+                "name": "資訊科技公司辦公室"
+            },
+            "office/lawyer": {
+                "name": "律師樓",
+                "terms": "法律事務所"
+            },
+            "office/newspaper": {
+                "name": "報社",
+                "terms": "報社,報館"
+            },
+            "office/ngo": {
+                "name": "非政府機構辦公室"
+            },
+            "office/physician": {
+                "name": "醫務所"
+            },
+            "office/political_party": {
+                "name": "政黨辦公室"
+            },
+            "office/research": {
+                "name": "研究所"
+            },
+            "office/telecommunication": {
+                "name": "電訊公司辦事處"
+            },
+            "office/therapist": {
+                "name": "治療師"
+            },
+            "office/travel_agent": {
+                "name": "旅行社"
+            },
+            "piste": {
+                "name": "滑雪場"
+            },

             "place": {
                 "name": "地方"
             },
             "place": {
                 "name": "地方"
             },


@@ -1361,8 +1916,14 @@
             "power": {
                 "name": "電力設施"
             },
             "power": {
                 "name": "電力設施"
             },

+            "power/generator": {
+                "name": "發電機"
+            },

             "power/line": {
             "power/line": {

-                "name": "電線"
+                "name": "電纜"
+            },
+            "power/minor_line": {
+                "name": "次要電纜"

             },
             "power/pole": {
                 "name": "電線桿"
             },
             "power/pole": {
                 "name": "電線桿"


@@ -1376,6 +1937,12 @@
             "power/transformer": {
                 "name": "變電所"
             },
             "power/transformer": {
                 "name": "變電所"
             },

+            "public_transport/platform": {
+                "name": "站台"
+            },
+            "public_transport/stop_position": {
+                "name": "停車位置"
+            },

             "railway": {
                 "name": "鐵路"
             },
             "railway": {
                 "name": "鐵路"
             },


@@ -1385,12 +1952,21 @@
             "railway/disused": {
                 "name": "廢棄的鐵路"
             },
             "railway/disused": {
                 "name": "廢棄的鐵路"
             },

+            "railway/funicular": {
+                "name": "纜车"
+            },
+            "railway/halt": {
+                "name": "鐵路停車處"
+            },

             "railway/level_crossing": {
                 "name": "平交道"
             },
             "railway/monorail": {
                 "name": "單軌電車"
             },
             "railway/level_crossing": {
                 "name": "平交道"
             },
             "railway/monorail": {
                 "name": "單軌電車"
             },

+            "railway/narrow_gauge": {
+                "name": "窄軌鐵路"
+            },

             "railway/platform": {
                 "name": "鐵道月台"
             },
             "railway/platform": {
                 "name": "鐵道月台"
             },


@@ -1422,6 +1998,9 @@
                 "name": "酒類商店",
                 "terms": "酒店,酒莊"
             },
                 "name": "酒類商店",
                 "terms": "酒店,酒莊"
             },

+            "shop/art": {
+                "name": "藝術品店"
+            },

             "shop/bakery": {
                 "name": "麵包店"
             },
             "shop/bakery": {
                 "name": "麵包店"
             },


@@ -1435,6 +2014,9 @@
             "shop/bicycle": {
                 "name": "單車店"
             },
             "shop/bicycle": {
                 "name": "單車店"
             },

+            "shop/bookmaker": {
+                "name": "書商"
+            },

             "shop/books": {
                 "name": "書店"
             },
             "shop/books": {
                 "name": "書店"
             },


@@ -1484,7 +2066,7 @@
                 "name": "電器店"
             },
             "shop/farm": {
                 "name": "電器店"
             },
             "shop/farm": {

-                "name": "水果攤"
+                "name": "農場直賣店"

             },
             "shop/fishmonger": {
                 "name": "海產店"
             },
             "shop/fishmonger": {
                 "name": "海產店"


@@ -1522,6 +2104,12 @@
             "shop/laundry": {
                 "name": "洗衣店"
             },
             "shop/laundry": {
                 "name": "洗衣店"
             },

+            "shop/locksmith": {
+                "name": "鎖匠"
+            },
+            "shop/lottery": {
+                "name": "投注站"
+            },

             "shop/mall": {
                 "name": "商場"
             },
             "shop/mall": {
                 "name": "商場"
             },


@@ -1546,6 +2134,9 @@
             "shop/pet": {
                 "name": "寵物店"
             },
             "shop/pet": {
                 "name": "寵物店"
             },

+            "shop/photo": {
+                "name": "攝影用品店"
+            },

             "shop/shoes": {
                 "name": "鞋店"
             },
             "shop/shoes": {
                 "name": "鞋店"
             },


@@ -1657,6 +2248,9 @@
             "type/route/foot": {
                 "name": "步行路線"
             },
             "type/route/foot": {
                 "name": "步行路線"
             },

+            "type/route/hiking": {
+                "name": "遠足路線"
+            },

             "type/route/pipeline": {
                 "name": "管道路線"
             },
             "type/route/pipeline": {
                 "name": "管道路線"
             },