Update to iD v1.3.7
authorJohn Firebaugh <john.firebaugh@gmail.com>
Wed, 26 Feb 2014 00:09:18 +0000 (16:09 -0800)
committerTom Hughes <tom@compton.nu>
Wed, 26 Feb 2014 00:33:48 +0000 (00:33 +0000)
24 files changed:
vendor/assets/iD/iD.css.erb
vendor/assets/iD/iD.js
vendor/assets/iD/iD/locales/bn.json
vendor/assets/iD/iD/locales/ca.json
vendor/assets/iD/iD/locales/da.json
vendor/assets/iD/iD/locales/de.json
vendor/assets/iD/iD/locales/en-GB.json
vendor/assets/iD/iD/locales/en.json
vendor/assets/iD/iD/locales/es.json
vendor/assets/iD/iD/locales/fi.json
vendor/assets/iD/iD/locales/fr.json
vendor/assets/iD/iD/locales/hr.json
vendor/assets/iD/iD/locales/it.json
vendor/assets/iD/iD/locales/ja.json
vendor/assets/iD/iD/locales/pl.json
vendor/assets/iD/iD/locales/pt-BR.json
vendor/assets/iD/iD/locales/ru.json
vendor/assets/iD/iD/locales/sk.json
vendor/assets/iD/iD/locales/sv.json
vendor/assets/iD/iD/locales/ta.json
vendor/assets/iD/iD/locales/te.json
vendor/assets/iD/iD/locales/vi.json
vendor/assets/iD/iD/locales/zh-CN.json
vendor/assets/iD/iD/locales/zh-TW.json

index 1927b00eb83687855cddeab4a69804ab4c2ffce5..1e63410fa42fcbe2b521b052afe7ddf0380f1abf 100644 (file)
@@ -2732,14 +2732,13 @@ input[type=number] {
 
 .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-top: 0;
     border-right: 0;
     border-bottom: 0;
     border-radius: 0;
index 6a8d7a87ae3c61c118a5b2f5f0c5ba99c62ec829..c7bb962195dce765dd685e4dafbef7c4c5dbac1e 100644 (file)
@@ -16151,7 +16151,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.3.6';
+iD.version = '1.3.7';
 
 (function() {
     var detected = {};
@@ -16187,7 +16187,7 @@ iD.version = '1.3.6';
 })();
 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',
@@ -16323,7 +16323,7 @@ iD.taginfo = function() {
 };
 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';
@@ -17702,10 +17702,14 @@ iD.actions.MergePolygon = function(ids, newRelationId) {
             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({
@@ -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.multipolygon.every(function(r) { return r.isComplete(graph); }))
+            return 'incomplete_relation';
     };
 
     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 (p === 'incomplete_relation' && j && m)
+            return t('operations.merge.incomplete_relation');
+
         if (j && m && p)
             return t('operations.merge.' + j);
 
@@ -22033,7 +22042,9 @@ iD.History = function(context) {
         toJSON: function() {
             if (stack.length <= 1) return;
 
-            var allEntities = {};
+            var allEntities = {},
+                baseEntities = {},
+                base = stack[0];
 
             var s = stack.map(function(i) {
                 var modified = [], deleted = [];
@@ -22046,6 +22057,12 @@ iD.History = function(context) {
                     } 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 = {};
@@ -22059,8 +22076,9 @@ iD.History = function(context) {
             });
 
             return JSON.stringify({
-                version: 2,
+                version: 3,
                 entities: _.values(allEntities),
+                baseEntities: _.values(baseEntities),
                 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;
 
-            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);
                 });
 
+                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;
 
@@ -22151,8 +22178,6 @@ iD.History = function(context) {
 
             var json = context.storage(getKey('saved_history'));
             if (json) history.fromJSON(json);
-
-            context.storage(getKey('saved_history', null));
         },
 
         _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
-        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 = [];
 
@@ -23085,7 +23110,7 @@ iD.BackgroundSource.Bing = function(data, dispatch) {
         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) {
@@ -29384,7 +29409,6 @@ iD.ui.preset.access = function(field) {
 };
 iD.ui.preset.address = function(field, context) {
     var event = d3.dispatch('change'),
-        housename,
         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');
 
-        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'))
@@ -29510,7 +29528,6 @@ iD.ui.preset.address = function(field, context) {
 
         // Update
 
-        housename = wrap.select('.addr-housename');
         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({
-            'addr:housename': housename.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) {
-        housename.value(tags['addr:housename'] || '');
         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() {
-        housename.node().focus();
+        housenumber.node().focus();
     };
 
     return d3.rebind(address, event, 'on');
@@ -62669,7 +62684,7 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "dentist's office"
                 ],
                 "tags": {
-                    "amenity": "doctors"
+                    "amenity": "dentist"
                 },
                 "icon": "hospital",
                 "fields": [
@@ -63904,6 +63919,102 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "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": [
@@ -63916,6 +64027,54 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "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": [
@@ -63942,6 +64101,69 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "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": [
@@ -63984,6 +64206,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "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": [
@@ -64000,6 +64238,167 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "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": [
@@ -67761,6 +68160,9 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             },
             "railway/station": {
                 "icon": "rail",
+                "fields": [
+                    "building_area"
+                ],
                 "geometry": [
                     "point",
                     "vertex",
@@ -67879,6 +68281,27 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 ],
                 "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": [
@@ -67953,6 +68376,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "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": [
@@ -68472,6 +68912,23 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 },
                 "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": [
@@ -97121,7 +97578,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
             "address": {
                 "type": "address",
                 "keys": [
-                    "addr:housename",
                     "addr:housenumber",
                     "addr:street",
                     "addr:city",
@@ -97132,7 +97588,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "label": "Address",
                 "strings": {
                     "placeholders": {
-                        "housename": "Housename",
                         "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.",
-                "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",
@@ -110287,7 +110743,6 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                 "address": {
                     "label": "Address",
                     "placeholders": {
-                        "housename": "Housename",
                         "number": "123",
                         "street": "Street",
                         "city": "City",
@@ -111108,10 +111563,46 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "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/construction": {
+                    "name": "Building Under Construction",
+                    "terms": ""
+                },
+                "building/detached": {
+                    "name": "Detached Home",
+                    "terms": ""
+                },
+                "building/dormitory": {
+                    "name": "Dormitory",
+                    "terms": ""
+                },
                 "building/entrance": {
                     "name": "Entrance",
                     "terms": ""
@@ -111120,6 +111611,22 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "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": ""
@@ -111132,10 +111639,54 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Industrial Building",
                     "terms": ""
                 },
+                "building/public": {
+                    "name": "Public 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"
@@ -112112,6 +112663,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Liquor Store",
                     "terms": "alcohol"
                 },
+                "shop/art": {
+                    "name": "Art Shop",
+                    "terms": "art store,art gallery"
+                },
                 "shop/bakery": {
                     "name": "Bakery",
                     "terms": ""
@@ -112128,6 +112683,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Bicycle Shop",
                     "terms": ""
                 },
+                "shop/bookmaker": {
+                    "name": "Bookmaker",
+                    "terms": ""
+                },
                 "shop/books": {
                     "name": "Bookstore",
                     "terms": ""
@@ -112248,6 +112807,10 @@ iD.introGraph = '{"n185954700":{"id":"n185954700","loc":[-85.642244,41.939081],"
                     "name": "Locksmith",
                     "terms": "keys"
                 },
+                "shop/lottery": {
+                    "name": "Lottery Shop",
+                    "terms": ""
+                },
                 "shop/mall": {
                     "name": "Mall",
                     "terms": ""
index 1ac9f2b33270f1d264f7e81b9a29330fa24604dd..9b49520b63b32e6a480067a7811591875ce99a10 100644 (file)
@@ -17,7 +17,7 @@
         },
         "browse": {
             "title": "ঘুরে ফিরে দেখুন",
-            "description": "মানচিত্র প্যান এবং  জুম করুন "
+            "description": "মানচিত্র প্যান এবং জুম করুন।"
         },
         "draw_area": {
             "tail": "অাপনার এলাকায় নোড সংযোজন-এর জন্য ক্লিক করুন। এলাকাটি সম্পুর্ন করার জন্য প্রথম নোড-এ ক্লিক করুন।"
@@ -46,7 +46,7 @@
             "description": "এই রেখাকে প্রলম্বিত করুন.",
             "not_eligible": "কোন রেখাকে এখানে প্রলম্বিত করা যাবে না.",
             "annotation": {
-                "line": "একটি রেখাকে প্রলম্বিত করা হয়েছে",
+                "line": "একটি রেখাকে প্রলম্বিত করা হয়েছে",
                 "area": "একটি ক্ষেত্রকে বড় করা হয়েছে"
             }
         },
     },
     "redo": {
         "tooltip": "পুনরায় করুন: {action}",
-        "nothing": "পুনরায় করার কিছুই নেই."
+        "nothing": "পুনরায় করার কিছুই নেই"
     },
     "tooltip_keyhint": "শর্টকাট:",
     "browser_notice": "এই এডিটরটি ফায়ারফক্স, ক্রোম, সাফারি, অপেরা এবং ইন্টারনেট এক্সপ্লোরার ৯ এবং তার উপরে কাজ করে। দয়া করে অাপনার ব্রাউসারটিকে উন্নত করুন অথবা ম্যাপ এ পরিবর্তন করতে পটল্যাচ ২ ব্যব্হার করুন।",
index 6360dadea730d98693834aad469131a42242b9de..a95f8a84094858033dbb766dec34027fc8d51a70 100644 (file)
             "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",
             "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/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/garages": {
+                "name": "Garatges"
+            },
+            "building/greenhouse": {
+                "name": "Hivernacle"
+            },
+            "building/hospital": {
+                "name": "Edifici hospitalari"
+            },
+            "building/hotel": {
+                "name": "Edifici hoteler"
+            },
             "building/house": {
                 "name": "Casa"
             },
             "building/industrial": {
                 "name": "Edifici industrial"
             },
+            "building/public": {
+                "name": "Edifici públic"
+            },
             "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"
             },
             "shop/alcohol": {
                 "name": "Botiga de licors"
             },
+            "shop/art": {
+                "name": "Botiga d'art"
+            },
             "shop/bakery": {
                 "name": "Fleca"
             },
             "shop/bicycle": {
                 "name": "Botiga de bicicletes"
             },
+            "shop/bookmaker": {
+                "name": "Cusidor de llibres"
+            },
             "shop/books": {
                 "name": "Llibreria"
             },
             "shop/locksmith": {
                 "name": "Copisteria de claus"
             },
+            "shop/lottery": {
+                "name": "Administració de loteria"
+            },
             "shop/mall": {
                 "name": "Centre comercial"
             },
index 397c9b9e3b54210520451302c77650a5497fd4a0..1e62c8b03d88cb396003d8e4b7b9325edefca27e 100644 (file)
             "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",
                 "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/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"
                 "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"
                 "name": "Industribygning",
                 "terms": "Industribygning"
             },
+            "building/public": {
+                "name": "Offentlig bygning",
+                "terms": "Offentlig bygning"
+            },
             "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"
                 "name": "Vinforhandler",
                 "terms": "Vinforhandler, Vinbutik, Vinforretning"
             },
+            "shop/art": {
+                "name": "Kunstbutik",
+                "terms": "Kunstbutik, Kunstforretning"
+            },
             "shop/bakery": {
                 "name": "Bager",
                 "terms": "Bager, Bageri"
                 "name": "Cykelbutik",
                 "terms": "Cykelforretning, Cykelbutik"
             },
+            "shop/bookmaker": {
+                "name": "Bookmaker",
+                "terms": "Bookmaker"
+            },
             "shop/books": {
                 "name": "Boghandler",
                 "terms": "Boghandler"
                 "name": "Låsesmed",
                 "terms": "Låsesmed"
             },
+            "shop/lottery": {
+                "name": "Lotteributik",
+                "terms": "Lotteributik, Lotteriforretning"
+            },
             "shop/mall": {
                 "name": "Indkøbscenter",
                 "terms": "Indkøbscenter"
index a20ecaa5e12aa49dfa4aa9f89b467b1f1692ea80..0556e801ac8783bfdf7691fdbf1184a0af66a900 100644 (file)
             "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",
     },
     "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",
             "address": {
                 "label": "Adresse",
                 "placeholders": {
-                    "housename": "Hausname",
+                    "housename": "postalischer Hausname",
                     "number": "123",
                     "street": "Straße",
                     "city": "Stadt",
                 "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": "Bar"
             },
             "amenity/bench": {
-                "name": "Bank",
+                "name": "Sitzbank",
                 "terms": "Bank, Sitzbank"
             },
             "amenity/bicycle_parking": {
                 "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/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"
                 "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"
                 "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/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"
             },
             "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",
                 "name": "Spirituosenladen",
                 "terms": "Alkohol"
             },
+            "shop/art": {
+                "name": "Kunsthandlung",
+                "terms": "Kunsthandlung, Kunstladen"
+            },
             "shop/bakery": {
                 "name": "Bäckerei",
                 "terms": "Bäckerei"
                 "name": "Fahrradladen",
                 "terms": "Fahrradladen, Fahrradgeschäft, Fahrrad-Geschäft, Fahrrad-Handlung"
             },
+            "shop/bookmaker": {
+                "name": "Buchmacher",
+                "terms": "Buchmacher"
+            },
             "shop/books": {
                 "name": "Buchhandlung",
                 "terms": "Buchhandlung, Buchladen"
                 "name": "Schlosser",
                 "terms": "Schlosser, Schlüsseldienst"
             },
+            "shop/lottery": {
+                "name": "Lottoannahmestelle",
+                "terms": "Lottoannahmestelle"
+            },
             "shop/mall": {
                 "name": "Einkaufzentrum",
                 "terms": "Einkaufszentrum, Mall"
index f8db4d76e7389b06c7e5f8b09c0f9f68a803ab49..ef23eab654674a905c2e7748ad160697d510d102 100644 (file)
             "amenity/theatre": {
                 "name": "Theatre"
             },
+            "building/static_caravan": {
+                "name": "Static Caravan"
+            },
+            "building/terrace": {
+                "name": "Terraced houses"
+            },
             "leisure/sports_center": {
                 "name": "Sports Centre"
             },
index 5a7bf2306d89b4c68b223849c9a79e2fa5460ab8..1b40481ad320d9c016eab66e977b1edb943cbd98 100644 (file)
             "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",
                 "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/construction": {
+                "name": "Building Under Construction",
+                "terms": ""
+            },
+            "building/detached": {
+                "name": "Detached Home",
+                "terms": ""
+            },
+            "building/dormitory": {
+                "name": "Dormitory",
+                "terms": ""
+            },
             "building/entrance": {
                 "name": "Entrance",
                 "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": ""
                 "name": "Industrial Building",
                 "terms": ""
             },
+            "building/public": {
+                "name": "Public 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"
                 "name": "Liquor Store",
                 "terms": "alcohol"
             },
+            "shop/art": {
+                "name": "Art Shop",
+                "terms": "art store,art gallery"
+            },
             "shop/bakery": {
                 "name": "Bakery",
                 "terms": ""
                 "name": "Bicycle Shop",
                 "terms": ""
             },
+            "shop/bookmaker": {
+                "name": "Bookmaker",
+                "terms": ""
+            },
             "shop/books": {
                 "name": "Bookstore",
                 "terms": ""
                 "name": "Locksmith",
                 "terms": "keys"
             },
+            "shop/lottery": {
+                "name": "Lottery Shop",
+                "terms": ""
+            },
             "shop/mall": {
                 "name": "Mall",
                 "terms": ""
index 666f75cd79215b89b563a236a03fb5f31e4b6006..6689264bf59229ad924c278f42083ed86d6e9865 100644 (file)
             "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",
                 "placeholder": "1, 2, 3..."
             },
             "aerialway/occupancy": {
+                "label": "Ocupación",
                 "placeholder": "2, 4, 8..."
             },
             "aeroway": {
             "building_area": {
                 "label": "Edificio"
             },
+            "cans": {
+                "label": "Acepta envases"
+            },
             "capacity": {
                 "label": "Capacidad",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "En sentido antihorario"
                 }
             },
+            "clothes": {
+                "label": "Acepta ropas"
+            },
             "collection_times": {
                 "label": "Horario de recogida"
             },
             "description": {
                 "label": "Descripción"
             },
+            "electrified": {
+                "label": "Electrificación"
+            },
             "elevation": {
                 "label": "Altura"
             },
                 "placeholder": "+31 42 123 4567"
             },
             "fee": {
-                "label": "Tarifa"
+                "label": "Couta"
             },
             "fire_hydrant/type": {
                 "label": "Tipo"
             "fixme": {
                 "label": "Arreglame"
             },
+            "gauge": {
+                "label": "Gálibo"
+            },
             "generator/method": {
                 "label": "Método"
             },
             "generator/type": {
                 "label": "Tipo"
             },
+            "glass": {
+                "label": "Acepta vidrio"
+            },
             "golf_hole": {
                 "label": "Referencia",
                 "placeholder": "Número de hoyo (1-18)"
             "operator": {
                 "label": "Operador"
             },
+            "paper": {
+                "label": "Acepta papel"
+            },
             "par": {
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
             "shop": {
                 "label": "Tipo"
             },
+            "social_facility_for": {
+                "placeholder": "Personas sin hogar, discapacitados, niños, etc"
+            },
             "source": {
                 "label": "Fuente"
             },
             "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": {
-                "name": "Góndola"
+                "name": "Góndola",
+                "terms": "Telecabina"
+            },
+            "aerialway/magic_carpet": {
+                "name": "Alfombra mágica"
+            },
+            "aerialway/pylon": {
+                "name": "Pilona"
             },
             "aeroway": {
                 "name": "Aerovía",
                 "terms": "cinematógrafo,cine"
             },
             "amenity/clinic": {
-                "name": "Clínica"
+                "name": "Clínica",
+                "terms": "clínica, centro médico, hospital"
             },
             "amenity/clock": {
                 "name": "Reloj"
                 "terms": "tribunal, magistratura, judicatura, audiencia,justicia"
             },
             "amenity/dentist": {
-                "name": "Dentista"
+                "name": "Dentista",
+                "terms": "dentista, odontólogo"
             },
             "amenity/doctor": {
-                "name": "Médico"
+                "name": "Médico",
+                "terms": "médico, doctor, facultativo, medicina, curador"
             },
             "amenity/drinking_water": {
                 "name": "Agua potable",
                 "terms": "gasolinera,surtidor, estación de servicio"
             },
             "amenity/grave_yard": {
-                "name": "Camposanto",
+                "name": "Cementerio",
                 "terms": "cementerio,camposanto, necrópolis, sacramental"
             },
             "amenity/hospital": {
                 "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",
                 "terms": "Teatro"
             },
             "amenity/toilets": {
-                "name": "Baños",
+                "name": "Aseos",
                 "terms": "baños, baño, aseo, letrina, lavabo, servicio, tocador, ducha"
             },
             "amenity/townhall": {
                 "name": "Máquina expendedora"
             },
             "amenity/veterinary": {
-                "name": "Veterinario"
+                "name": "Veterinario",
+                "terms": "veterinario, albéitar, mascotas, animales"
             },
             "amenity/waste_basket": {
                 "name": "Papelera",
                 "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/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"
                 "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"
                 "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/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/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/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/optician": {
+                "name": "Óptico",
+                "terms": "óptico, óptica, gafas"
+            },
+            "craft/painter": {
+                "name": "Pintor, albañil"
+            },
             "craft/photographer": {
-                "name": "Fotógrafo"
+                "name": "Fotógrafo",
+                "terms": "fotógrafo, retratista"
             },
             "craft/photographic_labratory": {
                 "name": "Laboratorio fotográfico"
             },
+            "craft/plasterer": {
+                "name": "Yesero",
+                "terms": "yeso, albañil, obra"
+            },
             "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": {
+                "name": "Velero",
                 "terms": "Fabricante de velas"
             },
+            "craft/sawmill": {
+                "name": "Aserradero"
+            },
+            "craft/scaffolder": {
+                "name": "Andamiaje"
+            },
             "craft/sculpter": {
+                "name": "Escultor",
                 "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/watchmaker": {
+                "name": "Relojero"
+            },
+            "craft/window_construction": {
+                "name": "Construcción de ventanas"
+            },
             "embankment": {
                 "name": "Terraplén"
             },
                 "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",
                 "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",
                 "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": {
-                "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",
                 "terms": "Granja"
             },
             "landuse/farmland": {
-                "name": "Tierra de labranza"
+                "name": "Tierra de labranza",
+                "terms": "granja, tierra de cultivo"
             },
             "landuse/farmyard": {
                 "name": "Tierras de cultivo",
                 "terms": "Aerodromo, Aeropuerto, Pista"
             },
             "military/barracks": {
-                "name": "Cuartel"
+                "name": "Cuartel",
+                "terms": "cuartel, barracones, acantonamiento, acuartelamiento, campamento"
             },
             "military/bunker": {
-                "name": "Búnker"
+                "name": "Búnker",
+                "terms": "búnker, refugio subterráneo"
+            },
+            "military/range": {
+                "name": "Rango militar"
             },
             "natural": {
                 "name": "Natural",
                 "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",
                 "name": "Plataforma"
             },
             "public_transport/stop_position": {
-                "name": "Punto de parada"
+                "name": "Punto de parada",
+                "terms": "punto de detención, stop, parada"
             },
             "railway": {
                 "name": "Ferrocarril",
                 "name": "Monorraíl ",
                 "terms": "Monorail"
             },
+            "railway/narrow_gauge": {
+                "name": "Carril de vía estrecha"
+            },
             "railway/platform": {
                 "name": "Andén",
                 "terms": "Andén de ferrocarril"
                 "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"
                 "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/locksmith": {
                 "name": "Cerrajero"
             },
+            "shop/lottery": {
+                "name": "Administración de loterías"
+            },
             "shop/mall": {
                 "name": "Centro comercial",
                 "terms": "mall,centro comercial,plaza comercial"
                 "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",
-                "terms": "hostal,hotel,pensión"
+                "terms": "hostal, hotel, pensión, alojamiento, albergue, hostería"
             },
             "tourism/hotel": {
                 "name": "Hotel",
-                "terms": "hotel,hostal,pensión"
+                "terms": "hotel, hostal, pensión, alojamiento"
             },
             "tourism/information": {
                 "name": "Información",
             },
             "tourism/motel": {
                 "name": "Motel",
-                "terms": "hostal,hotel.motel,pensión"
+                "terms": "hostal, hotel, motel, pensión, alojamiento"
             },
             "tourism/museum": {
                 "name": "Museo",
                 "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": {
-                "name": "Vista panorámica"
+                "name": "Vista panorámica",
+                "terms": "oteadero, punto de vista, mirador, vistas"
             },
             "tourism/zoo": {
                 "name": "Zoo",
                 "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": {
-                "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": {
-                "name": "Ruta de Ferry"
+                "name": "Ruta de Ferry",
+                "terms": "ruta, itinerario, rumbo, dirección, trayecto, ferry, transbordador"
             },
             "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": {
-                "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"
                 "name": "Ruta maestra"
             },
             "vertex": {
-                "name": "Otro"
+                "name": "Otro",
+                "terms": "diferente, distinto, ajeno, otro"
             },
             "waterway": {
                 "name": "Vía fluvial",
index c41a6934634af730b7b05b7332ef564d6848e224..b3930bd81adb27e8fc504fee5e5abbe154c15c6e 100644 (file)
                 "label": "Vaunun matkustajamäärä",
                 "placeholder": "2, 4, 8..."
             },
+            "aerialway/summer/access": {
+                "label": "Käyttöoikeus kesällä"
+            },
             "aeroway": {
                 "label": "Tyyppi"
             },
             "building_area": {
                 "label": "Rakennus"
             },
+            "cans": {
+                "label": "Tölkinkeräys"
+            },
             "capacity": {
                 "label": "Paikkamäärä",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "Vastapäivään"
                 }
             },
+            "clothes": {
+                "label": "Vaatekeräys"
+            },
             "collection_times": {
                 "label": "Tyhjennysaika"
             },
             "country": {
                 "label": "Maa"
             },
+            "covered": {
+                "label": "Katos"
+            },
             "crossing": {
                 "label": "Tyyppi"
             },
             "generator/type": {
                 "label": "Tyyppi"
             },
+            "glass": {
+                "label": "Lasinkeräys"
+            },
             "highway": {
                 "label": "Tyyppi"
             },
                 "label": "ICAO"
             },
             "incline": {
-                "label": "Kallista"
+                "label": "Kaltevuus"
             },
             "internet_access": {
                 "label": "Internet-yhteys",
             "operator": {
                 "label": "Toimija"
             },
+            "paper": {
+                "label": "Paperinkeräys"
+            },
             "park_ride": {
                 "label": "Autoparkki"
             },
                 "label": "Tyyppi"
             },
             "sac_scale": {
-                "label": "Polun haastavuus"
+                "label": "Haastavuus"
             },
             "service": {
                 "label": "Tyyppi"
                 "label": "Tyyppi"
             },
             "trail_visibility": {
-                "label": "Polun näkyvyys"
+                "label": "Näkyvyys"
             },
             "tunnel": {
                 "label": "Tunneli"
             "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"
             },
             },
             "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"
index 9eddaeed243d48bfa9c83175d419d0f307bfffc0..f78780555fa80d756589dd869fc7150e973ef458 100644 (file)
     },
     "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",
                 "label": "Accès"
             },
             "aerialway/capacity": {
-                "label": "Capacité (par heure)"
+                "label": "Capacité (par heure)",
+                "placeholder": "500, 2500, 5000..."
             },
             "aerialway/duration": {
                 "label": "Durée (minutes)",
             "aerialway/heating": {
                 "label": "Chauffé"
             },
+            "aerialway/occupancy": {
+                "label": "Nombre de places",
+                "placeholder": "2, 4, 8..."
+            },
             "aerialway/summer/access": {
                 "label": "Accès (été)"
             },
             "piste/difficulty": {
                 "label": "Difficulté"
             },
+            "piste/grooming": {
+                "label": "Damage"
+            },
             "piste/type": {
                 "label": "Type"
             },
                     "cutting": "Tranchée"
                 }
             },
+            "studio_type": {
+                "label": "Type"
+            },
             "supervised": {
                 "label": "Supervisé"
             },
                 "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/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"
                 "name": "Abri",
                 "terms": "Abri"
             },
+            "amenity/studio": {
+                "name": "Studio"
+            },
             "amenity/swimming_pool": {
                 "name": "Piscine",
                 "terms": "Piscine"
                 "terms": "Machine distributrice"
             },
             "amenity/veterinary": {
+                "name": "Vétérinaire",
                 "terms": "Vétérinaire"
             },
             "amenity/waste_basket": {
                 "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"
                 "name": "Garage",
                 "terms": "Garage"
             },
+            "building/greenhouse": {
+                "name": "Serre"
+            },
+            "building/hotel": {
+                "name": "Hôtel"
+            },
             "building/house": {
                 "name": "Maison",
                 "terms": "Maison"
                 "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/school": {
+                "name": "Bâtiment d'enseignement"
+            },
+            "building/stable": {
+                "name": "Étable"
+            },
+            "building/train_station": {
+                "name": "Gare ferroviaire"
+            },
+            "building/university": {
+                "name": "Université"
+            },
             "craft/blacksmith": {
                 "name": "Forgeron"
             },
                 "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"
                 "name": "Agence de voyage",
                 "terms": "Agence de voyage"
             },
+            "piste": {
+                "name": "Piste de ski"
+            },
             "place": {
                 "name": "Toponymie",
                 "terms": "Lieu"
                 "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"
index edda10936af88db6ba701e461e2035d09eb7c4c4..a0afa93b3d356069690aaa90e6245d5ae98e1e63 100644 (file)
             "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",
index 56cf0d3ad8f71a0e7528effc24b3d55cd667cc3b..6a5724b43ead872ac2e0f4e9cd131eab4a4824af 100644 (file)
             "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",
                 "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/construction": {
+                "name": "Edificio in costruzione",
+                "terms": "cantiere,struttura,in costruzione"
+            },
+            "building/dormitory": {
+                "name": "Dormitorio",
+                "terms": "dormitorio,struttura sociale"
+            },
             "building/entrance": {
                 "name": "Entrata",
                 "terms": "Entrata"
                 "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"
                 "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/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"
                 "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"
                 "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"
                 "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 "
index ab22789df770e1137dc3a8403de4fbbab96d6003..d958b69686575e4c5d3c48280622e4319a919b2d 100644 (file)
             "annotation": "{n} 本のラインを結合",
             "not_eligible": "地物情報がマージできません",
             "not_adjacent": "ラインをマージするには、ラインが結合している必要があります。",
-            "restriction": "\"{relation}\" リレーションに所属しているラインが含まれているため、マージすることができません。"
+            "restriction": "\"{relation}\" リレーションに所属しているラインが含まれているため、マージすることができません。",
+            "incomplete_relation": "地物全体がダウンロードされていないため、マージさせることができません。"
         },
         "move": {
             "title": "移動",
                 "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/construction": {
+                "name": "建設中の建物",
+                "terms": "建設中の建物"
+            },
+            "building/detached": {
+                "name": "一戸建て住宅",
+                "terms": "一戸建て住宅"
+            },
+            "building/dormitory": {
+                "name": "寮",
+                "terms": "寮"
+            },
             "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": {
-                "name": "住宅",
-                "terms": "住宅"
+                "name": "連結住宅",
+                "terms": "連結住宅"
             },
             "building/hut": {
                 "name": "小屋",
                 "name": "工場",
                 "terms": "工場"
             },
+            "building/public": {
+                "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": "かご,籠"
                 "name": "酒店",
                 "terms": "酒店, 酒屋"
             },
+            "shop/art": {
+                "name": "美術工芸品店",
+                "terms": "美術工芸品店, 美術品店, アートショップ,工芸品店"
+            },
             "shop/bakery": {
                 "name": "パン屋",
                 "terms": "パン屋, ベーカリー"
                 "name": "自転車店",
                 "terms": "自転車店"
             },
+            "shop/bookmaker": {
+                "name": "公営競技投票券売り場",
+                "terms": "公営競技投票券売り場, 馬券売り場, 車券売り場, 舟券売り場"
+            },
             "shop/books": {
                 "name": "書店",
                 "terms": "書店, 本屋"
                 "name": "錠前屋",
                 "terms": "錠前屋"
             },
+            "shop/lottery": {
+                "name": "宝くじ売り場",
+                "terms": "宝くじ売り場"
+            },
             "shop/mall": {
                 "name": "ショッピングセンター",
                 "terms": "ショッピングセンター, ショッピングモール, 複合商業施設"
index 3457f0ba5bc794c2e4c95e355be1249f1f0d8fa4..60ca34b48edf5a076b70f0f69451607d30b95dc8 100644 (file)
             "category-building": {
                 "name": "Budynek"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Zagospodarowanie terenu"
             },
             "building_area": {
                 "label": "Budynek"
             },
+            "cans": {
+                "label": "Przyjmowanie puszek"
+            },
             "capacity": {
                 "label": "Pojemność",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "Przeciwnie do wskazówek zegara"
                 }
             },
+            "clothes": {
+                "label": "Przyjmowanie ciuchów"
+            },
             "collection_times": {
                 "label": "Czas zbierania"
             },
             "generator/type": {
                 "label": "Typ"
             },
+            "glass": {
+                "label": "Przyjmowanie szkła"
+            },
             "highway": {
                 "label": "Typ"
             },
             "shelter": {
                 "label": "Schronienie"
             },
+            "shelter_type": {
+                "label": "Typ"
+            },
             "shop": {
                 "label": "Typ"
             },
             "tree_type": {
                 "label": "Typ"
             },
+            "tunnel": {
+                "label": "Tunel"
+            },
             "vending": {
                 "label": "Rodzaje towarów"
             },
                 "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"
                 "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/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"
                 "name": "Automat sprzedający",
                 "terms": "automat do sprzedaży"
             },
+            "amenity/veterinary": {
+                "name": "Weterynarz"
+            },
             "amenity/waste_basket": {
                 "name": "Kosz na śmieci",
                 "terms": "kosz,kubeł,śmietnik"
                 "name": "Apartamenty",
                 "terms": "blok,kamienica"
             },
+            "building/church": {
+                "name": "Kościół"
+            },
             "building/commercial": {
                 "name": "Nieruchomość komercyjna",
                 "terms": "sklep,komercyjny,sprzedaż,handlowy"
                 "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"
                 "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/service/parking_aisle": {
                 "name": "Uliczka parkingowa"
             },
+            "highway/services": {
+                "name": "Obszar usługowy"
+            },
             "highway/steps": {
                 "name": "Schody",
                 "terms": "schody"
             "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": {
+                "name": "Partia polityczna",
                 "terms": "partia polityczna"
             },
+            "office/therapist": {
+                "name": "Terapeuta"
+            },
             "office/travel_agent": {
                 "name": "Biuro podróży"
             },
             "power/transformer": {
                 "name": "Transformator"
             },
+            "public_transport/stop_position": {
+                "name": "Miejsce zatrzymania"
+            },
             "railway": {
                 "name": "Kolej",
                 "terms": "torowisko, kolej"
                 "name": "Sklep rowerowy",
                 "terms": "sklep rowerowy"
             },
+            "shop/bookmaker": {
+                "name": "Bukmacher"
+            },
             "shop/books": {
                 "name": "Księgarnia",
                 "terms": "księgarnia"
             "shop/locksmith": {
                 "name": "Ślusarz"
             },
+            "shop/lottery": {
+                "name": "Kolektura"
+            },
             "shop/mall": {
                 "name": "Centrum handlowe"
             },
index c13273ca931230681d4f348e5b1c4f0f284dbf70..fdde3d88d9297d1b0a7e0f1c9f8e833d9d44a4de 100644 (file)
             "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",
     },
     "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",
             "category-building": {
                 "name": "Prédio"
             },
+            "category-golf": {
+                "name": "Golfe"
+            },
             "category-landuse": {
                 "name": "Uso da Terra"
             },
                         "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": {
             "address": {
                 "label": "Endereço",
                 "placeholders": {
-                    "housename": "Nome da Casa",
+                    "housename": "Complemento",
                     "number": "123",
                     "street": "Rua",
-                    "city": "Cidade",
+                    "city": "Município",
                     "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"
             },
             "building_area": {
                 "label": "Edifício"
             },
+            "cans": {
+                "label": "Aceita Cans"
+            },
             "capacity": {
                 "label": "Capacidade",
                 "placeholder": "50, 100, 200..."
                     "anticlockwise": "Sentido Anti-horário"
                 }
             },
+            "clothes": {
+                "label": "Aceita Clothes"
+            },
             "collection_times": {
                 "label": "Horários de Coleta"
             },
             "country": {
                 "label": "País"
             },
+            "covered": {
+                "label": "Coberto"
+            },
             "crossing": {
                 "label": "Tipo"
             },
                 "label": "Descrição"
             },
             "elevation": {
-                "label": "Elevação"
+                "label": "Altitude"
             },
             "emergency": {
                 "label": "Emergência"
             "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"
             },
                 "label": "Código ICAO"
             },
             "incline": {
-                "label": "Aclive"
+                "label": "Declividade"
+            },
+            "information": {
+                "label": "Tipo"
             },
             "internet_access": {
                 "label": "Acesso a Internet",
                 "label": "Tipo"
             },
             "levels": {
-                "label": "Níveis",
+                "label": "Número de andares",
                 "placeholder": "2, 4, 6..."
             },
             "lit": {
             "operator": {
                 "label": "Operador"
             },
+            "paper": {
+                "label": "Aceita Papel"
+            },
+            "par": {
+                "label": "par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Estacionamento de Intercâmbio"
             },
                 "label": "Telefone",
                 "placeholder": "+55 11 0982 1098"
             },
+            "piste/difficulty": {
+                "label": "Dificuldade"
+            },
+            "piste/type": {
+                "label": "Modelo"
+            },
             "place": {
                 "label": "Tipo"
             },
                 "label": "Tipo"
             },
             "shelter": {
-                "label": "Abrigo"
+                "label": "Abrigo contra Intempéries"
             },
             "shelter_type": {
                 "label": "Tipo"
                 "options": {
                     "bridge": "Ponte",
                     "tunnel": "Túnel",
-                    "embankment": "Aterro",
+                    "embankment": "Aterro Elevado",
                     "cutting": "Escavação"
                 }
             },
                 "terms": "Hangar"
             },
             "aeroway/helipad": {
-                "name": "Heliporto",
+                "name": "Heliponto",
                 "terms": "Heliporto, Heliponto, ponto de pouso de helicópteros"
             },
             "aeroway/runway": {
                 "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",
                 "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": {
-                "name": "Banco",
+                "name": "Agência bancária",
                 "terms": "Banco"
             },
             "amenity/bar": {
                 "name": "Tribunal",
                 "terms": "Tribunal, Fórum"
             },
+            "amenity/dentist": {
+                "name": "Dentista"
+            },
             "amenity/drinking_water": {
                 "name": "Água Potável",
                 "terms": "Água Potável, Bebedouro"
                 "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": "Chafariz, Fonte Aquática"
             },
             "amenity/fuel": {
-                "name": "Posto de Gasolina",
+                "name": "Posto de Combustível",
                 "terms": "Posto de Gasolina"
             },
             "amenity/grave_yard": {
                 "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": {
                 "name": "Estação de Patrulha",
                 "terms": "Patrulha, Ranger"
             },
+            "amenity/recycling": {
+                "name": "Reciclagem"
+            },
             "amenity/restaurant": {
                 "name": "Restaurante",
                 "terms": "Restaurante"
                 "terms": "Ponto de Táxi"
             },
             "amenity/telephone": {
-                "name": "Telefone",
+                "name": "Telefone Público",
                 "terms": "Telefone"
             },
             "amenity/theatre": {
                 "terms": "Teatro"
             },
             "amenity/toilets": {
-                "name": "Banheiros",
+                "name": "Banheiros Públicos",
                 "terms": "Banheiros, Sanitário, WC, Toiletes, Toilettes, Lavabo, Toalete"
             },
             "amenity/townhall": {
-                "name": "Prefeitura",
+                "name": "Paço Municipal",
                 "terms": "Prefeitura"
             },
             "amenity/university": {
                 "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": "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",
                 "terms": "Cerca viva"
             },
             "barrier/kissing_gate": {
-                "name": "Porteira Giratória",
+                "name": "Kissing Gate",
                 "terms": "Porteira Giratória"
             },
             "barrier/lift_gate": {
-                "name": "Cancela",
+                "name": "Cancela Elevatória",
                 "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": {
-                "name": "Passagem Fixa por Barreira",
+                "name": "Travessia em Cerca/Muro",
                 "terms": "Passagem Fixa por Barreira"
             },
             "barrier/toll_booth": {
-                "name": "Pedágio",
+                "name": "Cabine de Pedágio",
                 "terms": "Pedágio"
             },
             "barrier/wall": {
                 "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"
                 "terms": "Entrada"
             },
             "building/garage": {
-                "name": "Garagem",
+                "name": "Garagem Individual",
                 "terms": "Garagem"
             },
+            "building/garages": {
+                "name": "Garagens",
+                "terms": "Garagens"
+            },
             "building/house": {
                 "name": "Casa",
                 "terms": "Casa"
                 "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": {
-                "name": "Aterro",
+                "name": "Aterro Elevado",
                 "terms": "aterro,terrapleno"
             },
             "emergency/ambulance_station": {
                 "terms": "Entrada"
             },
             "footway/crossing": {
-                "name": "Cruzamento",
-                "terms": "cruzamento,passagem"
+                "name": "Travessia",
+                "terms": "faixa de segurança,cruzamento,passagem"
             },
             "footway/sidewalk": {
                 "name": "Calçada",
                 "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": {
-                "name": "Cruzamento",
-                "terms": "Travessia, Faixa de Segurança"
+                "name": "Faixa de Pedestre",
+                "terms": "Interseção"
             },
             "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": {
-                "name": "Rua Viva",
+                "name": "Via de Espaço Compartilhado",
                 "terms": "Rua Viva, Rua Preferencial a Pedestres"
             },
             "highway/mini_roundabout": {
                 "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": {
-                "name": "Acesso a Autoestrada",
+                "name": "Ligação de Autoestrada",
                 "terms": "Acesso a Autoestrada"
             },
             "highway/path": {
-                "name": "Caminho",
+                "name": "Trilha Não-Automotiva",
                 "terms": "Trilha"
             },
             "highway/pedestrian": {
                 "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",
                 "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",
                 "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",
                 "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": {
-                "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",
                 "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": {
-                "name": "Rotatória",
+                "name": "Balão de Retorno",
                 "terms": "Balão de Retorno"
             },
             "highway/unclassified": {
             },
             "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": {
-                "name": "Ermida",
-                "terms": "Ermida"
+                "name": "Capelinha de Beira de Estrada",
+                "terms": "Ermida, Alminhas"
             },
             "landuse": {
                 "name": "Uso da Terra",
                 "terms": "Bacia"
             },
             "landuse/cemetery": {
-                "name": "Cemitério",
+                "name": "Cemitério Secular",
                 "terms": "Sepulcrário, Cemitério"
             },
             "landuse/commercial": {
                 "terms": "Construção"
             },
             "landuse/farm": {
-                "name": "Fazenda",
+                "name": "Lavoura",
                 "terms": "Fazenda"
             },
             "landuse/farmland": {
                 "terms": "agricultura,terra,campo,roça"
             },
             "landuse/farmyard": {
-                "name": "Granja",
+                "name": "Pátio de Fazenda",
                 "terms": "Pátio de Fazenda"
             },
             "landuse/forest": {
             },
             "landuse/meadow": {
                 "name": "Prado",
-                "terms": "Prado, Pasto"
+                "terms": "Prado, Pasto, Pradaria"
             },
             "landuse/orchard": {
                 "name": "Pomar",
                 "terms": "Residencial"
             },
             "landuse/retail": {
-                "name": "Comércio",
-                "terms": "Varejo"
+                "name": "Varejo",
+                "terms": "Varejo, comércio"
             },
             "landuse/vineyard": {
-                "name": "Vinhedo",
+                "name": "Vinha",
                 "terms": "Vinha, Vinhedo"
             },
             "leisure": {
                 "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",
                 "terms": "Marina"
             },
             "leisure/park": {
-                "name": "Parque",
-                "terms": "Parque"
+                "name": "Parque/Praça",
+                "terms": "Parque, praça"
             },
             "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",
                 "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",
                 "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",
                 "terms": "aterro,terrapleno"
             },
             "man_made/flagpole": {
-                "name": "Mastro",
+                "name": "Mastro de Bandeira",
                 "terms": "matro,bandeira,pau de bandeira"
             },
             "man_made/lighthouse": {
                 "terms": "Píer"
             },
             "man_made/pipeline": {
-                "name": "Encanamento",
-                "terms": "Tubulação"
+                "name": "Tubulação",
+                "terms": "Encanamento"
             },
             "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",
                 "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": "Orla Marítima, Linha Costeira"
             },
             "natural/fell": {
-                "name": "Colina",
-                "terms": "Caiu"
+                "name": "Fell"
             },
             "natural/glacier": {
                 "name": "Geleira",
                 "terms": "Pradaria"
             },
             "natural/heath": {
-                "name": "Matagal",
-                "terms": "Matagal"
+                "name": "Urzal",
+                "terms": "Urzal"
             },
             "natural/peak": {
-                "name": "Pico",
+                "name": "Cume",
                 "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",
-                "terms": "Moita, Arbusto"
+                "terms": "Moita, Arbusto, Matagal"
             },
             "natural/spring": {
                 "name": "Nascente",
                 "terms": "advogado,advocacia,escritório"
             },
             "office/newspaper": {
-                "name": "Jornal",
+                "name": "Escritório de Jornal",
                 "terms": "jornal,notícia"
             },
             "office/ngo": {
                 "terms": "Local"
             },
             "place/city": {
-                "name": "Cidade",
-                "terms": "Cidade"
+                "name": "Cidade Maior",
+                "terms": "Cidade, Município"
             },
             "place/hamlet": {
                 "name": "Lugarejo",
                 "terms": "Localidade"
             },
             "place/town": {
-                "name": "Vila",
-                "terms": "Vila, Cidade"
+                "name": "Cidade Menor",
+                "terms": "Vila, Cidade, Município"
             },
             "place/village": {
                 "name": "Povoado",
                 "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": "Menor Linha de Energia"
             },
             "power/pole": {
-                "name": "Poste Elétrico",
+                "name": "Poste de Transmissão",
                 "terms": "Poste Elétrico"
             },
             "power/sub_station": {
                 "terms": "Ferrovia Abandonada"
             },
             "railway/disused": {
-                "name": "Ferrovia em Desuso",
+                "name": "Ferrovia Inativa",
                 "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",
                 "terms": "Plataforma de Trem"
             },
             "railway/rail": {
-                "name": "Trilho",
+                "name": "Trilho de trem",
                 "terms": "Trilho"
             },
             "railway/station": {
                 "terms": "Estação Ferroviária"
             },
             "railway/subway": {
-                "name": "Metrô",
+                "name": "Trilho de metrô",
                 "terms": "Metrô"
             },
             "railway/subway_entrance": {
                 "terms": "Entrada de Metrô"
             },
             "railway/tram": {
-                "name": "Bonde",
+                "name": "Trilho de bonde",
                 "terms": "Bonde"
             },
             "relation": {
                 "terms": "Relação"
             },
             "route/ferry": {
-                "name": "Rota de Barco",
+                "name": "Rota de Balsa",
                 "terms": "Rota de Barco, Rota de Balsa"
             },
             "shop": {
                 "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": "Loja de Peças Automotivas"
             },
             "shop/car_repair": {
-                "name": "Oficina Automotiva",
+                "name": "Oficina Mecânica",
                 "terms": "Oficina Automotiva"
             },
             "shop/chemist": {
                 "terms": "Delicatessen"
             },
             "shop/department_store": {
-                "name": "Loja de Departamentos",
+                "name": "Loja de Departamento",
                 "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": {
-                "name": "Limpeza a Seco",
+                "name": "Lavagem de Roupas a Seco",
                 "terms": "Limpeza a Seco, Lavagem a Seco"
             },
             "shop/electronics": {
                 "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 Presentes"
             },
             "shop/greengrocer": {
-                "name": "Quitanda",
-                "terms": "Quitanda"
+                "name": "Verdureiro",
+                "terms": "Quitanda, Quitandeiro"
             },
             "shop/hairdresser": {
                 "name": "Cabeleireiro",
                 "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": {
-                "name": "Quiosque",
+                "name": "Quiosque Comercial",
                 "terms": "Quiosque"
             },
             "shop/laundry": {
                 "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": {
-                "name": "Concessionária de Motos",
+                "name": "Revenda de Motos",
                 "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",
                 "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 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": {
-                "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",
                 "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",
                 "terms": "Guesthouse"
             },
             "tourism/hostel": {
-                "name": "Albergue",
-                "terms": "Albergue, Hostel"
+                "name": "Hostel",
+                "terms": "Albergue"
             },
             "tourism/hotel": {
                 "name": "Hotel",
-                "terms": "Hotel, Pousada"
+                "terms": "Hotel, Pousada, Motel"
             },
             "tourism/information": {
                 "name": "Informações Turísticas",
                 "terms": "Museu"
             },
             "tourism/picnic_site": {
-                "name": "Lugar de Piquenique",
+                "name": "Local de Piquenique",
                 "terms": "Lugar de Piquenique"
             },
             "tourism/theme_park": {
                 "terms": "Outro"
             },
             "waterway": {
-                "name": "Hidrovia",
+                "name": "Via Aquática",
                 "terms": "Canal, Hidrovia, Curso d'Água"
             },
             "waterway/canal": {
                 "terms": "Canal"
             },
             "waterway/dam": {
-                "name": "Represa",
-                "terms": "Represa, Barragem"
+                "name": "Barragem",
+                "terms": "Represa"
             },
             "waterway/ditch": {
                 "name": "Vala",
                 "terms": "Vala"
             },
             "waterway/drain": {
-                "name": "Dreno",
+                "name": "Valeta de drenagem",
                 "terms": "Dreno"
             },
             "waterway/river": {
index 2040d731b2b7160109ceb8b423af44c892b19096..53a6e44c243d66fb390cec6ca75ddb456454d7ab 100644 (file)
             "annotation": "Объединены {n} линий.",
             "not_eligible": "Эти объекты нельзя склеить.",
             "not_adjacent": "Эти линии не склеить, потому что они не соединены.",
-            "restriction": "Эти линии не склеить, потому что как минимум одна из них находится в отношении \"{relation}\""
+            "restriction": "Эти линии не склеить, потому что как минимум одна из них находится в отношении \"{relation}\"",
+            "incomplete_relation": "Эти объекты нельзя объединить, потому что как минимум один из них не был загружен целиком."
         },
         "move": {
             "title": "Сместить",
                 "terms": "Паб"
             },
             "amenity/recycling": {
-                "name": "Переработка мусора"
+                "name": "Переработка мусора",
+                "terms": "Переработка мусора, Мусоропереработка, Утилизация мусора, Переработка отходов, Утилизация отходов"
             },
             "amenity/restaurant": {
                 "name": "Ресторан",
                 "terms": "Школа, лицей, гимназия"
             },
             "amenity/shelter": {
-                "name": "Укрытие"
+                "name": "Укрытие",
+                "terms": "Укрытие, Навес, Защита от непогоды"
+            },
+            "amenity/social_facility": {
+                "name": "Социальное учреждение"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Ночлежка для бездомных"
             },
             "amenity/studio": {
                 "name": "Студия"
                 "terms": "препятствие, преграда, барьер, заграждение"
             },
             "barrier/block": {
-                "name": "Бетонный блок"
+                "name": "Бетонный блок",
+                "terms": "Блок, преграда"
             },
             "barrier/bollard": {
-                "name": "Столбики"
+                "name": "Столбики",
+                "terms": "Столб, столбик, преграда"
             },
             "barrier/cattle_grid": {
-                "name": "Сетка для животных"
+                "name": "Сетка для животных",
+                "terms": "Сетка для животных, Препятствие для животных"
             },
             "barrier/city_wall": {
                 "name": "Городская стена",
                 "terms": "Городская стена"
             },
             "barrier/cycle_barrier": {
-                "name": "Барьер для велосипедистов"
+                "name": "Барьер для велосипедистов",
+                "terms": "Барьер для велосипедистов, Велосипедное препятствие"
             },
             "barrier/ditch": {
                 "name": "Траншея",
                 "terms": "Живая изгородь, Зелёное ограждение"
             },
             "barrier/kissing_gate": {
-                "name": "Преграда для животных"
+                "name": "Преграда для животных",
+                "terms": "Ворота с защитой от животных, Преграда для животных"
             },
             "barrier/lift_gate": {
                 "name": "Шлагбаум",
                 "terms": "шлагбаум"
             },
             "barrier/retaining_wall": {
-                "name": "Укрепляющая стена"
+                "name": "Укрепляющая стена",
+                "terms": "Подпорная стена"
             },
             "barrier/stile": {
-                "name": "Турникет"
+                "name": "Турникет",
+                "terms": "Турникет"
             },
             "barrier/toll_booth": {
-                "name": "Пункт оплаты проезда"
+                "name": "Пункт оплаты проезда",
+                "terms": "Пункт оплаты проезда, Касса, Пропускной пункт"
             },
             "barrier/wall": {
                 "name": "Стена",
                 "name": "Многоквартирный дом",
                 "terms": "многоэтажка, высотка"
             },
+            "building/bunker": {
+                "name": "Бункер"
+            },
+            "building/cathedral": {
+                "name": "Собор",
+                "terms": "Собор, Храм"
+            },
+            "building/chapel": {
+                "name": "Капелла"
+            },
+            "building/church": {
+                "name": "Церковь, Храм",
+                "terms": "Церковь, Храм"
+            },
             "building/commercial": {
                 "name": "Деловое здание",
                 "terms": "Деловое здание, Коммерческое здание, Деловая недвижимость"
             },
+            "building/construction": {
+                "name": "Строящееся здание"
+            },
+            "building/detached": {
+                "name": "Отдельностоящий частный жилой дом"
+            },
+            "building/dormitory": {
+                "name": "Общежитие"
+            },
             "building/entrance": {
                 "name": "Вход",
                 "terms": "вход, дверь, главный вход"
                 "name": "Гараж",
                 "terms": "гараж, ракушка"
             },
+            "building/garages": {
+                "name": "Гаражи"
+            },
+            "building/greenhouse": {
+                "name": "Теплица"
+            },
+            "building/hospital": {
+                "name": "Здание больницы"
+            },
+            "building/hotel": {
+                "name": "Здание гостиницы"
+            },
             "building/house": {
                 "name": "Дом",
                 "terms": "дом, частный дом, изба, хата"
                 "name": "Промышленное здание",
                 "terms": "Промышленное здание, Производственное здание, Индустриальное здание, Цех"
             },
+            "building/public": {
+                "name": "Общественное здание, Общественный центр"
+            },
             "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": "корзинщик"
                 "terms": "вход, дверь, главный вход"
             },
             "footway/crossing": {
-                "name": "Пешеходный переход"
+                "name": "Пешеходный переход",
+                "terms": "Пешеходный переход"
             },
             "footway/sidewalk": {
-                "name": "Тротуар с дорогой"
+                "name": "Тротуар",
+                "terms": "Тротуар, Тротуарчик, Пешеходная обочина"
             },
             "golf/bunker": {
                 "name": "Бункер",
                 "terms": "Лунка для гольфа"
             },
             "golf/lateral_water_hazard": {
-                "name": "Боковая водная преграда"
+                "name": "Боковая водная преграда",
+                "terms": "Боковая водная преграда, Боковое водное препятствие"
             },
             "golf/rough": {
                 "name": "Раф",
                 "terms": "Неровная площадка, Высокая трава"
             },
+            "golf/tee": {
+                "name": "Стартовая площадка",
+                "terms": "Стартовая площадка, Стартовая зона"
+            },
             "golf/water_hazard": {
-                "name": "Водная преграда"
+                "name": "Прямая водная преграда",
+                "terms": "Водное препятствие, Водная преграда, Прямая водная преграда"
             },
             "highway": {
                 "name": "Дорога",
                 "terms": "шоссе, магистраль, автомагистраль, дорога, автодорога, трасса, путь, автострада"
             },
             "highway/bridleway": {
-                "name": "Конная тропа"
+                "name": "Конная тропа",
+                "terms": "Конная тропа, Дорога для верховой езды, Дорога для конной езды"
             },
             "highway/bus_stop": {
                 "name": "Автобусная остановка",
                 "terms": "велодорожка, велосипедная дорожка"
             },
             "highway/footway": {
-                "name": "Пешеходная дорожка"
+                "name": "Пешеходная дорожка",
+                "terms": "Пешеходная тропа, Пешая тропа"
             },
             "highway/living_street": {
-                "name": "Жилая улица"
+                "name": "Жилая улица",
+                "terms": "Жилая улица, Улица в жилой застройке, Жилая зона"
             },
             "highway/mini_roundabout": {
-                "name": "Миникруг"
+                "name": "Миникруг",
+                "terms": "Мини круговое движение, Маленький поворотный круг"
             },
             "highway/motorway": {
-                "name": "Автомагистраль"
+                "name": "Автомагистраль",
+                "terms": "Автомагистраль, Скоростная автострада, Скоростное шоссе, Автобан, Скоростная автодорога, Хайвэй, Скоростна автотрасса"
             },
             "highway/motorway_junction": {
                 "name": "Автомагистраль"
             },
             "highway/motorway_link": {
-                "name": "Съезд с автомагистрали"
+                "name": "Съезд с автомагистрали",
+                "terms": "Съезд с автомагистрали, Съезд со скоростной автострады, Съезд со скоростного шоссе, Съезд с автобана, Съезд со скоростной автодороги, Съезд с хайвэя, Съезд со скоростной автотрассы"
             },
             "highway/path": {
-                "name": "Тропа"
+                "name": "Тропа",
+                "terms": "Тропа, Тропинка, Тропка"
             },
             "highway/pedestrian": {
-                "name": "Пешеходная дорога"
+                "name": "Пешеходная дорога",
+                "terms": "Пешеходная улица"
             },
             "highway/primary": {
                 "name": "Дорога регионального значения",
                 "name": "Съезд с дороги регионального значения"
             },
             "highway/residential": {
-                "name": "Улица"
+                "name": "Улица",
+                "terms": "Улица, Жилая улица"
             },
             "highway/road": {
                 "name": "Дорога неизвестного класса",
                 "name": "Съезд с важной дороги"
             },
             "highway/service": {
-                "name": "Проезд"
+                "name": "Проезд",
+                "terms": "Проезд, Автопроезд"
             },
             "highway/service/alley": {
-                "name": "Аллея"
+                "name": "Служебный проезд",
+                "terms": "Служебный проезд, Сервисный проезд, Второстепенный проезд"
             },
             "highway/service/drive-through": {
-                "name": "Сервис не выходя из машины"
+                "name": "Сервис не выходя из машины",
+                "terms": "Сервис не выходя из машины, Обслуживание не выходя из машины"
             },
             "highway/service/driveway": {
-                "name": "Дорога"
+                "name": "Дорога",
+                "terms": "Подъездная дорога, Подъезд к чему-либо"
             },
             "highway/service/emergency_access": {
                 "name": "Неотложная помощь"
                 "terms": "Заезд на магистраль, Съезд с магистрали"
             },
             "highway/turning_circle": {
-                "name": "Разворот"
+                "name": "Разворот",
+                "terms": "Площадка ля разворота, Разворотный круг, Разворотный тупик"
             },
             "highway/unclassified": {
                 "name": "Обычная дорога"
             },
             "historic": {
-                "name": "Историческое место"
+                "name": "Историческое место",
+                "terms": "Археологическая площадка, Археологические раскопки"
             },
             "historic/archaeological_site": {
-                "name": "Археологические раскопки"
+                "name": "Археологические раскопки",
+                "terms": "Археологическая площадка, Археологические раскопки"
             },
             "historic/boundary_stone": {
                 "name": "Пограничный камень",
                 "terms": "межевой камень"
             },
             "historic/castle": {
-                "name": "Замок"
+                "name": "Замок",
+                "terms": "Замок, Форт, Укрепление"
             },
             "historic/memorial": {
                 "name": "Памятник, мемориал",
                 "terms": "руины, развалины"
             },
             "historic/wayside_cross": {
-                "name": "Придорожный крест"
+                "name": "Придорожный крест",
+                "terms": "Придорожный крест"
             },
             "historic/wayside_shrine": {
-                "name": "Придорожная часовня"
+                "name": "Придорожная часовня",
+                "terms": "Придорожная часовня"
             },
             "landuse": {
-                "name": "Землепользование"
+                "name": "Землепользование",
+                "terms": "Землепользование"
             },
             "landuse/allotments": {
-                "name": "Садовые участки"
+                "name": "Садовые участки",
+                "terms": "Участки садов и огородов, Сады и огороды"
             },
             "landuse/basin": {
-                "name": "Хранилище сточных вод"
+                "name": "Хранилище сточных вод",
+                "terms": "Бассейн, Искусственный водоём, Копаный пруд"
             },
             "landuse/cemetery": {
                 "name": "Кладбище",
                 "terms": "кладбище"
             },
             "landuse/commercial": {
-                "name": "Коммерческая застройка"
+                "name": "Коммерческая застройка",
+                "terms": "Коммерческое землепользование, Территории торгово-офисного назначения"
             },
             "landuse/construction": {
                 "name": "Стройплощадка",
                 "terms": "стройка, строительство"
             },
             "landuse/farm": {
-                "name": "Земельные угодья"
+                "name": "Земельные угодья",
+                "terms": "Ферма, Сельхоз предприятие"
             },
             "landuse/farmland": {
                 "name": "Сельскохозяйственные угодья"
                 "terms": "лес, лесной массив"
             },
             "landuse/grass": {
-                "name": "Трава"
+                "name": "Трава",
+                "terms": "Газон, Искусственный газон, Земля используемая под газон"
             },
             "landuse/industrial": {
-                "name": "Промышленная застройка"
+                "name": "Промышленная застройка",
+                "terms": "Промышленная территория, Производственная территория, Промышленное землепользование"
             },
             "landuse/meadow": {
                 "name": "Луг",
                 "terms": "карьер, каменоломня, открытая разработка"
             },
             "landuse/residential": {
-                "name": "Жилой квартал"
+                "name": "Жилой квартал",
+                "terms": "Жилая территория, Селитебная территория, Жилые земли, Селитебные земли"
             },
             "landuse/retail": {
                 "name": "Торговля"
                 "terms": "виноградник"
             },
             "leisure": {
-                "name": "Отдых"
+                "name": "Отдых",
+                "terms": "Территории для отдыха"
             },
             "leisure/dog_park": {
                 "name": "Площадка для Выгула Собак",
                 "terms": "Парк, Сквер"
             },
             "leisure/golf_course": {
-                "name": "Площадка для гольфа"
+                "name": "Площадка для гольфа",
+                "terms": "Поле для гольфа, Гольфполе"
             },
             "leisure/marina": {
-                "name": "Яхтклуб"
+                "name": "Яхтклуб",
+                "terms": "Марина, Стоянка для яхт"
             },
             "leisure/park": {
                 "name": "Парк",
                 "terms": "поле для американского футбола"
             },
             "leisure/pitch/baseball": {
-                "name": "Бейсбольная площадка"
+                "name": "Бейсбольная площадка",
+                "terms": "Бейсбол"
             },
             "leisure/pitch/basketball": {
                 "name": "Баскетбольная площадка",
                 "terms": "детская площадка, игровая площадка"
             },
             "leisure/slipway": {
-                "name": "Стапель"
+                "name": "Стапель",
+                "terms": "Стапель"
             },
             "leisure/sports_center": {
                 "name": "Спортивный Комплекс",
                 "terms": "Трасса для Гонок, Трек, Трасса, Автодром"
             },
             "line": {
-                "name": "Линия"
+                "name": "Линия",
+                "terms": "Линия"
             },
             "man_made": {
-                "name": "Сооружения"
+                "name": "Сооружения",
+                "terms": "рукотворное"
             },
             "man_made/breakwater": {
-                "name": "Волнорез"
+                "name": "Волнорез",
+                "terms": "Мол, Оградительное гидросооружение"
             },
             "man_made/cutline": {
                 "name": "Просека",
                 "terms": "трубопровод"
             },
             "man_made/survey_point": {
-                "name": "Тригонометрический пункт"
+                "name": "Тригонометрический пункт",
+                "terms": "Тригонометрический пункт"
             },
             "man_made/tower": {
-                "name": "Башня"
+                "name": "Башня",
+                "terms": "Башня"
             },
             "man_made/wastewater_plant": {
                 "name": "Станция водоочистки",
                 "terms": "колодец"
             },
             "man_made/water_works": {
-                "name": "Станция водоподготовки"
+                "name": "Станция водоподготовки",
+                "terms": "Водозабор"
             },
             "military/airfield": {
                 "name": "Аэродром"
             },
             "military/barracks": {
-                "name": "Бараки"
+                "name": "Бараки",
+                "terms": "Бараки, Казарма"
             },
             "military/bunker": {
-                "name": "Бункер"
+                "name": "Бункер",
+                "terms": "Бункер, Подземное убежище, Подземное укрытие"
             },
             "military/range": {
-                "name": "Военный полигон"
+                "name": "Военный полигон",
+                "terms": "Военный полигон, Стрельбище"
             },
             "natural": {
-                "name": "Природа"
+                "name": "Природа",
+                "terms": "Природные объекты"
             },
             "natural/bay": {
                 "name": "Бухта",
                 "terms": "пляж"
             },
             "natural/cliff": {
-                "name": "Скала"
+                "name": "Скала",
+                "terms": "Скала, Утёс, Шхеры"
             },
             "natural/coastline": {
                 "name": "Береговая линия",
                 "terms": "ледник"
             },
             "natural/grassland": {
-                "name": "Травяной луг"
+                "name": "Травяной луг",
+                "terms": "Травяной луг, Луговина, Лужок, Выкос, Перелесье"
             },
             "natural/heath": {
-                "name": "Поросший луг"
+                "name": "Поросший луг",
+                "terms": "Поросший луг"
             },
             "natural/peak": {
                 "name": "Вершина",
                 "name": "Осыпь"
             },
             "natural/scrub": {
-                "name": "Кустарник"
+                "name": "Кустарник",
+                "terms": "Кустарник, Кусты, Кустовник, Подлесок, Лозняк, Чапыжник"
             },
             "natural/spring": {
-                "name": "Родник"
+                "name": "Родник",
+                "terms": "Ручей, Ключ"
             },
             "natural/tree": {
                 "name": "Дерево",
                 "terms": "дерево"
             },
             "natural/water": {
-                "name": "Водоём"
+                "name": "Водоём",
+                "terms": "Вода, Водоём"
             },
             "natural/water/lake": {
                 "name": "Озеро",
                 "terms": "пруд"
             },
             "natural/water/reservoir": {
-                "name": "Водохранилище"
+                "name": "Водохранилище",
+                "terms": "Водохранилище, Рукотворное озеро, Водоместилище,"
             },
             "natural/wetland": {
                 "name": "Болото",
                 "terms": "болото, заболоченная территория"
             },
             "natural/wood": {
-                "name": "Лес"
+                "name": "Лес",
+                "terms": "Лес, Деревья, Роща, Чаща"
             },
             "office": {
-                "name": "Офисы"
+                "name": "Офисы",
+                "terms": "Офисы, Офис, Контора, Канцелярия"
             },
             "office/accountant": {
                 "name": "Бухгалтерская контора",
                 "terms": "Бюро по недвижимости, Риелтор, Риелторская фирма, Риелторская компания,"
             },
             "office/financial": {
-                "name": "Финансовая организация"
+                "name": "Финансовая организация",
+                "terms": "финансовая организация"
             },
             "office/government": {
                 "name": "Правительственное учреждение"
                 "terms": "Общественное движение, НКО, Неправительственная организация, Некоммерческая организация, Общественный фонд, Общественное учреждение,"
             },
             "office/physician": {
-                "name": "Фельдшер"
+                "name": "Фельдшер",
+                "terms": "врач"
             },
             "office/political_party": {
                 "name": "Политическая партия",
                 "terms": "Научно-исследовательская организация, Научно-исследовательский институт, Центр передовых исследований и разработки"
             },
             "office/telecommunication": {
-                "name": "Телеком"
+                "name": "Телеком",
+                "terms": "Телеком"
             },
             "office/therapist": {
                 "name": "Терапевт"
                 "name": "Турагентство",
                 "terms": "Туристическое агентство, Бюро путешествий, Турфирма, Туристическая фирма"
             },
+            "piste": {
+                "name": "Лыжная трасса"
+            },
             "place": {
-                "name": "Населённый пункт"
+                "name": "Населённый пункт",
+                "terms": "Населённый пункт, Местность"
             },
             "place/city": {
                 "name": "Большой город",
                 "terms": "город"
             },
             "place/hamlet": {
-                "name": "Малое село"
+                "name": "Малое село",
+                "terms": "Деревня"
             },
             "place/island": {
                 "name": "Остров",
                 "terms": "остров"
             },
             "place/isolated_dwelling": {
-                "name": "Изолированное жильё"
+                "name": "Изолированное жильё",
+                "terms": "Хутор, Заимка"
             },
             "place/locality": {
-                "name": "Местность"
+                "name": "Местность",
+                "terms": "Урочище, Заброшенное поселение"
             },
             "place/town": {
-                "name": "Город"
+                "name": "Город",
+                "terms": "Город"
             },
             "place/village": {
-                "name": "Деревня"
+                "name": "Деревня",
+                "terms": "Село, Станица, Поселение, Посёлок городского типа"
             },
             "point": {
                 "name": "Точка",
                 "terms": "точка"
             },
             "power": {
-                "name": "Электричество"
+                "name": "Электричество",
+                "terms": "Электроэнергетика"
             },
             "power/generator": {
                 "name": "Силовой Генератор",
                 "name": "Низковольтная ЛЭП"
             },
             "power/pole": {
-                "name": "Столб ЛЭП"
+                "name": "Столб ЛЭП",
+                "terms": "Столб линии электропередачи, Опора маломощной линии электропередачи"
             },
             "power/sub_station": {
                 "name": "Трансформаторная подстанция",
                 "terms": "подстанция"
             },
             "power/tower": {
-                "name": "Опора ЛЭП"
+                "name": "Опора ЛЭП",
+                "terms": "Опора ЛЭП, Опора линии электропередачи"
             },
             "power/transformer": {
                 "name": "Трансформатор",
                 "terms": "трансформатор"
             },
             "public_transport/platform": {
-                "name": "Платформа"
+                "name": "Платформа",
+                "terms": "Платформа, Остановка, Посадочная платформа, Место посадки и высадки пассажиров"
             },
             "public_transport/stop_position": {
                 "name": "Место остановки транспорта",
                 "terms": "железная дорога"
             },
             "railway/abandoned": {
-                "name": "Разобранная железная дорога"
+                "name": "Разобранная железная дорога",
+                "terms": "Разобранная железнодорожная ветка,"
             },
             "railway/disused": {
-                "name": "Заброшенная железная дорога"
+                "name": "Заброшенная железная дорога",
+                "terms": "Неиспользуемая железнодорожная ветка"
             },
             "railway/funicular": {
                 "name": "Фуникулёр",
                 "terms": "Железнодорожная станция, ЖД станция"
             },
             "railway/level_crossing": {
-                "name": "Переезд"
+                "name": "Переезд",
+                "terms": "Железнодорожный переезд"
             },
             "railway/monorail": {
                 "name": "Монорельс",
                 "terms": "трамвай"
             },
             "relation": {
-                "name": "Отношение"
+                "name": "Отношение",
+                "terms": "отношение"
             },
             "route/ferry": {
                 "name": "Паромный маршрут",
                 "terms": "паром, паромная переправа"
             },
             "shop": {
-                "name": "Магазин"
+                "name": "Магазин",
+                "terms": "Магазин, Торговая лавка, Точка продаж"
             },
             "shop/alcohol": {
-                "name": "Винный магазин"
+                "name": "Винный магазин",
+                "terms": "Винный магазин, Винная лавка, Вино-водочный магазин"
             },
             "shop/bakery": {
-                "name": "Хлебный"
+                "name": "Хлебный",
+                "terms": "Булочная, Хлебный магазин"
             },
             "shop/beauty": {
                 "name": "Салон красоты",
                 "terms": "салон красоты"
             },
             "shop/beverages": {
-                "name": "Магазин напитков"
+                "name": "Магазин напитков",
+                "terms": "Магазин напитков, Продажа напитков"
             },
             "shop/bicycle": {
-                "name": "Веломагазин"
+                "name": "Веломагазин",
+                "terms": "Веломагазин"
             },
             "shop/books": {
                 "name": "Книжный",
                 "terms": "книги, книжный"
             },
             "shop/boutique": {
-                "name": "Бутик"
+                "name": "Бутик",
+                "terms": "Бутик, Фирменный магазин"
             },
             "shop/butcher": {
                 "name": "Мясной",
                 "terms": "мясной, мясная лавка, мясник"
             },
             "shop/car": {
-                "name": "Автодилер"
+                "name": "Автодилер",
+                "terms": "Автомобильный салон, Диллерский автоцентр "
             },
             "shop/car_parts": {
                 "name": "Автозапчасти",
                 "terms": "автомастерская, ремонт авто, станция техобслуживания, автосервис"
             },
             "shop/chemist": {
-                "name": "Бытовая химия"
+                "name": "Бытовая химия",
+                "terms": "Бытовая химия"
             },
             "shop/clothes": {
-                "name": "Одежда"
+                "name": "Одежда",
+                "terms": "магазин одежды"
             },
             "shop/computer": {
-                "name": "Компьютерный магазин"
+                "name": "Компьютерный магазин",
+                "terms": "Компьютерный магазин"
             },
             "shop/confectionery": {
-                "name": "Кондитерская"
+                "name": "Кондитерская",
+                "terms": "Кондитерская"
             },
             "shop/convenience": {
-                "name": "Продуктовый"
+                "name": "Продуктовый",
+                "terms": "Продуктовый магазин, Магазин шаговой доступности"
             },
             "shop/deli": {
-                "name": "Кулинария"
+                "name": "Кулинария",
+                "terms": "Кулинария, Гастрономия"
             },
             "shop/department_store": {
-                "name": "Универсам"
+                "name": "Универсам",
+                "terms": "Универсам"
             },
             "shop/doityourself": {
-                "name": "Магазин \"Сделай сам\""
+                "name": "Магазин \"Сделай сам\"",
+                "terms": "Магазин \"Сделай Сам\", Всё для ремонта"
             },
             "shop/dry_cleaning": {
                 "name": "пылесосы",
                 "terms": "химчистка"
             },
             "shop/electronics": {
-                "name": "Магазин электроники"
+                "name": "Магазин электроники",
+                "terms": "Магазин электроники"
             },
             "shop/farm": {
                 "name": "Продуктовый Лоток"
             },
             "shop/fishmonger": {
-                "name": "Рыбный магазин"
+                "name": "Рыбный магазин",
+                "terms": "рыботорговец"
             },
             "shop/florist": {
-                "name": "Цветочный"
+                "name": "Цветочный",
+                "terms": "Цветочный магазин"
             },
             "shop/furniture": {
-                "name": "Мебельный"
+                "name": "Мебельный",
+                "terms": "Мебельный магазин"
             },
             "shop/garden_centre": {
-                "name": "Садовые принадлежности"
+                "name": "Садовые принадлежности",
+                "terms": "садовый центр"
             },
             "shop/gift": {
-                "name": "Подарки"
+                "name": "Подарки",
+                "terms": "Магазин подарков"
             },
             "shop/greengrocer": {
-                "name": "Овощи, фрукты"
+                "name": "Овощи, фрукты",
+                "terms": "Овощи-фрукты"
             },
             "shop/hairdresser": {
-                "name": "Парикмахерская"
+                "name": "Парикмахерская",
+                "terms": "Парикмахерская, Парикмахер, Парикмахерский салон, Стилист"
             },
             "shop/hardware": {
-                "name": "Хозяйственный магазин"
+                "name": "Хозяйственный магазин",
+                "terms": "Хозяйственный магазин, Хозмаг"
             },
             "shop/hifi": {
-                "name": "Техника Hi-fi"
+                "name": "Техника Hi-fi",
+                "terms": "Техника Hi-fi, Акустика Hi-fi"
             },
             "shop/jewelry": {
                 "name": "Ювелирный",
                 "name": "Прачечная",
                 "terms": "прачечная"
             },
+            "shop/locksmith": {
+                "name": "Изготовление ключей"
+            },
             "shop/mall": {
-                "name": "Торговый центр"
+                "name": "Торговый центр",
+                "terms": "Торговый центр, Торговый дом"
             },
             "shop/mobile_phone": {
-                "name": "Мобильные телефоны"
+                "name": "Мобильные телефоны",
+                "terms": "Салон сотовой связи, Продажа сотовых телефонов"
             },
             "shop/motorcycle": {
-                "name": "Магазин мотоциклов"
+                "name": "Магазин мотоциклов",
+                "terms": "Магазин мотоциклов, Мотодиллер"
             },
             "shop/music": {
-                "name": "Музыкальный магазин"
+                "name": "Музыкальный магазин",
+                "terms": "Музыкальный магазин, Аудио салон"
             },
             "shop/newsagent": {
-                "name": "Газеты-журналы"
+                "name": "Газеты-журналы",
+                "terms": "Газеты-журналы, Новостной киоск, Пресса, Союзпечать"
             },
             "shop/optician": {
                 "name": "Оптика",
                 "terms": "оптика, очки"
             },
             "shop/outdoor": {
-                "name": "Товары для отдыха и туризма"
+                "name": "Товары для отдыха и туризма",
+                "terms": "Товары для отдыха и туризма, Товары для кэмпинга, Туристическое снаряжение"
             },
             "shop/pet": {
                 "name": "Зоомагазин",
                 "terms": "Фототовары, Фототехника"
             },
             "shop/shoes": {
-                "name": "Обувной"
+                "name": "Обувной",
+                "terms": "Обувной магазин"
             },
             "shop/sports": {
-                "name": "Спорттовары"
+                "name": "Спорттовары",
+                "terms": "магазин спорттоваров, Спорттовары, Спортивные товары"
             },
             "shop/stationery": {
-                "name": "Канцелярский магазин"
+                "name": "Канцелярский магазин",
+                "terms": "Канцелярский магазин, Канцтовары"
             },
             "shop/supermarket": {
                 "name": "Гипермаркет",
                 "terms": "магазин игрушек"
             },
             "shop/travel_agency": {
-                "name": "Бюро путешествий"
+                "name": "Бюро путешествий",
+                "terms": "Турагенство"
             },
             "shop/tyres": {
-                "name": "Шины, покрышки"
+                "name": "Шины, покрышки",
+                "terms": "Шины, Покрышки, Автопокрышки, Автошины"
             },
             "shop/vacant": {
                 "name": "Закрытый магазин"
             },
             "shop/variety_store": {
-                "name": "Товары по одной цене"
+                "name": "Товары по одной цене",
+                "terms": "Товары по одной цене, \"Всё по одной цене\", Магазин фиксированной цены"
             },
             "shop/video": {
-                "name": "Видеомагазин"
+                "name": "Видеомагазин",
+                "terms": "Видео салон, Продажа фильмов и видеозаписей"
             },
             "tourism": {
-                "name": "Туризм"
+                "name": "Туризм",
+                "terms": "Туризм, Отдых, Путешествия"
             },
             "tourism/alpine_hut": {
                 "name": "Альпийский домик"
             },
             "tourism/artwork": {
-                "name": "Произведение искусства"
+                "name": "Произведение искусства",
+                "terms": "Произведение искусства"
             },
             "tourism/attraction": {
-                "name": "Достопримечательность"
+                "name": "Достопримечательность",
+                "terms": "Достопримечательность"
             },
             "tourism/camp_site": {
-                "name": "Кемпинг"
+                "name": "Кемпинг",
+                "terms": "лагерь, палаточный лагерь, турбаза, место для лагеря"
             },
             "tourism/caravan_site": {
                 "name": "Стоянка автодомов"
                 "name": "Сельский домик, шале"
             },
             "tourism/guest_house": {
-                "name": "Гостевой дом"
+                "name": "Гостевой дом",
+                "terms": "Гостевой дом"
             },
             "tourism/hostel": {
                 "name": "Хостел",
                 "terms": "гостиница, отель"
             },
             "tourism/information": {
-                "name": "Инфопункт"
+                "name": "Инфопункт",
+                "terms": "Инфопункт, Инфостэнд, Информационный пункт"
             },
             "tourism/motel": {
                 "name": "Мотель",
                 "terms": "музей"
             },
             "tourism/picnic_site": {
-                "name": "Место для пикника"
+                "name": "Место для пикника",
+                "terms": "Место для пикника, Поляна для пикника"
             },
             "tourism/theme_park": {
                 "name": "Парк развлечений"
                 "terms": "зоопарк"
             },
             "type/boundary": {
-                "name": "Граница"
+                "name": "Граница",
+                "terms": "Граница"
             },
             "type/boundary/administrative": {
-                "name": "Административная граница"
+                "name": "Административная граница",
+                "terms": "Административная граница"
             },
             "type/multipolygon": {
-                "name": "Многоугольник"
+                "name": "Многоугольник",
+                "terms": "Мультиполигон, Многоугольник"
             },
             "type/restriction": {
-                "name": "Ограничение"
+                "name": "Ограничение",
+                "terms": "Ограничение, Ограничение направлений движения, Ограничение манёвра"
             },
             "type/route": {
-                "name": "Маршрут"
+                "name": "Маршрут",
+                "terms": "Маршрут"
             },
             "type/route/bicycle": {
-                "name": "Велосипедный маршрут"
+                "name": "Велосипедный маршрут",
+                "terms": "Вело маршрут, Велосипедный маршрут"
             },
             "type/route/bus": {
-                "name": "Автобусный маршрут"
+                "name": "Автобусный маршрут",
+                "terms": "Автобусный маршрут"
             },
             "type/route/detour": {
                 "name": "Объезд"
                 "terms": "паром, паромная переправа"
             },
             "type/route/foot": {
-                "name": "Пешеходный маршрут"
+                "name": "Пешеходный маршрут",
+                "terms": "Пеший маршрут, Пешеходный маршрут"
             },
             "type/route/hiking": {
                 "name": "Пешеходный Маршрут"
                 "name": "Железнодорожный маршрут"
             },
             "type/route/tram": {
-                "name": "Трамвайный маршрут"
+                "name": "Трамвайный маршрут",
+                "terms": "Трамвайный маршрут"
             },
             "type/route_master": {
                 "name": "Главное Отношение Маршрута"
                 "terms": "другое"
             },
             "waterway": {
-                "name": "Водный путь"
+                "name": "Водный путь",
+                "terms": "Водоток, Водное русло"
             },
             "waterway/canal": {
                 "name": "Канал",
                 "terms": "канава, ров"
             },
             "waterway/drain": {
-                "name": "Дренажный канал"
+                "name": "Дренажный канал",
+                "terms": "Канава, Дождевая канава"
             },
             "waterway/river": {
                 "name": "Река",
                 "terms": "река"
             },
             "waterway/riverbank": {
-                "name": "Поверхность реки"
+                "name": "Поверхность реки",
+                "terms": "Урез берега реки"
             },
             "waterway/stream": {
-                "name": "Ручей"
+                "name": "Ручей",
+                "terms": "Ручей"
             },
             "waterway/weir": {
-                "name": "Плотина"
+                "name": "Плотина",
+                "terms": "Плотина, Гидроплотина"
             }
         }
     }
index 9696e7c18343a4f5f3ab7952a155f7b9ed313e72..29b8610f73c2604c089cfca2ed40388dd1b7eb3b 100644 (file)
                 "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"
index e4bd6fa495a88e258f88bd44afa833cca00a1a81..088216154313f5ab706df5e6248c3d40692ebe77 100644 (file)
             }
         },
         "continue": {
+            "key": "A",
             "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."
             "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."
-            }
+            },
+            "not_squarish": "Denna kan inte rätas upp då den inte är fyrkantig."
         },
         "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",
             "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",
         "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",
+        "none": "Ingen",
+        "node": "Nod",
         "way": "Väg",
-        "relation": "Relation"
+        "relation": "Relation",
+        "location": "Plats"
     },
     "background": {
         "title": "Bakgrund",
         "description": "Bakgrundsinställningar",
         "percent_brightness": "{opacity}% ljusstyrka",
+        "none": "Ingen",
         "custom": "Anpassa",
+        "fix_misalignment": "Justera bildplacering",
         "reset": "ta bort"
     },
     "restore": {
         "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": {
     "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": {
-        "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": {
         },
         "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.**",
             },
             "category-road": {
                 "name": "Väg"
+            },
+            "category-route": {
+                "name": "Rutt"
             }
         },
         "fields": {
             "access": {
                 "label": "Tillgång",
+                "placeholder": "Okänt",
                 "types": {
                     "access": "Generell",
                     "foot": "Fotgängare",
             "bicycle_parking": {
                 "label": "Typ"
             },
+            "boundary": {
+                "label": "Typ"
+            },
             "building": {
                 "label": "Byggnad"
             },
                 "placeholder": "50, 70, 90..."
             },
             "name": {
-                "label": "Namn"
+                "label": "Namn",
+                "placeholder": "Vanligt namn (om något)"
             },
             "natural": {
                 "label": "Natur"
             "ref": {
                 "label": "Referens"
             },
+            "relation": {
+                "label": "Typ"
+            },
             "religion": {
                 "label": "Religion",
                 "options": {
                     "taoist": "Taoism"
                 }
             },
+            "restriction": {
+                "label": "Typ"
+            },
+            "route": {
+                "label": "Typ"
+            },
+            "route_master": {
+                "label": "Typ"
+            },
             "sac_scale": {
                 "label": "Svårighetsgrad"
             },
             },
             "structure": {
                 "label": "Struktur",
+                "placeholder": "Okänt",
                 "options": {
                     "bridge": "Bro",
                     "tunnel": "Tunnel",
             }
         },
         "presets": {
+            "address": {
+                "name": "Adress",
+                "terms": "Adress, husnummer, destination, gatuadress, postnummer, postort"
+            },
             "aeroway": {
                 "name": "Flygbana"
             },
             "aeroway/aerodrome": {
-                "name": "Flygplats"
+                "name": "Flygplats",
+                "terms": "flygplats, flygfält, flyghamn, aerodrom, landningsplats, lufthamn"
             },
             "aeroway/apron": {
                 "name": "Parkering av flygplan (Apron)"
                 "name": "Bank"
             },
             "amenity/bar": {
-                "name": "Bar"
+                "name": "Bar",
+                "terms": "Bar, krog, servering, matställe, pub, cocktailsalong, saloon"
             },
             "amenity/bench": {
                 "name": "Bänk"
             "amenity/car_rental": {
                 "name": "Biluthyrning"
             },
+            "amenity/car_sharing": {
+                "name": "Bilpool"
+            },
             "amenity/car_wash": {
                 "name": "Biltvätt"
             },
             "amenity/hospital": {
                 "name": "Sjukhus"
             },
+            "amenity/kindergarten": {
+                "name": "Förskola"
+            },
             "amenity/library": {
                 "name": "Bibliotek"
             },
             "amenity/place_of_worship": {
                 "name": "Plats för tillbedjan"
             },
+            "amenity/place_of_worship/buddhist": {
+                "name": "Buddhisttempel"
+            },
             "amenity/place_of_worship/christian": {
                 "name": "Kyrka"
             },
             "amenity/swimming_pool": {
                 "name": "Simbassäng"
             },
+            "amenity/taxi": {
+                "name": "Taxihållplats"
+            },
             "amenity/telephone": {
                 "name": "Telefon"
             },
             "building/entrance": {
                 "name": "Entré"
             },
+            "building/garage": {
+                "name": "Garage"
+            },
             "building/house": {
                 "name": "Hus"
             },
+            "building/industrial": {
+                "name": "Industribyggnad"
+            },
             "building/residential": {
         &n