]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Merge remote-tracking branch 'upstream/master' into vagrant
[rails.git] / vendor / assets / iD / iD / locales / en.json
index 70c5bafd5caebb2e02a843f0bd73196399a0de19..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",
             "yes": "Yes",
             "no": "No"
         },
-        "none": "None"
+        "none": "None",
+        "node": "Node",
+        "way": "Way",
+        "relation": "Relation",
+        "location": "Location"
     },
     "background": {
         "title": "Background",
         "none": "None",
         "custom": "Custom",
         "custom_prompt": "Enter a tile template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
-        "fix_misalignment": "Fix misalignment",
+        "fix_misalignment": "Fix alignment",
         "reset": "reset"
     },
     "restore": {
         "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",
+        "untagged_tooltip": "Select a feature type that describes what this {geometry} is.",
         "deprecated_tags": "Deprecated tags: {tags}"
     },
     "zoom": {
     },
     "help": {
         "title": "Help",
-        "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/systemed/iD).\n",
+        "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
         "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a rectangle.\nThis will draw a box and select all the points within it.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n",
         "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also click the 'Move' tool or press the `M` shortcut key to move the entire road at\none time, and then click again to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n",
         "gps": "# GPS\n\nGPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright green\nline. Click on the 'Background Settings' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n",
     },
     "presets": {
         "categories": {
+            "category-building": {
+                "name": "Building"
+            },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Land Use"
             },
             "category-route": {
                 "name": "Route"
             },
-            "category-water": {
+            "category-water-area": {
+                "name": "Water"
+            },
+            "category-water-line": {
                 "name": "Water"
             }
         },
                     }
                 }
             },
-            "access_toilets": {
+            "access_simple": {
                 "label": "Access"
             },
             "address": {
             "admin_level": {
                 "label": "Admin Level"
             },
+            "aerialway": {
+                "label": "Type"
+            },
+            "aerialway/access": {
+                "label": "Access"
+            },
+            "aerialway/bubble": {
+                "label": "Bubble"
+            },
+            "aerialway/capacity": {
+                "label": "Capacity (per hour)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Duration (minutes)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Heated"
+            },
+            "aerialway/occupancy": {
+                "label": "Occupancy",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Access (summer)"
+            },
             "aeroway": {
                 "label": "Type"
             },
             "building_area": {
                 "label": "Building"
             },
-            "building_yes": {
-                "label": "Building"
+            "cans": {
+                "label": "Accepts Cans"
             },
             "capacity": {
                 "label": "Capacity",
                     "anticlockwise": "Counterclockwise"
                 }
             },
+            "clothes": {
+                "label": "Accepts Clothes"
+            },
             "collection_times": {
                 "label": "Collection Times"
             },
             "country": {
                 "label": "Country"
             },
+            "covered": {
+                "label": "Covered"
+            },
             "crossing": {
                 "label": "Type"
             },
             "description": {
                 "label": "Description"
             },
+            "electrified": {
+                "label": "Electrification"
+            },
             "elevation": {
                 "label": "Elevation"
             },
             "fixme": {
                 "label": "Fix Me"
             },
+            "gauge": {
+                "label": "Gauge"
+            },
             "generator/method": {
                 "label": "Method"
             },
             "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"
             },
             "incline": {
                 "label": "Incline"
             },
+            "information": {
+                "label": "Type"
+            },
             "internet_access": {
                 "label": "Internet Access",
                 "options": {
             "operator": {
                 "label": "Operator"
             },
+            "paper": {
+                "label": "Accepts Paper"
+            },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Park and Ride"
             },
                 "label": "Phone",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Difficulty"
+            },
+            "piste/grooming": {
+                "label": "Grooming"
+            },
+            "piste/type": {
+                "label": "Type"
+            },
             "place": {
                 "label": "Type"
             },
             "shelter": {
                 "label": "Shelter"
             },
+            "shelter_type": {
+                "label": "Type"
+            },
             "shop": {
                 "label": "Type"
             },
+            "social_facility_for": {
+                "label": "People served",
+                "placeholder": "Homeless, Disabled, Child, etc"
+            },
             "source": {
                 "label": "Source"
             },
                     "cutting": "Cutting"
                 }
             },
+            "studio_type": {
+                "label": "Type"
+            },
             "supervised": {
                 "label": "Supervised"
             },
             "trail_visibility": {
                 "label": "Trail Visibility"
             },
+            "tree_type": {
+                "label": "Type"
+            },
+            "tunnel": {
+                "label": "Tunnel"
+            },
             "vending": {
                 "label": "Type of Goods"
             },
                 "name": "Address",
                 "terms": ""
             },
+            "aerialway": {
+                "name": "Aerialway",
+                "terms": "ski lift,funifor,funitel"
+            },
+            "aerialway/cable_car": {
+                "name": "Cable Car",
+                "terms": "tramway,ropeway"
+            },
+            "aerialway/chair_lift": {
+                "name": "Chair Lift",
+                "terms": ""
+            },
+            "aerialway/gondola": {
+                "name": "Gondola",
+                "terms": ""
+            },
+            "aerialway/magic_carpet": {
+                "name": "Magic Carpet Lift",
+                "terms": ""
+            },
+            "aerialway/platter": {
+                "name": "Platter Lift",
+                "terms": "button lift,poma lift"
+            },
+            "aerialway/pylon": {
+                "name": "Aerialway Pylon",
+                "terms": ""
+            },
+            "aerialway/rope_tow": {
+                "name": "Rope Tow Lift",
+                "terms": "handle tow,bugel lift"
+            },
+            "aerialway/station": {
+                "name": "Aerialway Station",
+                "terms": ""
+            },
+            "aerialway/t-bar": {
+                "name": "T-bar Lift",
+                "terms": ""
+            },
             "aeroway": {
                 "name": "Aeroway",
                 "terms": ""
                 "name": "Cinema",
                 "terms": "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
             },
+            "amenity/clinic": {
+                "name": "Clinic",
+                "terms": "clinic,medical clinic"
+            },
+            "amenity/clock": {
+                "name": "Clock",
+                "terms": ""
+            },
             "amenity/college": {
                 "name": "College",
                 "terms": ""
                 "name": "Courthouse",
                 "terms": ""
             },
+            "amenity/dentist": {
+                "name": "Dentist",
+                "terms": "dentist,dentist's office"
+            },
+            "amenity/doctor": {
+                "name": "Doctor",
+                "terms": "doctor,doctor's office"
+            },
             "amenity/drinking_water": {
                 "name": "Drinking Water",
                 "terms": "water fountain,potable water"
                 "terms": ""
             },
             "amenity/parking": {
-                "name": "Parking",
+                "name": "Car Parking",
                 "terms": ""
             },
             "amenity/pharmacy": {
             },
             "amenity/ranger_station": {
                 "name": "Ranger Station",
-                "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office"
+                "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center"
+            },
+            "amenity/recycling": {
+                "name": "Recycling",
+                "terms": ""
             },
             "amenity/restaurant": {
                 "name": "Restaurant",
                 "name": "School",
                 "terms": "academy,alma mater,blackboard,college,department,discipline,establishment,faculty,hall,halls of ivy,institute,institution,jail*,schoolhouse,seminary,university"
             },
+            "amenity/shelter": {
+                "name": "Shelter",
+                "terms": "lean-to"
+            },
+            "amenity/social_facility": {
+                "name": "Social Facility",
+                "terms": ""
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Food Bank",
+                "terms": ""
+            },
+            "amenity/social_facility/group_home": {
+                "name": "Group Home",
+                "terms": "elderly,old,senior living"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Homeless Shelter",
+                "terms": "houseless,unhoused,displaced"
+            },
+            "amenity/studio": {
+                "name": "Studio",
+                "terms": "recording studio,studio,radio,radio studio,television,television studio"
+            },
             "amenity/swimming_pool": {
                 "name": "Swimming Pool",
                 "terms": ""
             },
             "amenity/telephone": {
                 "name": "Telephone",
-                "terms": ""
+                "terms": "phone"
             },
             "amenity/theatre": {
                 "name": "Theater",
                 "name": "Vending Machine",
                 "terms": ""
             },
+            "amenity/veterinary": {
+                "name": "Veterinary",
+                "terms": "pet clinic,veterinarian,animal hospital,pet doctor"
+            },
             "amenity/waste_basket": {
                 "name": "Waste Basket",
                 "terms": "rubbish bin,litter bin,trash can,garbage can"
                 "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"
+            },
+            "craft/beekeeper": {
+                "name": "Beekeeper",
+                "terms": "bees,beekeeper,bee box"
+            },
+            "craft/blacksmith": {
+                "name": "Blacksmith",
+                "terms": "blacksmith"
+            },
+            "craft/boatbuilder": {
+                "name": "Boat Builder",
+                "terms": "boat builder"
+            },
+            "craft/bookbinder": {
+                "name": "Bookbinder",
+                "terms": "bookbinder,book repair"
+            },
+            "craft/brewery": {
+                "name": "Brewery",
+                "terms": "brewery"
+            },
+            "craft/carpenter": {
+                "name": "Carpenter",
+                "terms": "carpenter,woodworker"
+            },
+            "craft/carpet_layer": {
+                "name": "Carpet Layer",
+                "terms": "carpet layer"
+            },
+            "craft/caterer": {
+                "name": "Caterer",
+                "terms": "Caterer,Catering"
+            },
+            "craft/clockmaker": {
+                "name": "Clockmaker",
+                "terms": "clock,clockmaker,clock repair"
+            },
+            "craft/confectionary": {
+                "name": "Confectionary",
+                "terms": "confectionary,sweets,candy"
+            },
+            "craft/dressmaker": {
+                "name": "Dressmaker",
+                "terms": "dress,dressmaker"
+            },
+            "craft/electrician": {
+                "name": "Electrician",
+                "terms": "electrician"
+            },
+            "craft/gardener": {
+                "name": "Gardener",
+                "terms": "gardener,landscaper,grounds keeper"
+            },
+            "craft/glaziery": {
+                "name": "Glaziery",
+                "terms": "glass,glass foundry,stained-glass,window"
+            },
+            "craft/handicraft": {
+                "name": "Handicraft",
+                "terms": "handicraft"
+            },
+            "craft/hvac": {
+                "name": "HVAC",
+                "terms": "heating,ventilating,air-conditioning,air conditioning"
+            },
+            "craft/insulator": {
+                "name": "Insulator",
+                "terms": "insulation,insulator"
+            },
+            "craft/jeweler": {
+                "name": "Jeweler",
+                "terms": "jeweler,gem,diamond"
+            },
+            "craft/key_cutter": {
+                "name": "Key Cutter",
+                "terms": "key,key cutter"
+            },
+            "craft/locksmith": {
+                "name": "Locksmith",
+                "terms": "locksmith,lock"
+            },
+            "craft/metal_construction": {
+                "name": "Metal Construction",
+                "terms": "metal construction"
+            },
+            "craft/optician": {
+                "name": "Optician",
+                "terms": "glasses,optician"
+            },
+            "craft/painter": {
+                "name": "Painter",
+                "terms": "painter"
+            },
+            "craft/photographer": {
+                "name": "Photographer",
+                "terms": "photographer"
+            },
+            "craft/photographic_labratory": {
+                "name": "Photographic Labratory",
+                "terms": "photographic labratory,film developer"
+            },
+            "craft/plasterer": {
+                "name": "Plasterer",
+                "terms": "plasterer"
+            },
+            "craft/plumber": {
+                "name": "Plumber",
+                "terms": "pumber"
+            },
+            "craft/pottery": {
+                "name": "Pottery",
+                "terms": "pottery,potter"
+            },
+            "craft/rigger": {
+                "name": "Rigger",
+                "terms": "rigger"
+            },
+            "craft/roofer": {
+                "name": "Roofer",
+                "terms": "roofer"
+            },
+            "craft/saddler": {
+                "name": "Saddler",
+                "terms": "saddler"
+            },
+            "craft/sailmaker": {
+                "name": "Sailmaker",
+                "terms": "sailmaker"
+            },
+            "craft/sawmill": {
+                "name": "Sawmill",
+                "terms": "sawmill,lumber"
+            },
+            "craft/scaffolder": {
+                "name": "Scaffolder",
+                "terms": "scaffolder"
+            },
+            "craft/sculpter": {
+                "name": "Sculpter",
+                "terms": "sculpter"
+            },
+            "craft/shoemaker": {
+                "name": "Shoemaker",
+                "terms": "shoe repair,shoemaker"
+            },
+            "craft/stonemason": {
+                "name": "Stonemason",
+                "terms": "stonemason,masonry"
+            },
+            "craft/sweep": {
+                "name": "Chimney Sweep",
+                "terms": "sweep,chimney sweep"
+            },
+            "craft/tailor": {
+                "name": "Tailor",
+                "terms": "tailor,clothes"
+            },
+            "craft/tiler": {
+                "name": "Tiler",
+                "terms": "tiler"
+            },
+            "craft/tinsmith": {
+                "name": "Tinsmith",
+                "terms": "tinsmith"
+            },
+            "craft/upholsterer": {
+                "name": "Upholsterer",
+                "terms": "upholsterer"
+            },
+            "craft/watchmaker": {
+                "name": "Watchmaker",
+                "terms": "watch,watchmaker,watch repair"
+            },
+            "craft/window_construction": {
+                "name": "Window Construction",
+                "terms": "window,window maker,window construction"
+            },
+            "embankment": {
+                "name": "Embankment",
+                "terms": ""
+            },
             "emergency/ambulance_station": {
                 "name": "Ambulance Station",
                 "terms": ""
                 "name": "Entrance",
                 "terms": ""
             },
+            "footway/crossing": {
+                "name": "Crossing",
+                "terms": "crosswalk,zebra crossing"
+            },
+            "footway/sidewalk": {
+                "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": ""
                 "name": "Residential Road",
                 "terms": ""
             },
+            "highway/rest_area": {
+                "name": "Rest Area",
+                "terms": "rest stop,turnout,lay-by"
+            },
             "highway/road": {
                 "name": "Unknown Road",
                 "terms": ""
                 "name": "Parking Aisle",
                 "terms": ""
             },
+            "highway/services": {
+                "name": "Service Area",
+                "terms": "services,travel plaza,service station"
+            },
             "highway/steps": {
                 "name": "Steps",
                 "terms": "stairs,staircase"
                 "name": "Farm",
                 "terms": ""
             },
+            "landuse/farmland": {
+                "name": "Farmland",
+                "terms": ""
+            },
             "landuse/farmyard": {
                 "name": "Farmyard",
                 "terms": ""
             },
             "leisure/golf_course": {
                 "name": "Golf Course",
-                "terms": ""
+                "terms": "links"
             },
             "leisure/marina": {
                 "name": "Marina",
                 "name": "Cut line",
                 "terms": ""
             },
+            "man_made/embankment": {
+                "name": "Embankment",
+                "terms": ""
+            },
+            "man_made/flagpole": {
+                "name": "Flagpole",
+                "terms": ""
+            },
             "man_made/lighthouse": {
                 "name": "Lighthouse",
                 "terms": ""
                 "name": "Water Works",
                 "terms": ""
             },
+            "military/airfield": {
+                "name": "Airfield",
+                "terms": ""
+            },
+            "military/barracks": {
+                "name": "Barracks",
+                "terms": ""
+            },
+            "military/bunker": {
+                "name": "Bunker",
+                "terms": ""
+            },
+            "military/range": {
+                "name": "Military Range",
+                "terms": ""
+            },
             "natural": {
                 "name": "Natural",
                 "terms": ""
                 "name": "Office",
                 "terms": ""
             },
+            "office/accountant": {
+                "name": "Accountant",
+                "terms": ""
+            },
+            "office/administrative": {
+                "name": "Administrative Office",
+                "terms": ""
+            },
+            "office/architect": {
+                "name": "Architect",
+                "terms": ""
+            },
+            "office/company": {
+                "name": "Company Office",
+                "terms": ""
+            },
+            "office/educational_institution": {
+                "name": "Educational Institution",
+                "terms": ""
+            },
+            "office/employment_agency": {
+                "name": "Employment Agency",
+                "terms": ""
+            },
+            "office/estate_agent": {
+                "name": "Real Estate Office",
+                "terms": ""
+            },
+            "office/financial": {
+                "name": "Financial Office",
+                "terms": ""
+            },
+            "office/government": {
+                "name": "Government Office",
+                "terms": ""
+            },
+            "office/insurance": {
+                "name": "Insurance Office",
+                "terms": ""
+            },
+            "office/it": {
+                "name": "IT Office",
+                "terms": ""
+            },
+            "office/lawyer": {
+                "name": "Law Office",
+                "terms": ""
+            },
+            "office/newspaper": {
+                "name": "Newspaper",
+                "terms": ""
+            },
+            "office/ngo": {
+                "name": "NGO Office",
+                "terms": ""
+            },
+            "office/physician": {
+                "name": "Physician",
+                "terms": ""
+            },
+            "office/political_party": {
+                "name": "Political Party",
+                "terms": ""
+            },
+            "office/research": {
+                "name": "Research Office",
+                "terms": ""
+            },
+            "office/telecommunication": {
+                "name": "Telecom Office",
+                "terms": ""
+            },
+            "office/therapist": {
+                "name": "Therapist",
+                "terms": ""
+            },
+            "office/travel_agent": {
+                "name": "Travel Agency",
+                "terms": ""
+            },
+            "piste": {
+                "name": "Piste/Ski Trail",
+                "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
+            },
             "place": {
                 "name": "Place",
                 "terms": ""
                 "name": "Power Line",
                 "terms": ""
             },
+            "power/minor_line": {
+                "name": "Minor Power Line",
+                "terms": ""
+            },
             "power/pole": {
                 "name": "Power Pole",
                 "terms": ""
                 "name": "Transformer",
                 "terms": ""
             },
+            "public_transport/platform": {
+                "name": "Platform",
+                "terms": ""
+            },
+            "public_transport/stop_position": {
+                "name": "Stop Position",
+                "terms": ""
+            },
             "railway": {
                 "name": "Railway",
                 "terms": ""
                 "name": "Disused Railway",
                 "terms": ""
             },
+            "railway/funicular": {
+                "name": "Funicular",
+                "terms": "venicular,cliff railway,cable car,cable railway,funicular railway"
+            },
             "railway/halt": {
                 "name": "Railway Halt",
                 "terms": "break,interrupt,rest,wait,interruption"
                 "name": "Monorail",
                 "terms": ""
             },
+            "railway/narrow_gauge": {
+                "name": "Narrow Gauge Rail",
+                "terms": "narrow gauge railway,narrow gauge railroad"
+            },
             "railway/platform": {
                 "name": "Railway Platform",
                 "terms": ""
             },
             "railway/station": {
                 "name": "Railway Station",
-                "terms": ""
+                "terms": "train station,station"
             },
             "railway/subway": {
                 "name": "Subway",
                 "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": ""
                 "name": "Pet Store",
                 "terms": ""
             },
+            "shop/photo": {
+                "name": "Photography Store",
+                "terms": ""
+            },
             "shop/shoes": {
                 "name": "Shoe Store",
                 "terms": ""
             },
             "tourism/camp_site": {
                 "name": "Camp Site",
-                "terms": ""
+                "terms": "camping"
             },
             "tourism/caravan_site": {
                 "name": "RV Park",