]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Update to iD v1.9.7
[rails.git] / vendor / assets / iD / iD / locales / en.json
index 4d1bada0f841be1c47d71cb3ee132a06e997f2eb..0c776b4dbe7663d3737a4499b64bc3033bd6172e 100644 (file)
             "key": "D",
             "annotation": "Disconnected lines/areas.",
             "not_connected": "There aren't enough lines/areas here to disconnect.",
-            "connected_to_hidden": "This can't be disconnected because it is connected to a hidden feature."
+            "connected_to_hidden": "This can't be disconnected because it is connected to a hidden feature.",
+            "relation": "This can't be disconnected because it connects members of a relation."
         },
         "merge": {
             "title": "Merge",
-            "description": "Merge these lines.",
+            "description": "Merge these features.",
             "key": "C",
-            "annotation": "Merged {n} lines.",
+            "annotation": "Merged {n} features.",
             "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.",
+            "not_adjacent": "These features can't be merged because they aren't connected.",
+            "restriction": "These features 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.",
-            "conflicting_tags": "These lines can't be merged because some of their tags have conflicting values."
+            "conflicting_tags": "These features can't be merged because some of their tags have conflicting values."
         },
         "move": {
             "title": "Move",
         "nothing": "Nothing to redo."
     },
     "tooltip_keyhint": "Shortcut:",
-    "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
+    "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 11 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
     "translate": {
         "translate": "Translate",
         "localized_translation_label": "Multilingual name",
     },
     "commit": {
         "title": "Save Changes",
-        "description_placeholder": "Brief description of your contributions",
+        "description_placeholder": "Brief description of your contributions (required)",
         "message_label": "Changeset comment",
         "upload_explanation": "The changes you upload will be visible on all maps that use OpenStreetMap data.",
         "upload_explanation_with_user": "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.",
         "warnings": "Warnings",
         "modified": "Modified",
         "deleted": "Deleted",
-        "created": "Created"
+        "created": "Created",
+        "about_changeset_comments": "About changeset comments",
+        "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
+        "google_warning": "You mentioned Google in this comment: remember that copying from Google Maps is strictly forbidden.",
+        "google_warning_link": "http://www.openstreetmap.org/copyright"
     },
     "contributors": {
         "list": "Edits by {users}",
         "no_results_worldwide": "No results found"
     },
     "geolocate": {
-        "title": "Show My Location"
+        "title": "Show My Location",
+        "locating": "Locating, please wait..."
     },
     "inspector": {
         "no_documentation_combination": "There is no documentation available for this tag combination",
         "no_documentation_key": "There is no documentation available for this key",
         "show_more": "Show More",
         "view_on_osm": "View on openstreetmap.org",
+        "all_fields": "All fields",
         "all_tags": "All tags",
         "all_members": "All members",
         "all_relations": "All relations",
             "yes": "Yes",
             "no": "No"
         },
+        "add": "Add",
         "none": "None",
         "node": "Node",
         "way": "Way",
         "description": "Background settings",
         "percent_brightness": "{opacity}% brightness",
         "none": "None",
+        "best_imagery": "Best known imagery source for this location",
+        "switch": "Switch back to this background",
         "custom": "Custom",
         "custom_button": "Edit custom background",
         "custom_prompt": "Enter a tile URL template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
-        "fix_misalignment": "Fix alignment",
+        "fix_misalignment": "Adjust imagery offset",
+        "imagery_source_faq": "Where does this imagery come from?",
         "reset": "reset",
+        "offset": "Drag anywhere in the gray area below to adjust the imagery offset, or enter the offset values in meters.",
         "minimap": {
             "description": "Minimap",
             "tooltip": "Show a zoomed out map to help locate the area currently displayed."
             "description": "Points",
             "tooltip": "Points of Interest"
         },
-        "major_roads": {
-            "description": "Major Roads",
+        "traffic_roads": {
+            "description": "Traffic Roads",
             "tooltip": "Highways, Streets, etc."
         },
-        "minor_roads": {
-            "description": "Minor Roads",
+        "service_roads": {
+            "description": "Service Roads",
             "tooltip": "Service Roads, Parking Aisles, Tracks, etc."
         },
         "paths": {
         "facebook": "Share on Facebook",
         "twitter": "Share on Twitter",
         "google": "Share on Google+",
-        "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>details</a>).\n"
+        "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer.",
+        "help_link_text": "Details",
+        "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
     },
     "confirm": {
         "okay": "Okay",
         "zoom": "Zoom to GPX track",
         "browse": "Browse for a .gpx file"
     },
-    "mapillary": {
+    "mapillary_images": {
         "tooltip": "Street-level photos from Mapillary",
-        "title": "Photo Overlay (Mapillary)",
+        "title": "Photo Overlay (Mapillary)"
+    },
+    "mapillary_signs": {
+        "tooltip": "Traffic signs from Mapillary (must enable Photo Overlay)",
+        "title": "Traffic Sign Overlay (Mapillary)"
+    },
+    "mapillary": {
         "view_on_mapillary": "View this image on Mapillary"
     },
     "help": {
         "relations": "# Relations\n\nA relation is a special type of feature in OpenStreetMap that groups together\nother features. For example, two common types of relations are *route relations*,\nwhich group together sections of road that belong to a specific freeway or\nhighway, and *multipolygons*, which group together several lines that define\na complex area (one with several pieces or holes in it like a donut).\n\nThe group of features in a relation are called *members*. In the sidebar, you can\nsee which relations a feature is a member of, and click on a relation there\nto select the it. When the relation is selected, you can see all of its\nmembers listed in the sidebar and highlighted on the map.\n\nFor the most part, iD will take care of maintaining relations automatically\nwhile you edit. The main thing you should be aware of is that if you delete a\nsection of road to redraw it more accurately, you should make sure that the\nnew section is a member of the same relations as the original.\n\n## Editing Relations\n\nIf you want to edit relations, here are the basics.\n\nTo add a feature to a relation, select the feature, click the \"+\" button in the\n\"All relations\" section of the sidebar, and select or type the name of the relation.\n\nTo create a new relation, select the first feature that should be a member,\nclick the \"+\" button in the \"All relations\" section, and select \"New relation...\".\n\nTo remove a feature from a relation, select the feature and click the trash\nbutton next to the relation you want to remove it from.\n\nYou can create multipolygons with holes using the \"Merge\" tool. Draw two areas (inner\nand outer), hold the Shift key and click on each of them to select them both, and then\nclick the \"Merge\" (+) button.\n"
     },
     "intro": {
+        "graph": {
+            "city_hall": "Three Rivers City Hall",
+            "fire_department": "Three Rivers Fire Department",
+            "memory_isle_park": "Memory Isle Park",
+            "riverwalk_trail": "Riverwalk Trail",
+            "w_michigan_ave": "West Michigan Avenue",
+            "e_michigan_ave": "East Michigan Avenue",
+            "spring_st": "Spring Street",
+            "scidmore_park": "Scidmore Park",
+            "petting_zoo": "Scidmore Park Petting Zoo",
+            "n_andrews_st": "North Andrews Street",
+            "s_andrews_st": "South Andrews Street",
+            "n_constantine_st": "North Constantine Street",
+            "s_constantine_st": "South Constantine Street",
+            "rocky_river": "Rocky River",
+            "railroad_dr": "Railroad Drive",
+            "conrail_rr": "Conrail Railroad",
+            "st_joseph_river": "Saint Joseph River",
+            "n_main_st": "North Main Street",
+            "s_main_st": "South Main Street",
+            "water_st": "Water Street",
+            "foster_st": "Foster Street",
+            "portage_river": "Portage River",
+            "flower_st": "Flower Street",
+            "elm_st": "Elm Street",
+            "walnut_st": "Walnut Street",
+            "morris_ave": "Morris Avenue",
+            "east_st": "East Street",
+            "portage_ave": "Portage Avenue"
+        },
         "navigation": {
             "title": "Navigation",
             "drag": "The main map area shows OpenStreetMap data on top of a background. You can navigate by dragging and scrolling, just like any web map. **Drag the map!**",
             "select": "Map features are represented three ways: using points, lines or areas. All features can be selected by clicking on them. **Click on the point to select it.**",
-            "header": "The header shows us the feature type.",
-            "pane": "When a feature is selected, the feature editor is displayed. The header shows us the feature type and the main pane shows the feature's attributes, such as its name and address. **Close the feature editor with the close button in the top right.**"
+            "pane": "When a feature is selected, the feature editor is displayed. The header shows us the feature type and the main pane shows the feature's attributes, such as its name and address. **Close the feature editor by pressing the {button} button in the top right.**",
+            "search": "You can also search for features in the current view, or worldwide. **Search for '{name}'**",
+            "choose": "**Choose {name} from the list to select it.**",
+            "chosen": "Great! {name} is now selected. **Close the feature editor by pressing the {button} button.**"
         },
         "points": {
             "title": "Points",
-            "add": "Points can be used to represent features such as shops, restaurants and monuments. They mark a specific location, and describe what's there. **Click the Point button to add a new point.**",
-            "place": "The point can be placed by clicking on the map. **Place the point on top of the building.**",
+            "add": "Points can be used to represent features such as shops, restaurants, and monuments. They mark a specific location, and describe what's there. **Click the {button} Point button to add a new point.**",
+            "place": "The point can be placed by clicking on the map. **Click the map to place the new point on top of the building.**",
             "search": "There are many different features that can be represented by points. The point you just added is a Cafe. **Search for '{name}'**",
             "choose": "**Choose Cafe from the list.**",
             "describe": "The point is now marked as a cafe. Using the feature editor, we can add more information about the feature. **Add a name**",
-            "close": "The feature editor can be closed by clicking on the close button. **Close the feature editor**",
-            "reselect": "Often points will already exist, but have mistakes or be incomplete. We can edit existing points. **Select the point you just created.**",
-            "fixname": "**Change the name and close the feature editor.**",
-            "reselect_delete": "All features on the map can be deleted. **Click on the point you created.**",
-            "delete": "The menu around the point contains operations that can be performed on it, including delete. **Delete the point.**"
+            "close": "The feature editor will remember all of your changes automatically.  When you change a feature, the close button will change to a checkmark. **Click the {button} button to close the feature editor**",
+            "reselect": "Often points will already exist, but have mistakes or be incomplete. We can edit existing points. **Click to select the point you just created.**",
+            "fixname": "**Change the name, then click the {button} button to close the feature editor.**",
+            "reselect_delete": "All features on the map can be deleted. **Click to select the point you created.**",
+            "delete": "The menu around the point contains operations that can be performed on it, including delete. **Click on the {button} button to delete the point.**"
         },
         "areas": {
             "title": "Areas",
-            "add": "Areas are used to show the boundaries of features like lakes, buildings, and residential areas. They can be also be used for more detailed mapping of many features you might normally map as points. **Click the Area button to add a new area.**",
-            "corner": "Areas are drawn by placing nodes that mark the boundary of the area. **Place the starting node on one of the corners of the playground.**",
+            "add": "Areas are used to show the boundaries of features like lakes, buildings, and residential areas. They can be also be used for more detailed mapping of many features you might normally map as points. **Click the {button} Area button to add a new area.**",
+            "corner": "Areas are drawn by placing nodes that mark the boundary of the area. **Click to place a starting node on one of the corners of the playground.**",
             "place": "Draw the area by placing more nodes. Finish the area by clicking on the starting node. **Draw an area for the playground.**",
             "search": "**Search for '{name}'.**",
             "choose": "**Choose Playground from the list.**",
-            "describe": "**Add a name, and close the feature editor**"
+            "describe": "**Add a name, then click the {button} button to close the feature editor**"
         },
         "lines": {
             "title": "Lines",
-            "add": "Lines are used to represent features such as roads, railroads and rivers. **Click the Line button to add a new line.**",
+            "add": "Lines are used to represent features such as roads, railroads, and rivers. **Click the {button} Line button to add a new line.**",
             "start": "**Start the line by clicking on the end of the road.**",
-            "intersect": "Click to add more nodes to the line. You can drag the map while drawing if necessary. Roads, and many other types of lines, are part of a larger network. It is important for these lines to be connected properly in order for routing applications to work. **Click on Flower Street, to create an intersection connecting the two lines.**",
+            "intersect": "Click to add more nodes to the line. You can drag the map while drawing if necessary. Roads, and many other types of lines, are part of a larger network. It is important for these lines to be connected properly in order for routing applications to work. **Click on {name} to create an intersection connecting the two lines.**",
             "finish": "Lines can be finished by clicking on the last node again. **Finish drawing the road.**",
             "road": "**Select Road from the list**",
             "residential": "There are different types of roads, the most common of which is Residential. **Choose the Residential road type**",
-            "describe": "**Name the road and close the feature editor.**",
-            "restart": "The road needs to intersect Flower Street.",
+            "describe": "**Name the road, then click the {button} button to close the feature editor.**",
+            "restart": "The road needs to intersect {name}.",
             "wrong_preset": "You didn't select the Residential road type. **Click here to choose again**"
         },
         "startediting": {
             "title": "Start Editing",
-            "help": "More documentation and this walkthrough are available here.",
+            "help": "You can replay this walkthrough or view more documentation by clicking the {button} Help button.",
             "save": "Don't forget to regularly save your changes!",
             "start": "Start mapping!"
         }
     },
     "presets": {
         "categories": {
+            "category-barrier": {
+                "name": "Barrier Features"
+            },
             "category-building": {
-                "name": "Building"
+                "name": "Building Features"
             },
             "category-golf": {
-                "name": "Golf"
+                "name": "Golf Features"
             },
             "category-landuse": {
-                "name": "Land Use"
+                "name": "Land Use Features"
             },
             "category-path": {
-                "name": "Path"
+                "name": "Path Features"
             },
             "category-rail": {
-                "name": "Rail"
+                "name": "Rail Features"
             },
             "category-restriction": {
-                "name": "Restriction"
+                "name": "Restriction Features"
             },
             "category-road": {
-                "name": "Road"
+                "name": "Road Features"
             },
             "category-route": {
-                "name": "Route"
+                "name": "Route Features"
             },
             "category-water-area": {
-                "name": "Water"
+                "name": "Water Features"
             },
             "category-water-line": {
-                "name": "Water"
+                "name": "Water Features"
             }
         },
         "fields": {
             "bicycle_parking": {
                 "label": "Type"
             },
+            "bin": {
+                "label": "Waste Bin"
+            },
             "boundary": {
                 "label": "Type"
             },
             "cuisine": {
                 "label": "Cuisine"
             },
+            "currency_multi": {
+                "label": "Currency Types"
+            },
             "cycleway": {
                 "label": "Bike Lanes",
                 "placeholder": "none",
             "description": {
                 "label": "Description"
             },
+            "diaper": {
+                "label": "Diaper Changing Available"
+            },
+            "dock": {
+                "label": "Type"
+            },
             "drive_through": {
                 "label": "Drive-Through"
             },
             "fuel": {
                 "label": "Fuel"
             },
-            "fuel/biodiesel": {
-                "label": "Sells Biodiesel"
-            },
-            "fuel/diesel": {
-                "label": "Sells Diesel"
-            },
-            "fuel/e10": {
-                "label": "Sells E10"
-            },
-            "fuel/e85": {
-                "label": "Sells E85"
-            },
-            "fuel/lpg": {
-                "label": "Sells Propane"
-            },
-            "fuel/octane_100": {
-                "label": "Sells Racing Gasoline"
-            },
-            "fuel/octane_91": {
-                "label": "Sells Regular Gasoline"
-            },
-            "fuel/octane_95": {
-                "label": "Sells Midgrade Gasoline"
-            },
-            "fuel/octane_98": {
-                "label": "Sells Premium Gasoline"
+            "fuel_multi": {
+                "label": "Fuel Types"
             },
             "gauge": {
                 "label": "Gauge"
                 "label": "Handicap",
                 "placeholder": "1-18"
             },
+            "handrail": {
+                "label": "Handrail"
+            },
             "highway": {
                 "label": "Type"
             },
                     "terminal": "Terminal"
                 }
             },
+            "internet_access/fee": {
+                "label": "Internet Access Fee"
+            },
+            "kerb": {
+                "label": "Curb Ramp"
+            },
             "lamp_type": {
                 "label": "Type"
             },
                 "label": "Speed Limit",
                 "placeholder": "40, 50, 60..."
             },
+            "maxstay": {
+                "label": "Max Stay"
+            },
             "mtb/scale": {
                 "label": "Mountain Biking Difficulty",
                 "placeholder": "0, 1, 2, 3...",
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
             },
+            "parallel_direction": {
+                "label": "Direction",
+                "options": {
+                    "forward": "Forward",
+                    "backward": "Backward"
+                }
+            },
             "park_ride": {
                 "label": "Park and Ride"
             },
                     "lane": "Roadside Lane"
                 }
             },
+            "payment_multi": {
+                "label": "Payment Types"
+            },
             "phone": {
                 "label": "Phone",
                 "placeholder": "+31 42 123 4567"
             "railway": {
                 "label": "Type"
             },
-            "recycling/cans": {
-                "label": "Accepts Cans"
-            },
-            "recycling/clothes": {
-                "label": "Accepts Clothes"
-            },
-            "recycling/glass": {
-                "label": "Accepts Glass"
-            },
-            "recycling/glass_bottles": {
-                "label": "Accepts Glass Bottles"
-            },
-            "recycling/paper": {
-                "label": "Accepts Paper"
-            },
-            "recycling/plastic": {
-                "label": "Accepts Plastic"
-            },
-            "recycling/type": {
-                "label": "Recycling Type",
-                "options": {
-                    "container": "Container",
-                    "centre": "Recycling Center"
-                }
+            "recycling_accepts": {
+                "label": "Accepts"
             },
             "ref": {
                 "label": "Reference"
             "restrictions": {
                 "label": "Turn Restrictions"
             },
+            "rooms": {
+                "label": "Rooms"
+            },
             "route": {
                 "label": "Type"
             },
             "shop": {
                 "label": "Type"
             },
-            "sloped_curb": {
-                "label": "Sloped Curb"
+            "site": {
+                "label": "Type"
             },
             "smoking": {
                 "label": "Smoking",
             "sport_racing": {
                 "label": "Sport"
             },
+            "stars": {
+                "label": "Stars"
+            },
+            "stop": {
+                "label": "Stop Type",
+                "options": {
+                    "all": "All Ways",
+                    "minor": "Minor Road"
+                }
+            },
             "structure": {
                 "label": "Structure",
                 "placeholder": "Unknown",
                     "ford": "Ford"
                 }
             },
-            "studio_type": {
+            "studio": {
                 "label": "Type"
             },
             "substation": {
             },
             "amenity/bbq": {
                 "name": "Barbecue/Grill",
-                "terms": "bbq"
+                "terms": "bbq,grill"
             },
             "amenity/bench": {
                 "name": "Bench",
-                "terms": ""
+                "terms": "seat"
             },
             "amenity/bicycle_parking": {
                 "name": "Bicycle Parking",
                 "terms": "bike"
             },
             "amenity/bicycle_repair_station": {
-                "name": "Bicycle Repair Station",
-                "terms": "bike"
+                "name": "Bicycle Repair Tool Stand",
+                "terms": "bike,repair,chain,pump"
             },
             "amenity/biergarten": {
                 "name": "Beer Garden",
             },
             "amenity/cafe": {
                 "name": "Cafe",
-                "terms": "coffee,tea"
+                "terms": "bistro,coffee,tea"
             },
             "amenity/car_rental": {
                 "name": "Car Rental",
                 "name": "Dentist",
                 "terms": "tooth,teeth"
             },
-            "amenity/doctor": {
+            "amenity/doctors": {
                 "name": "Doctor",
                 "terms": "medic*"
             },
                 "name": "Fast Food",
                 "terms": "restaurant"
             },
+            "amenity/ferry_terminal": {
+                "name": "Ferry Terminal",
+                "terms": ""
+            },
             "amenity/fire_station": {
                 "name": "Fire Station",
                 "terms": ""
             },
             "amenity/fuel": {
                 "name": "Gas Station",
-                "terms": "petrol,fuel,propane,diesel,lng,cng,biodiesel"
+                "terms": "petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel"
             },
             "amenity/grave_yard": {
                 "name": "Graveyard",
                 "name": "Hospital Grounds",
                 "terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
             },
+            "amenity/hunting_stand": {
+                "name": "Hunting Stand",
+                "terms": ""
+            },
             "amenity/kindergarten": {
                 "name": "Preschool/Kindergarten Grounds",
                 "terms": "kindergarden,pre-school"
                 "name": "Parking Garage Entrance/Exit",
                 "terms": ""
             },
+            "amenity/parking_space": {
+                "name": "Parking Space",
+                "terms": ""
+            },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
-                "terms": "drug,medicine"
+                "terms": "drug*,med*,prescription"
             },
             "amenity/place_of_worship": {
                 "name": "Place of Worship",
                 "name": "Post Office",
                 "terms": "letter,mail"
             },
+            "amenity/prison": {
+                "name": "Prison Grounds",
+                "terms": "cell,jail"
+            },
             "amenity/pub": {
                 "name": "Pub",
                 "terms": "dive,beer,bier,booze"
                 "name": "University Grounds",
                 "terms": "college"
             },
-            "amenity/vending_machine": {
+            "amenity/vending_machine/cigarettes": {
+                "name": "Cigarette Vending Machine",
+                "terms": "cigarette"
+            },
+            "amenity/vending_machine/condoms": {
+                "name": "Condom Vending Machine",
+                "terms": "condom"
+            },
+            "amenity/vending_machine/drinks": {
+                "name": "Drink Vending Machine",
+                "terms": "drink,soda,beverage,juice,pop"
+            },
+            "amenity/vending_machine/excrement_bags": {
+                "name": "Excrement Bag Vending Machine",
+                "terms": "excrement bags,poop,dog,animal"
+            },
+            "amenity/vending_machine/news_papers": {
+                "name": "Newspaper Vending Machine",
+                "terms": "newspaper"
+            },
+            "amenity/vending_machine/parcel_pickup_dropoff": {
+                "name": "Parcel Pickup/Dropoff Vending Machine",
+                "terms": "parcel,mail,pickup"
+            },
+            "amenity/vending_machine/parking_tickets": {
+                "name": "Parking Ticket Vending Machine",
+                "terms": "parking,ticket"
+            },
+            "amenity/vending_machine/public_transport_tickets": {
+                "name": "Transit Ticket Vending Machine",
+                "terms": "bus,train,ferry,rail,ticket,transportation"
+            },
+            "amenity/vending_machine/sweets": {
+                "name": "Snack Vending Machine",
+                "terms": "candy,gum,chip,pretzel,cookie,cracker"
+            },
+            "amenity/vending_machine/vending_machine": {
                 "name": "Vending Machine",
-                "terms": "snack,soda,ticket"
+                "terms": ""
             },
             "amenity/veterinary": {
                 "name": "Veterinary",
             },
             "amenity/waste_basket": {
                 "name": "Waste Basket",
-                "terms": "rubbish,litter,trash,garbage"
+                "terms": "bin,rubbish,litter,trash,garbage"
+            },
+            "amenity/waste_disposal": {
+                "name": "Garbage Dumpster",
+                "terms": "rubbish,litter,trash"
+            },
+            "amenity/water_point": {
+                "name": "RV Drinking Water",
+                "terms": ""
             },
             "area": {
                 "name": "Area",
                 "terms": ""
             },
             "barrier/ditch": {
-                "name": "Ditch",
+                "name": "Trench",
                 "terms": ""
             },
             "barrier/entrance": {
                 "terms": ""
             },
             "building/cathedral": {
-                "name": "Cathedral",
+                "name": "Cathedral Building",
                 "terms": ""
             },
             "building/chapel": {
-                "name": "Chapel",
+                "name": "Chapel Building",
                 "terms": ""
             },
             "building/church": {
-                "name": "Church",
+                "name": "Church Building",
                 "terms": ""
             },
             "building/college": {
                 "name": "Ambulance Station",
                 "terms": "EMS,EMT,rescue"
             },
+            "emergency/defibrillator": {
+                "name": "Defibrillator",
+                "terms": ""
+            },
             "emergency/fire_hydrant": {
                 "name": "Fire Hydrant",
                 "terms": ""
                 "name": "Foot Path",
                 "terms": "hike,hiking,trackway,trail,walk"
             },
+            "highway/give_way": {
+                "name": "Yield Sign",
+                "terms": "give way,yield,sign"
+            },
             "highway/living_street": {
                 "name": "Living Street",
                 "terms": ""
             },
             "highway/stop": {
                 "name": "Stop Sign",
-                "terms": "stop sign"
+                "terms": "stop,halt,sign"
             },
             "highway/street_lamp": {
                 "name": "Street Lamp",
                 "terms": "ramp,on ramp,off ramp"
             },
             "highway/track": {
-                "name": "Track",
-                "terms": "woods road,fire road"
+                "name": "Unmaintained Track Road",
+                "terms": "woods road,forest road,logging road,fire road,farm road,agricultural road,ranch road,carriage road,primitive,unmaintained,rut,offroad,4wd,4x4,four wheel drive,atv,quad,jeep,double track,two track"
             },
             "highway/traffic_signals": {
                 "name": "Traffic Signals",
                 "terms": "cul-de-sac"
             },
             "highway/unclassified": {
-                "name": "Unclassified Road",
+                "name": "Minor/Unclassified Road",
                 "terms": ""
             },
             "historic": {
                 "name": "Adult Gaming Center",
                 "terms": "gambling,slot machine"
             },
+            "leisure/bird_hide": {
+                "name": "Bird Hide",
+                "terms": "machan,ornithology"
+            },
             "leisure/bowling_alley": {
                 "name": "Bowling Alley",
                 "terms": ""
                 "name": "Slipway",
                 "terms": "boat launch,boat ramp"
             },
-            "leisure/sports_center": {
+            "leisure/sports_centre": {
                 "name": "Sports Center / Gym",
                 "terms": "gym"
             },
+            "leisure/sports_centre/swimming": {
+                "name": "Swimming Pool Facility",
+                "terms": "dive,water"
+            },
             "leisure/stadium": {
                 "name": "Stadium",
                 "terms": ""
             },
             "leisure/swimming_pool": {
                 "name": "Swimming Pool",
-                "terms": ""
+                "terms": "dive,water"
             },
             "leisure/track": {
                 "name": "Racetrack (non-Motorsport)",
                 "terms": ""
             },
+            "leisure/water_park": {
+                "name": "Water Park",
+                "terms": "swim,pool,dive"
+            },
             "line": {
                 "name": "Line",
                 "terms": ""
                 "name": "Breakwater",
                 "terms": ""
             },
+            "man_made/bridge": {
+                "name": "Bridge",
+                "terms": ""
+            },
+            "man_made/chimney": {
+                "name": "Chimney",
+                "terms": ""
+            },
             "man_made/cutline": {
                 "name": "Cut line",
                 "terms": ""
                 "name": "Flagpole",
                 "terms": ""
             },
+            "man_made/gasometer": {
+                "name": "Gasometer",
+                "terms": "gas holder"
+            },
+            "man_made/groyne": {
+                "name": "Groyne",
+                "terms": ""
+            },
             "man_made/lighthouse": {
                 "name": "Lighthouse",
                 "terms": ""
             },
             "man_made/pier": {
                 "name": "Pier",
-                "terms": ""
+                "terms": "dock"
             },
             "man_made/pipeline": {
                 "name": "Pipeline",
                 "name": "Storage Tank",
                 "terms": "water,oil,gas,petrol"
             },
+            "man_made/surveillance": {
+                "name": "Surveillance",
+                "terms": ""
+            },
             "man_made/survey_point": {
                 "name": "Survey Point",
                 "terms": ""
                 "name": "Water Works",
                 "terms": ""
             },
+            "man_made/works": {
+                "name": "Works",
+                "terms": "car assembly plant,aluminium processing plant,brewery,furniture manufacture factory,oil refinery,plastic recycling"
+            },
             "military/airfield": {
                 "name": "Airfield",
                 "terms": ""
                 "terms": ""
             },
             "shop/art": {
-                "name": "Art Gallery",
-                "terms": ""
+                "name": "Art Store",
+                "terms": "art*,exhibit*,gallery"
             },
             "shop/baby_goods": {
                 "name": "Baby Goods Store",
             },
             "shop/bicycle": {
                 "name": "Bicycle Shop",
-                "terms": ""
+                "terms": "bike,repair"
             },
             "shop/bookmaker": {
                 "name": "Bookmaker",
                 "terms": ""
             },
             "shop/chemist": {
-                "name": "Chemist",
-                "terms": ""
+                "name": "Drugstore",
+                "terms": "med*,drug*,gift"
             },
             "shop/chocolate": {
                 "name": "Chocolate Store",
                 "name": "Clothing Store",
                 "terms": ""
             },
+            "shop/coffee": {
+                "name": "Coffee Store",
+                "terms": ""
+            },
             "shop/computer": {
                 "name": "Computer Store",
                 "terms": ""
             },
             "shop/craft": {
                 "name": "Arts and Crafts Store",
-                "terms": ""
+                "terms": "art*,paint*,frame"
             },
             "shop/curtain": {
                 "name": "Curtain Store",
             },
             "shop/frame": {
                 "name": "Framing Shop",
-                "terms": ""
+                "terms": "art*,paint*,photo*,frame"
             },
             "shop/funeral_directors": {
                 "name": "Funeral Home",
                 "name": "Newspaper/Magazine Shop",
                 "terms": ""
             },
+            "shop/nutrition_supplements": {
+                "name": "Nutrition Supplements Store",
+                "terms": ""
+            },
             "shop/optician": {
                 "name": "Optician",
                 "terms": "eye,glasses"
                 "name": "Stationery Store",
                 "terms": "card,paper"
             },
+            "shop/storage_rental": {
+                "name": "Storage Rental",
+                "terms": ""
+            },
             "shop/supermarket": {
                 "name": "Supermarket",
                 "terms": "grocery,store,shop"
                 "name": "Chalet",
                 "terms": ""
             },
+            "tourism/gallery": {
+                "name": "Art Gallery",
+                "terms": "art*,exhibit*,paint*,photo*,sculpt*"
+            },
             "tourism/guest_house": {
                 "name": "Guest House",
                 "terms": "B&B,Bed and Breakfast"
             },
             "tourism/museum": {
                 "name": "Museum",
-                "terms": "exhibition,foundation,gallery,hall,institution"
+                "terms": "art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*"
             },
             "tourism/picnic_site": {
                 "name": "Picnic Site",
                 "name": "Hiking Route",
                 "terms": ""
             },
+            "type/route/horse": {
+                "name": "Riding Route",
+                "terms": ""
+            },
             "type/route/pipeline": {
                 "name": "Pipeline Route",
                 "terms": ""
                 "name": "Route Master",
                 "terms": ""
             },
+            "type/site": {
+                "name": "Site",
+                "terms": ""
+            },
             "vertex": {
                 "name": "Other",
                 "terms": ""
                 "name": "Waterway",
                 "terms": ""
             },
+            "waterway/boatyard": {
+                "name": "Boatyard",
+                "terms": ""
+            },
             "waterway/canal": {
                 "name": "Canal",
                 "terms": ""
                 "name": "Ditch",
                 "terms": ""
             },
+            "waterway/dock": {
+                "name": "Wet Dock / Dry Dock",
+                "terms": "boat,ship,vessel,marine"
+            },
             "waterway/drain": {
                 "name": "Drain",
                 "terms": ""
                 "name": "Stream",
                 "terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse"
             },
+            "waterway/water_point": {
+                "name": "Marine Drinking Water",
+                "terms": ""
+            },
             "waterway/weir": {
                 "name": "Weir",
                 "terms": ""