Update to iD v1.3.4

vendor/assets/iD/iD.css.erb

@@ -3659,7 +3659,6 @@ img.wiki-image {
 }
 
 .mode-save .changeset-list {
-    overflow: auto;
     border:1px solid #ccc;
     border-radius: 4px;
     background:#fff;
@@ -3904,30 +3903,39 @@ img.wiki-image {
 
 /* make tooltips in panels dark */
 .map-overlay .tooltip.top .tooltip-arrow,
-.entity-editor-pane .tooltip.top .tooltip-arrow {
+.entity-editor-pane .tooltip.top .tooltip-arrow,
+.warning-section .tooltip.top .tooltip-arrow {
     border-top-color: #000;
 }
 
 .map-overlay .tooltip.bottom .tooltip-arrow,
-.entity-editor-pane .tooltip.bottom .tooltip-arrow {
+.entity-editor-pane .tooltip.bottom .tooltip-arrow,
+.warning-section .tooltip.bottom .tooltip-arrow {
     border-bottom-color: #000;
 }
 
 .map-overlay .tooltip.left .tooltip-arrow,
-.entity-editor-pane .tooltip.left .tooltip-arrow {
+.entity-editor-pane .tooltip.left .tooltip-arrow,
+.warning-section .tooltip.left .tooltip-arrow {
     border-left-color: #000;
 }
 
 .map-overlay .tooltip.right .tooltip-arrow,
-.entity-editor-pane .tooltip.right .tooltip-arrow {
+.entity-editor-pane .tooltip.right .tooltip-arrow,
+.warning-section .tooltip.right .tooltip-arrow {
     border-right-color: #000;
 }
 
 .map-overlay .tooltip-inner,
-.entity-editor-pane .tooltip-inner {
+.entity-editor-pane .tooltip-inner,
+.warning-section .tooltip-inner {
     background: #000;
     color: #ccc;
 }
+/* commit warning tooltips need to be closer */
+.warning-section .tooltip.top {
+    margin-top: -5px;
+}
 
 /* Uncramp map-control tooltips */
 .map-control .tooltip {

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

@@ -1371,7 +1371,8 @@
                 "terms": "Bauernhof, Farm"
             },
             "landuse/farmland": {
-                "name": "Acker"
+                "name": "Acker",
+                "terms": "Acker, Ackerboden, Ackerland, landwirtschaftliche Fläche"
             },
             "landuse/farmyard": {
                 "name": "Bauernhof",
@@ -1514,7 +1515,8 @@
                 "terms": "Schneise"
             },
             "man_made/embankment": {
-                "name": "Fahrdamm"
+                "name": "Fahrdamm",
+                "terms": "Böschung, Damm, Ufer, Uferböschung"
             },
             "man_made/flagpole": {
                 "name": "Fahnenstange",
@@ -1561,7 +1563,8 @@
                 "terms": "Wasserwerk"
             },
             "military/airfield": {
-                "name": "Militärflugplatz"
+                "name": "Militärflugplatz",
+                "terms": "Flugfeld, Rollfeld, Flugplatz, Luftlandeplatz"
             },
             "military/barracks": {
                 "name": "Kaserne",

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

@@ -33,6 +33,12 @@
                 "area": "Started an area."
             }
         },
+        "cancel_draw": {
+            "annotation": "Cancelled drawing."
+        },
+        "circularize": {
+            "title": "Circularise"
+        },
         "rotate": {
             "description": "Rotate this object around its centre point."
         }
@@ -55,6 +61,9 @@
     },
     "presets": {
         "presets": {
+            "amenity/arts_centre": {
+                "name": "Arts Centre"
+            },
             "amenity/fuel": {
                 "name": "Petrol Station",
                 "terms": "gas, fuel, propane, diesel, lng, cng, biodiesel"
@@ -70,6 +79,18 @@
             "amenity/ranger_station": {
                 "name": "Warden Station"
             },
+            "amenity/theatre": {
+                "name": "Theatre"
+            },
+            "leisure/sports_center": {
+                "name": "Sports Centre"
+            },
+            "shop/garden_centre": {
+                "name": "Garden Centre"
+            },
+            "shop/jewelry": {
+                "name": "Jeweller"
+            },
             "tourism/camp_site": {
                 "terms": "camping"
             },

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

@@ -316,7 +316,8 @@
         "untagged_area": "Untagged area",
         "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
         "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
-        "deprecated_tags": "Deprecated tags: {tags}"
+        "deprecated_tags": "Deprecated tags: {tags}",
+        "untagged_tooltip": "Select a feature type that describes what this {geometry} is."
     },
     "zoom": {
         "in": "Zoom In",
@@ -395,6 +396,9 @@
             "category-building": {
                 "name": "Building"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Land Use"
             },
@@ -504,6 +508,9 @@
             "building_area": {
                 "label": "Building"
             },
+            "cans": {
+                "label": "Accepts Cans"
+            },
             "capacity": {
                 "label": "Capacity",
                 "placeholder": "50, 100, 200..."
@@ -518,6 +525,9 @@
                     "anticlockwise": "Counterclockwise"
                 }
             },
+            "clothes": {
+                "label": "Accepts Clothes"
+            },
             "collection_times": {
                 "label": "Collection Times"
             },
@@ -527,6 +537,9 @@
             "country": {
                 "label": "Country"
             },
+            "covered": {
+                "label": "Covered"
+            },
             "crossing": {
                 "label": "Type"
             },
@@ -573,6 +586,17 @@
             "generator/type": {
                 "label": "Type"
             },
+            "glass": {
+                "label": "Accepts Glass"
+            },
+            "golf_hole": {
+                "label": "Reference",
+                "placeholder": "Hole number (1-18)"
+            },
+            "handicap": {
+                "label": "Handicap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Type"
             },
@@ -588,6 +612,9 @@
             "incline": {
                 "label": "Incline"
             },
+            "information": {
+                "label": "Type"
+            },
             "internet_access": {
                 "label": "Internet Access",
                 "options": {
@@ -656,6 +683,13 @@
             "operator": {
                 "label": "Operator"
             },
+            "paper": {
+                "label": "Accepts Paper"
+            },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Park and Ride"
             },
@@ -984,6 +1018,10 @@
                 "name": "Ranger Station",
                 "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center"
             },
+            "amenity/recycling": {
+                "name": "Recycling",
+                "terms": ""
+            },
             "amenity/restaurant": {
                 "name": "Restaurant",
                 "terms": "bar,cafeteria,café,canteen,chophouse,coffee shop,diner,dining room,dive*,doughtnut shop,drive-in,eatery,eating house,eating place,fast-food place,fish and chips,greasy spoon,grill,hamburger stand,hashery,hideaway,hotdog stand,inn,joint*,luncheonette,lunchroom,night club,outlet*,pizzeria,saloon,soda fountain,watering hole"
@@ -1172,6 +1210,38 @@
                 "name": "Sidewalk",
                 "terms": ""
             },
+            "golf/bunker": {
+                "name": "Sand Trap",
+                "terms": "hazard,bunker"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": ""
+            },
+            "golf/green": {
+                "name": "Putting Green",
+                "terms": "putting green"
+            },
+            "golf/hole": {
+                "name": "Golf Hole",
+                "terms": ""
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Lateral Water Hazard",
+                "terms": ""
+            },
+            "golf/rough": {
+                "name": "Rough",
+                "terms": ""
+            },
+            "golf/tee": {
+                "name": "Tee Box",
+                "terms": "teeing ground"
+            },
+            "golf/water_hazard": {
+                "name": "Water Hazard",
+                "terms": ""
+            },
             "highway": {
                 "name": "Highway",
                 "terms": ""
@@ -1438,7 +1508,7 @@
             },
             "leisure/golf_course": {
                 "name": "Golf Course",
-                "terms": ""
+                "terms": "links"
             },
             "leisure/marina": {
                 "name": "Marina",

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

@@ -451,6 +451,9 @@
                     }
                 }
             },
+            "access_simple": {
+                "label": "Acceso"
+            },
             "address": {
                 "label": "Dirección",
                 "placeholders": {
@@ -1129,6 +1132,9 @@
                 "name": "Edificio residencial",
                 "terms": "bloque"
             },
+            "embankment": {
+                "name": "Terraplén"
+            },
             "emergency/ambulance_station": {
                 "name": "Estación de ambulancias"
             },
@@ -1354,6 +1360,9 @@
                 "name": "Granja",
                 "terms": "Granja"
             },
+            "landuse/farmland": {
+                "name": "Tierra de labranza"
+            },
             "landuse/farmyard": {
                 "name": "Tierras de cultivo",
                 "terms": "Edificios de la granja"
@@ -1492,6 +1501,12 @@
                 "name": "Cortafuegos",
                 "terms": "Corte de línea"
             },
+            "man_made/embankment": {
+                "name": "Terraplén"
+            },
+            "man_made/flagpole": {
+                "name": "Asta de bandera"
+            },
             "man_made/lighthouse": {
                 "name": "Faro",
                 "terms": "faro"
@@ -1531,6 +1546,15 @@
                 "name": "Trabajos hídricos",
                 "terms": "Depósito de agua"
             },
+            "military/airfield": {
+                "name": "Aeródromo"
+            },
+            "military/barracks": {
+                "name": "Cuartel"
+            },
+            "military/bunker": {
+                "name": "Búnker"
+            },
             "natural": {
                 "name": "Natural",
                 "terms": "natural, naturaleza"
@@ -1749,6 +1773,12 @@
                 "name": "Transformador",
                 "terms": "Transformador"
             },
+            "public_transport/platform": {
+                "name": "Plataforma"
+            },
+            "public_transport/stop_position": {
+                "name": "Punto de parada"
+            },
             "railway": {
                 "name": "Ferrocarril",
                 "terms": "ferrocarril, tren, convoy, suburbano, línea férrea, metro"

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

@@ -371,11 +371,14 @@
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Rakennus"
+            },
             "category-landuse": {
                 "name": "Maankäyttö"
             },
             "category-path": {
-                "name": "Polku"
+                "name": "Kevyenliikenteenväylä"
             },
             "category-rail": {
                 "name": "Rautatie"
@@ -385,6 +388,12 @@
             },
             "category-route": {
                 "name": "Reitti"
+            },
+            "category-water-area": {
+                "name": "Vesi"
+            },
+            "category-water-line": {
+                "name": "Vesi"
             }
         },
         "fields": {
@@ -981,7 +990,7 @@
                 "name": "Rakennus"
             },
             "building/apartments": {
-                "name": "Asunnot"
+                "name": "Kerrostalo"
             },
             "building/commercial": {
                 "name": "Kaupallinen rakennus"

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

@@ -909,6 +909,10 @@
                 "name": "Tržnica",
                 "terms": "tržnica,pijaca,pijac,pija,plac"
             },
+            "amenity/parking": {
+                "name": "Parkiralište za automobile",
+                "terms": "parkiralište,garaža,parkirno mjesto,podzemna garaža,parking"
+            },
             "amenity/pharmacy": {
                 "name": "Ljekarna",
                 "terms": "ljekarna,apoteka,farmacija"

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

@@ -451,6 +451,9 @@
                     }
                 }
             },
+            "access_simple": {
+                "label": "통행 허가 여부"
+            },
             "address": {
                 "label": "주소",
                 "placeholders": {
@@ -720,7 +723,7 @@
                 "options": {
                     "bridge": "다리",
                     "tunnel": "터널",
-                    "embankment": "제방",
+                    "embankment": "둑",
                     "cutting": "절토"
                 }
             },
@@ -1053,6 +1056,10 @@
             "building/residential": {
                 "name": "주거 건물"
             },
+            "embankment": {
+                "name": "둑",
+                "terms": "제방"
+            },
             "emergency/ambulance_station": {
                 "name": "구급차 스테이션",
                 "terms": "앰뷸런스 스테이션"
@@ -1228,6 +1235,10 @@
             "landuse/farm": {
                 "name": "농장"
             },
+            "landuse/farmland": {
+                "name": "농토",
+                "terms": "농지"
+            },
             "landuse/farmyard": {
                 "name": "농지"
             },
@@ -1335,6 +1346,13 @@
             "man_made/cutline": {
                 "name": "숲 경계선"
             },
+            "man_made/embankment": {
+                "name": "둑",
+                "terms": "제방"
+            },
+            "man_made/flagpole": {
+                "name": "깃대"
+            },
             "man_made/lighthouse": {
                 "name": "등대"
             },
@@ -1368,6 +1386,19 @@
             "man_made/water_works": {
                 "name": "물 시설"
             },
+            "military/airfield": {
+                "name": "비행장"
+            },
+            "military/barracks": {
+                "name": "막사"
+            },
+            "military/bunker": {
+                "name": "벙커"
+            },
+            "military/range": {
+                "name": "군사지",
+                "terms": "군사 지역"
+            },
             "natural": {
                 "name": "자연"
             },
@@ -1554,6 +1585,13 @@
             "power/transformer": {
                 "name": "변압 시설"
             },
+            "public_transport/platform": {
+                "name": "플랫폼"
+            },
+            "public_transport/stop_position": {
+                "name": "정지 위치",
+                "terms": "정차 위치"
+            },
             "railway": {
                 "name": "철도"
             },
@@ -1895,7 +1933,7 @@
                 "name": "개울"
             },
             "waterway/weir": {
-                "name": "둑"
+                "name": "어량"
             }
         }
     }

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

@@ -1138,6 +1138,10 @@
                 "name": "Obytná budova",
                 "terms": "obytna budova,ubytovanie,bývanie,byvanie"
             },
+            "embankment": {
+                "name": "Násyp",
+                "terms": "nasyp,hrádza,hradza,val"
+            },
             "emergency/ambulance_station": {
                 "name": "Stanovište sanitiek",
                 "terms": "stanoviste sanitiek,garaze,garáže,sanitky,sanitka,garaz,garáž"
@@ -1366,6 +1370,10 @@
                 "name": "Pestovateľská plocha",
                 "terms": "pole,farma,dobytok,polia,záhrady,zahrady,pestovatelska plocha"
             },
+            "landuse/farmland": {
+                "name": "Farma",
+                "terms": "druzstvo,družstvo,chov,výbeh,vybeh,pole,roľa,rola"
+            },
             "landuse/farmyard": {
                 "name": "Farma",
                 "terms": "pole,farma,dobytok,polia,záhrady,zahrady,pestovatelska plocha"
@@ -1506,6 +1514,14 @@
                 "name": "Lesný priesek",
                 "terms": "lesny priesek,čistina,cistina,rúbaň,ruban,rúbanisko,rubanisko,holina"
             },
+            "man_made/embankment": {
+                "name": "Násyp",
+                "terms": "nasyp,hrádza,hradza,val"
+            },
+            "man_made/flagpole": {
+                "name": "Vlajková žrď",
+                "terms": "vlajkova zrd,stožiar,stoziar,rahno"
+            },
             "man_made/lighthouse": {
                 "name": "Maják",
                 "terms": "majak,výstraha,vystraha"
@@ -1546,6 +1562,22 @@
                 "name": "Vodojem",
                 "terms": "vodáreň,vodaren,vodný zdroj,vodny zdroj,prameň,pramen"
             },
+            "military/airfield": {
+                "name": "Vojenské letisko",
+                "terms": "vojenske letisko,pristávacia plocha,pristavacia plocha"
+            },
+            "military/barracks": {
+                "name": "Kasárne",
+                "terms": "kasarne,barak,vojenská ubytovňa,vojenska ubytovna"
+            },
+            "military/bunker": {
+                "name": "Bunker",
+                "terms": "opevnenie,vojenské opevnenie,vojenske opevnenie"
+            },
+            "military/range": {
+                "name": "Vojenská strelnica",
+                "terms": "vojenska strelnica,cvičisko,cvicisko"
+            },
             "natural": {
                 "name": "Prírodné",
                 "terms": "prirodne,prirodny,príroda,priroda"
@@ -1778,6 +1810,14 @@
                 "name": "Transformátor",
                 "terms": "Rozvodna stanica,Rozvodná stanica,transformator,trasformátor"
             },
+            "public_transport/platform": {
+                "name": "Nástupište",
+                "terms": "nastupiste,zastávka,zastavka"
+            },
+            "public_transport/stop_position": {
+                "name": "Miesto zastavenia",
+                "terms": "zastávka,zastavka"
+            },
             "railway": {
                 "name": "Železnica",
                 "terms": "zeleznica,trat,trať,kolajnice,koľaje,kolaje"

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

@@ -251,7 +251,8 @@
         "unknown": "Невідомо",
         "incomplete": "<не завантажено>",
         "feature_list": "Пошук об’єктів",
-        "edit": "Властивості об’єкта"
+        "edit": "Властивості об’єкта",
+        "none": "Нічого"
     },
     "background": {
         "title": "Тло",
@@ -387,6 +388,9 @@
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Будинок"
+            },
             "category-landuse": {
                 "name": "Землекористування"
             },
@@ -401,6 +405,12 @@
             },
             "category-route": {
                 "name": "Маршрути"
+            },
+            "category-water-area": {
+                "name": "Вода"
+            },
+            "category-water-line": {
+                "name": "Вода"
             }
         },
         "fields": {
@@ -441,6 +451,9 @@
                     }
                 }
             },
+            "access_simple": {
+                "label": "Доступ"
+            },
             "address": {
                 "label": "Адреса",
                 "placeholders": {
@@ -692,6 +705,9 @@
             "shelter": {
                 "label": "Навіс"
             },
+            "shelter_type": {
+                "label": "Тип"
+            },
             "shop": {
                 "label": "Тип"
             },
@@ -732,6 +748,9 @@
             "trail_visibility": {
                 "label": "Видимість маршруту"
             },
+            "tree_type": {
+                "label": "Тип"
+            },
             "vending": {
                 "label": "Тип товарів"
             },
@@ -911,6 +930,9 @@
                 "name": "Ринок",
                 "terms": "Marketplace, hbyjr,базар,базарна площа"
             },
+            "amenity/parking": {
+                "name": "Автостоянка"
+            },
             "amenity/pharmacy": {
                 "name": "Аптека",
                 "terms": "Pharmacy, fgntrf,ліки,фармація"
@@ -963,6 +985,9 @@
                 "name": "Школа",
                 "terms": "School, irjkf,навчання,факультет"
             },
+            "amenity/shelter": {
+                "name": "Притулок"
+            },
             "amenity/swimming_pool": {
                 "name": "Басейн",
                 "terms": "Swimming Pool, fctqy"
@@ -1111,6 +1136,9 @@
                 "name": "Житлова будівля",
                 "terms": "Residential Building,bnkjdf elsdkz"
             },
+            "embankment": {
+                "name": "Насип"
+            },
             "emergency/ambulance_station": {
                 "name": "Станція швидкої медичної допомоги",
                 "terms": "Ambulance Station,cnfywsz idblrj vtlbxyj ljgjvjub, швидка допомога, перша допомога"
@@ -1127,6 +1155,12 @@
                 "name": "Вхід",
                 "terms": "Entrance,dsl,двері,ворота,вихід,фіртка"
             },
+            "footway/crossing": {
+                "name": "Перехрестя"
+            },
+            "footway/sidewalk": {
+                "name": "Тротуар"
+            },
             "highway": {
                 "name": "Дорога",
                 "terms": "Highway,ljhjuf,шлях,автомагістраль,шосе,тротуар,стежка,тропа,путівець,напрямок,проїзд"
@@ -1331,6 +1365,9 @@
                 "name": "Ферма",
                 "terms": "Farm,athvf"
             },
+            "landuse/farmland": {
+                "name": "Сільгосп. угіддя"
+            },
             "landuse/farmyard": {
                 "name": "Двір ферми",
                 "terms": "Farmyard,ldsh athvb"
@@ -1467,6 +1504,12 @@
                 "name": "Просіка",
                 "terms": "Cut line,ghjcsrf"
             },
+            "man_made/embankment": {
+                "name": "Насип"
+            },
+            "man_made/flagpole": {
+                "name": "Флагшток"
+            },
             "man_made/lighthouse": {
                 "name": "Маяк",
                 "terms": "Lighthouse,vfzr,сигнал,вогонь"
@@ -1507,6 +1550,18 @@
                 "name": "Водозабір",
                 "terms": "Water Works,djljpfsh"
             },
+            "military/airfield": {
+                "name": "Аеродром"
+            },
+            "military/barracks": {
+                "name": "Казарма"
+            },
+            "military/bunker": {
+                "name": "Бункер"
+            },
+            "military/range": {
+                "name": "Військовий полігон"
+            },
             "natural": {
                 "name": "Природа",
                 "terms": "Natural,ghbhjlf"
@@ -1615,6 +1670,12 @@
                 "name": "Агенція з нерухомості",
                 "terms": "ріелтор, Агенція з нерухомості, futywsz p ythejvjcns, Real Estate Office"
             },
+            "office/therapist": {
+                "name": "Терапевт"
+            },
+            "office/travel_agent": {
+                "name": "Туристична агенція"
+            },
             "place": {
                 "name": "Місцевість",
                 "terms": "Place,vscwtdscnm"
@@ -1683,6 +1744,12 @@
                 "name": "Трансформатор",
                 "terms": "Transformer,nhfycajhvfnjh"
             },
+            "public_transport/platform": {
+                "name": "Платформа"
+            },
+            "public_transport/stop_position": {
+                "name": "Місце зупинки"
+            },
             "railway": {
                 "name": "Залізниця",
                 "terms": "Railway,pfkspybwz"

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

@@ -260,6 +260,7 @@
         "percent_brightness": "{opacity}%不透明度",
         "none": "空",
         "custom": "自定义",
+        "custom_prompt": "输入瓦片模板。Z/X/Y方案的有效标记是{z}，{x}，{y}，quadtile方案的有效标记是{u}。",
         "fix_misalignment": "修复对齐",
         "reset": "重置"
     },
@@ -326,8 +327,10 @@
     },
     "help": {
         "title": "帮助",
-        "help": "# 帮助\n\n这是一个[OpenStreetMap](http://www.openstreetmap.org/)的编辑器。\nOpenStreetMap是自由及可编辑的世界地图。你可以用这个编辑器来添加和更新您所在区域的地图资料，令这个开源和开放资料的世界地图变得更好。\n\n您在这个地图上所做的编辑，所有使用OpenStreetMap的人将可看见。为了进行编辑，你需要一个[免费的OpenStreetMap帐户](https://www.openstreetmap.org/user/new)。\n\n这个[iD编辑器](http://ideditor.com/) 是一个合作开发的开源系统， [源码可在GitHub找到](https://github.com/systemed/iD)。\n",
+        "help": "# 帮助\n\n这是一个[OpenStreetMap](http://www.openstreetmap.org/)的编辑器。\nOpenStreetMap是自由及可编辑的世界地图。你可以用这个编辑器来添加和更新您所在区域的地图资料，令这个开源和开放的世界地图变得更好。\n\n您在这个地图上所做的编辑，所有使用OpenStreetMap的人将可看见。为了进行编辑，你需要一个[免费的OpenStreetMap帐户](https://www.openstreetmap.org/user/new)。\n\n这个[iD编辑器](http://ideditor.com/) 是一个合作开发的开源系统， [源码可在GitHub找到](https://github.com/systemed/iD)。\n",
-        "roads": "# 道路\n\n您可以利用这个编辑器创建，修复，及删除道路。道路可以有很多种：路径，公路，郊游径，单车径，和更多－ 任何经常使用的路段都可制图。\n\n### 选择道路\n\n点击图上的道路以选择该道路。道路的轮廓会以高亮度显示，而同时地图上会出现小工具选单，旁边亦会弹出面板，显示有关该道路的信息。\n\n### 编辑道路\n\n您或会经常注意到，道路并非对齐在背景中显示的卫星图像或GPS轨迹。您可以调整这些道路，让他们位于正确的位置。\n\n首先，点击您想编辑的道路。这会将道路以高亮度显示，并显示沿着这道路的节点，你可以拖曳这些节点到更好的位置。如果您想增加细节，可以为道路添加新的节点，点击两下道路上没有节点的部分，便可在该处増加节点。\n\n如果道路连接到另一条道路，但在地图上并未妥善连接，你可以拖曳道路的其中一个节点到另一条道路上，以连接两条道路。连接好道路，对地图非常重要，特别是对提供驾驶指示的应用程序而言，是必要的。\n\n您也可以点击'移动'工具或按`M`快速键，来移动整条道路，然后点击一下以完成移动的动作。\n\n### 删除道路\n\n如果一条道路完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将道路删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该道路或许只是新建的。\n\n要删除道路，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n\n### 绘制新道路\n\n发现某处应有一条道路，但地图上没有？点击编辑器左上方的'线'图标，或按下`2`快速键，以开始绘制线段。\n\n在地图上点击道路的开端，以开始绘制道路。如果道路从一条现有的道路分支出来，应点击两者连接的地方，以开始绘制。\n\n然后点击沿着道路的点，以根据卫星影像或GPS轨迹，正确地绘制道路。如果您绘制的道路如果与另一条道路交汇，请点击相交点以将它们连接起来。当您完成绘制后，可点击两下或按键盘上的'Return' 或'Enter' 键。\n"
+        "roads": "# 道路\n\n您可以利用这个编辑器创建，修复，及删除道路。道路可以有很多种：路径，公路，郊游径，单车径，和更多－ 任何经常使用的路段都可制图。\n\n### 选择道路\n\n点击图上的道路以选择该道路。道路的轮廓会以高亮度显示，而同时地图上会出现小工具选单，旁边亦会弹出面板，显示有关该道路的信息。\n\n### 编辑道路\n\n您或会经常注意到，道路并非对齐在背景中显示的卫星图像或GPS轨迹。您可以调整这些道路，让他们位于正确的位置。\n\n首先，点击您想编辑的道路。这会将道路以高亮度显示，并显示沿着这道路的节点，你可以拖曳这些节点到更好的位置。如果您想增加细节，可以为道路添加新的节点，点击两下道路上没有节点的部分，便可在该处増加节点。\n\n如果道路连接到另一条道路，但在地图上并未妥善连接，你可以拖曳道路的其中一个节点到另一条道路上，以连接两条道路。连接好道路，对地图非常重要，特别是对提供驾驶指示的应用程序而言，是必要的。\n\n您也可以点击'移动'工具或按`M`快速键，来移动整条道路，然后点击一下以完成移动的动作。\n\n### 删除道路\n\n如果一条道路完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将道路删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该道路或许只是新建的。\n\n要删除道路，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n\n### 绘制新道路\n\n发现某处应有一条道路，但地图上没有？点击编辑器左上方的'线'图标，或按下`2`快速键，以开始绘制线段。\n\n在地图上点击道路的开端，以开始绘制道路。如果道路从一条现有的道路分支出来，应点击两者连接的地方，以开始绘制。\n\n然后点击沿着道路的点，以根据卫星影像或GPS轨迹，正确地绘制道路。如果您绘制的道路如果与另一条道路交汇，请点击相交点以将它们连接起来。当您完成绘制后，可点击两下或按键盘上的'Return' 或'Enter' 键。\n",
+        "addresses": "＃地址\n\n地址是地图上的最有用的一些信息。\n\nOpenStreetMap通过沿街位置记录建筑和场所的地址，地址通常表示为街道的一部分。\n\n您可以添加地址信息映射为建筑轮廓的地方以及那些映射为单个点。地址的最佳来源数据是来自于实地调查或个人的知识与任何其他功能，从谷歌地图商业来源的复制是严格禁止的。\n",
+        "buildings": "# 建筑物\n\nOpenStreetMap 是世界上最大的建筑物的数据库。您可以建立和改善这个数据库。\n\n### 选择建筑物\n\n您可以点击建筑物的边界，以选择该建筑物。该建筑物将以高亮度显示，并会开启小工具选单，和在右边显示有关建筑物更多资料的面板。\n\n### 修改建筑物\n\n有时候，建筑物的位置或其标签或许会不正确。\n\n要移动整个建筑物的位置，先选择该建筑物，然后点击'移动'工具。移动您的滑鼠以移动筑物，在移到正确位置上点击一下。\n\n要更正建筑物的形状，点击并拖曳建筑物轮廓的节点，以移到更佳的位置。\n\n### 绘制新建筑物\n\n为地图添加建筑物的主要问题之一，是OpenStreetMap 可以用轮廓或点的形式，记录建筑物。一般来说，应_尽可能以区域记录建筑物的轮廓_，并以置于建筑轮廓内的点，记录建筑物中的公司、住宅、设施及其他东西。\n\n要开始绘制建筑物，先单击左上方的'区域'按钮，最后则按键盘上的'Return'键或点击所绘的第一个节点，完成轮廓的绘制。\n\n### 删除建筑物\n\n如果一项建筑物完全不正确－ 您看到它在卫星图像上不存在，并最好实地证实它根本不存在－ 您可以将建筑物删除，这会从地图中将之移除。删除物件时务必要小心－ 像任何其他的编辑，结果会被大家看见，而卫星图像往往会过时，因此该建筑物或许只是新建的。\n\n要删除建筑物，您可以点击它以选择，然后点击垃圾桶图标，或按'Delete' 键。\n"
     },
     "intro": {
         "navigation": {
@@ -341,6 +344,8 @@
             "title": "点",
             "add": "点可以用来表示像是商店、餐厅与古迹之类的要素，它们标示一个特定位置，并且描述那里有什么。 **点击「点」按钮以新增一点**",
             "place": "在地图上点击，可以地图上新增的一点。 **将该点放到建筑物上方**",
+            "search": "很多不同的物体可以用点来代表。您刚刚新增加的点是一间咖啡厅。**搜索'{name}'**",
+            "choose": "**从列表中选择咖啡厅。**",
             "describe": "这个点现在标示为咖啡厅，通过要素编辑器，我们可以加入更多相关信息。 **新增一个名称**",
             "close": "点选关闭按钮就可以关闭物件编辑器。 **关闭要素编辑器**",
             "reselect": "很多时候，所需的点已经存在，但有错误或不完整。我们可以编辑现有的点。 **选择您刚创建的点**",
@@ -350,15 +355,20 @@
         },
         "areas": {
             "title": "区域",
+            "add": "区域能较详细地代表物件，提供该物件的边界资料。大部份以点可以代表的物件类别，都可以用区域代表，而后者往往更为适合。 **点击「区域」按钮，以新增一个区域**",
             "corner": "通过将节点放到面的边界上，可绘制面。 **将起始节点置于游乐场的其中一角**",
+            "search": "**搜索'{name}'。**",
+            "choose": "**从列表中选择游乐场。**",
             "describe": "**添加一个名字，并关闭该要素编辑器**"
         },
         "lines": {
             "title": "线",
             "start": "**点击道路末端，以开始绘制线段。 **",
+            "road": "**从列表中选择道路**",
             "residential": "道路有不同种类，最常见的为住宅区道路。 **选择住宅区道路**",
             "describe": "**给道路命名，并关闭该要素编辑器。**",
-            "restart": "道路需要花街相交。"
+            "restart": "道路需要花街相交。",
+            "wrong_preset": "你没有选择住宅道路类型。 **点击这里重新选择**"
         },
         "startediting": {
             "title": "开始编辑",
@@ -1119,6 +1129,10 @@
                 "name": "住宅建筑物",
                 "terms": "住宅建筑物"
             },
+            "embankment": {
+                "name": "堤坝",
+                "terms": "堤,堤坝,堤岸"
+            },
             "emergency/ambulance_station": {
                 "name": "救护站",
                 "terms": "救护站"
@@ -1347,6 +1361,10 @@
                 "name": "农场",
                 "terms": "农场"
             },
+            "landuse/farmland": {
+                "name": "农田",
+                "terms": "农田,田地"
+            },
             "landuse/farmyard": {
                 "name": "农庄",
                 "terms": "农庄"
@@ -1487,6 +1505,14 @@
                 "name": "分界线",
                 "terms": "分界线"
             },
+            "man_made/embankment": {
+                "name": "堤岸",
+                "terms": "堤,堤坝,堤岸"
+            },
+            "man_made/flagpole": {
+                "name": "旗竿",
+                "terms": "旗竿"
+            },
             "man_made/lighthouse": {
                 "name": "灯塔",
                 "terms": "灯塔"
@@ -1527,6 +1553,22 @@
                 "name": "供水厂",
                 "terms": "供水厂"
             },
+            "military/airfield": {
+                "name": "机场",
+                "terms": "机场,飞机场"
+            },
+            "military/barracks": {
+                "name": "军营",
+                "terms": "军营,兵营,营房"
+            },
+            "military/bunker": {
+                "name": "地堡",
+                "terms": "地堡,暗堡"
+            },
+            "military/range": {
+                "name": "军事范围",
+                "terms": "军事范围"
+            },
             "natural": {
                 "name": "自然",
                 "terms": "自然"
@@ -1759,6 +1801,14 @@
                 "name": "变电所",
                 "terms": "变电所"
             },
+            "public_transport/platform": {
+                "name": "平台",
+                "terms": "平台"
+            },
+            "public_transport/stop_position": {
+                "name": "停止位置",
+                "terms": "停止位置"
+            },
             "railway": {
                 "name": "铁路",
                 "terms": "铁路"