]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Update to iD v2.2.1
[rails.git] / vendor / assets / iD / iD / locales / en.json
index b8ae49472593dfcdcfc2ba41ada4ec79dd2a645a..2e6cae5c428c09730afa7b1373ef78cf530d9aed 100644 (file)
             },
             "delete": {
                 "title": "Delete",
-                "description": "Delete object permanently.",
+                "description": {
+                    "single": "Delete this feature permanently.",
+                    "multiple": "Delete these features permanently."
+                },
                 "annotation": {
                     "point": "Deleted a point.",
                     "vertex": "Deleted a node from a way.",
                     "line": "Deleted a line.",
                     "area": "Deleted an area.",
                     "relation": "Deleted a relation.",
-                    "multiple": "Deleted {n} objects."
+                    "multiple": "Deleted {n} features."
+                },
+                "too_large": {
+                    "single": "This feature can't be deleted because not enough of it is currently visible.",
+                    "multiple": "These features can't be deleted because not enough of them are currently visible."
+                },
+                "incomplete_relation": {
+                    "single": "This feature can't be deleted because it hasn't been fully downloaded.",
+                    "multiple": "These features can't be deleted because they haven't been fully downloaded."
                 },
-                "incomplete_relation": "This feature can't be deleted because it hasn't been fully downloaded.",
-                "part_of_relation": "This feature can't be deleted because it's part of a larger relation. You must remove it from the relation first.",
-                "connected_to_hidden": "This can't be deleted because it is connected to a hidden feature."
+                "part_of_relation": {
+                    "single": "This feature can't be deleted because it is part of a larger relation. You must remove it from the relation first.",
+                    "multiple": "These features can't be deleted because they are part of larger relations. You must remove them from the relations first."
+                },
+                "connected_to_hidden": {
+                    "single": "This feature can't be deleted because it is connected to a hidden feature.",
+                    "multiple": "These features can't be deleted because some are connected to hidden features."
+                }
             },
             "add_member": {
                 "annotation": "Added a member to a relation."
                 "key": "C",
                 "annotation": "Merged {n} features.",
                 "not_eligible": "These features can't be merged.",
-                "not_adjacent": "These features can't be merged because they aren't connected.",
+                "not_adjacent": "These features can't be merged because their endpoints 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 features can't be merged because some of their tags have conflicting values."
             },
             "move": {
                 "title": "Move",
-                "description": "Move this to a different location.",
+                "description": {
+                    "single": "Move this feature to a different location.",
+                    "multiple": "Move these features to a different location."
+                },
                 "key": "M",
                 "annotation": {
                     "point": "Moved a point.",
                     "vertex": "Moved a node in a way.",
                     "line": "Moved a line.",
                     "area": "Moved an area.",
-                    "multiple": "Moved multiple objects."
+                    "multiple": "Moved multiple features."
                 },
-                "incomplete_relation": "This feature can't be moved because it hasn't been fully downloaded.",
-                "too_large": "This can't be moved because not enough of it is currently visible.",
-                "connected_to_hidden": "This can't be moved because it is connected to a hidden feature."
+                "incomplete_relation": {
+                    "single": "This feature can't be moved because it hasn't been fully downloaded.",
+                    "multiple": "These features can't be moved because they haven't been fully downloaded."
+                },
+                "too_large": {
+                    "single": "This feature can't be moved because not enough of it is currently visible.",
+                    "multiple": "These features can't be moved because not enough of them are currently visible."
+                },
+                "connected_to_hidden": {
+                    "single": "This feature can't be moved because it is connected to a hidden feature.",
+                    "multiple": "These features can't be moved because some are connected to hidden features."
+                }
+            },
+            "reflect": {
+                "title": {
+                    "long": "Reflect Long",
+                    "short": "Reflect Short"
+                },
+                "description": {
+                    "long": {
+                        "single": "Reflect this feature across its long axis.",
+                        "multiple": "Reflect these features across their long axis."
+                    },
+                    "short": {
+                        "single": "Reflect this feature across its short axis.",
+                        "multiple": "Reflect these features across their short axis."
+                    }
+                },
+                "key": {
+                    "long": "T",
+                    "short": "Y"
+                },
+                "annotation": {
+                    "long": {
+                        "single": "Reflected a feature across its long axis.",
+                        "multiple": "Reflected multiple features across their long axis."
+                    },
+                    "short": {
+                        "single": "Reflected a feature across its short axis.",
+                        "multiple": "Reflected multiple features across their short axis."
+                    }
+                },
+                "incomplete_relation": {
+                    "single": "This feature can't be reflected because it hasn't been fully downloaded.",
+                    "multiple": "These features can't be reflected because they haven't been fully downloaded."
+                },
+                "too_large": {
+                    "single": "This feature can't be reflected because not enough of it is currently visible.",
+                    "multiple": "These features can't be reflected because not enough of them are currently visible."
+                },
+                "connected_to_hidden": {
+                    "single": "This feature can't be reflected because it is connected to a hidden feature.",
+                    "multiple": "These features can't be reflected because some are connected to hidden features."
+                }
             },
             "rotate": {
                 "title": "Rotate",
-                "description": "Rotate this object around its center point.",
+                "description": {
+                    "single": "Rotate this feature around its center point.",
+                    "multiple": "Rotate these features around their center point."
+                },
                 "key": "R",
                 "annotation": {
                     "line": "Rotated a line.",
-                    "area": "Rotated an area."
+                    "area": "Rotated an area.",
+                    "multiple": "Rotated multiple features."
+                },
+                "incomplete_relation": {
+                    "single": "This feature can't be rotated because it hasn't been fully downloaded.",
+                    "multiple": "These features can't be rotated because they haven't been fully downloaded."
                 },
-                "too_large": "This can't be rotated because not enough of it is currently visible.",
-                "connected_to_hidden": "This can't be rotated because it is connected to a hidden feature."
+                "too_large": {
+                    "single": "This feature can't be rotated because not enough of it is currently visible.",
+                    "multiple": "These features can't be rotated because not enough of them are currently visible."
+                },
+                "connected_to_hidden": {
+                    "single": "This feature can't be rotated because it is connected to a hidden feature.",
+                    "multiple": "These features can't be rotated because some are connected to hidden features."
+                }
             },
             "reverse": {
                 "title": "Reverse",
             "rateLimit": "The API is limiting anonymous connections.  You can fix this by logging in."
         },
         "commit": {
-            "title": "Save Changes",
+            "title": "Upload to OpenStreetMap",
             "description_placeholder": "Brief description of your contributions (required)",
-            "message_label": "Changeset comment",
+            "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.",
-            "save": "Save",
+            "save": "Upload",
             "cancel": "Cancel",
             "changes": "{count} Changes",
             "warnings": "Warnings",
             "back_tooltip": "Change feature",
             "remove": "Remove",
             "search": "Search",
-            "multiselect": "Selected items",
+            "multiselect": "Selected features",
             "unknown": "Unknown",
             "incomplete": "<not downloaded>",
             "feature_list": "Search features",
             "edit": "Edit feature",
             "check": {
                 "yes": "Yes",
-                "no": "No"
+                "no": "No",
+                "reverser": "Change Direction"
+            },
+            "radio": {
+                "structure": {
+                    "type": "Type",
+                    "default": "Default",
+                    "layer": "Layer"
+                }
             },
             "add": "Add",
             "none": "None",
         },
         "save": {
             "title": "Save",
-            "help": "Save changes to OpenStreetMap, making them visible to other users.",
+            "help": "Review your changes and upload them to OpenStreetMap, making them visible to other users.",
             "no_changes": "No changes to save.",
             "error": "Errors occurred while trying to save",
             "status_code": "Server returned status code {code}",
             "unknown_error_details": "Please ensure you are connected to the internet.",
-            "uploading": "Uploading changes to OpenStreetMap.",
+            "uploading": "Uploading changes to OpenStreetMap...",
             "unsaved_changes": "You have unsaved changes",
             "conflict": {
                 "header": "Resolve conflicting edits",
                 "delete": "Leave Deleted",
                 "download_changes": "Or download your changes.",
                 "done": "All conflicts resolved!",
-                "help": "Another user changed some of the same map features you changed.\nClick on each item below for more details about the conflict, and choose whether to keep\nyour changes or the other user's changes.\n"
+                "help": "Another user changed some of the same map features you changed.\nClick on each feature below for more details about the conflict, and choose whether to keep\nyour changes or the other user's changes.\n"
             }
         },
         "merge_remote_changes": {
             "conflict": {
-                "deleted": "This object has been deleted by {user}.",
-                "location": "This object was moved by both you and {user}.",
+                "deleted": "This feature has been deleted by {user}.",
+                "location": "This feature was moved by both you and {user}.",
                 "nodelist": "Nodes were changed by both you and {user}.",
                 "memberlist": "Relation members were changed by both you and {user}.",
                 "tags": "You changed the <b>{tag}</b> tag to \"{local}\" and {user} changed it to \"{remote}\"."
             "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",
+            "okay": "OK",
             "cancel": "Cancel"
         },
         "splash": {
             "lose_changes": "You have unsaved changes. Switching the map server will discard them. Are you sure you want to switch servers?",
             "dev": "dev"
         },
+        "version": {
+            "whats_new": "What's new in iD {version}"
+        },
         "tag_reference": {
             "description": "Description",
             "on_wiki": "{tag} on wiki.osm.org",
             "used_with": "used with {type}"
         },
         "validations": {
+            "disconnected_highway": "Disconnected highway",
+            "disconnected_highway_tooltip": "Roads should be connected to other roads or building entrances.",
+            "old_multipolygon": "Multipolygon tags on outer way",
+            "old_multipolygon_tooltip": "This style of multipolygon is deprecated. Please assign the tags to the parent multipolygon instead of the outer way.",
             "untagged_point": "Untagged point",
-            "untagged_line": "Untagged line",
-            "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_point_tooltip": "Select a feature type that describes what this point is.",
+            "untagged_line": "Untagged line",
             "untagged_line_tooltip": "Select a feature type that describes what this line is.",
+            "untagged_area": "Untagged area",
             "untagged_area_tooltip": "Select a feature type that describes what this area is.",
+            "untagged_relation": "Untagged relation",
+            "untagged_relation_tooltip": "Select a feature type that describes what this relation is.",
+            "many_deletions": "You're deleting {n} features. 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}"
         },
         "zoom": {
         "cannot_zoom": "Cannot zoom out further in current mode.",
         "full_screen": "Toggle Full Screen",
         "gpx": {
-            "local_layer": "Local GPX file",
-            "drag_drop": "Drag and drop a .gpx file on the page, or click the button to the right to browse",
-            "zoom": "Zoom to GPX track",
-            "browse": "Browse for a .gpx file"
+            "local_layer": "Local file",
+            "drag_drop": "Drag and drop a .gpx, .geojson or .kml file on the page, or click the button to the right to browse",
+            "zoom": "Zoom to layer",
+            "browse": "Browse for a file"
         },
         "mapillary_images": {
             "tooltip": "Street-level photos from Mapillary",
         },
         "intro": {
             "done": "done",
+            "ok": "OK",
             "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"
+                "block_number": "<value for addr:block_number>",
+                "city": "Three Rivers",
+                "county": "<value for addr:county>",
+                "district": "<value for addr:district>",
+                "hamlet": "<value for addr:hamlet>",
+                "neighbourhood": "<value for addr:neighbourhood>",
+                "postcode": "49093",
+                "province": "<value for addr:province>",
+                "quarter": "<value for addr:quarter>",
+                "state": "MI",
+                "subdistrict": "<value for addr:subdistrict>",
+                "suburb": "<value for addr:suburb>",
+                "countrycode": "us",
+                "name": {
+                    "1st-avenue": "1st Avenue",
+                    "2nd-avenue": "2nd Avenue",
+                    "4th-avenue": "4th Avenue",
+                    "5th-avenue": "5th Avenue",
+                    "6th-avenue": "6th Avenue",
+                    "6th-street": "6th Street",
+                    "7th-avenue": "7th Avenue",
+                    "8th-avenue": "8th Avenue",
+                    "9th-avenue": "9th Avenue",
+                    "10th-avenue": "10th Avenue",
+                    "11th-avenue": "11th Avenue",
+                    "12th-avenue": "12th Avenue",
+                    "access-point-employment": "Access Point Employment",
+                    "adams-street": "Adams Street",
+                    "andrews-elementary-school": "Andrews Elementary School",
+                    "andrews-street": "Andrews Street",
+                    "armitage-street": "Armitage Street",
+                    "barrows-school": "Barrows School",
+                    "battle-street": "Battle Street",
+                    "bennett-street": "Bennett Street",
+                    "bowman-park": "Bowman Park",
+                    "collins-drive": "Collins Drive",
+                    "conrail-railroad": "Conrail Railroad",
+                    "conservation-park": "Conservation Park",
+                    "constantine-street": "Constantine Street",
+                    "cushman-street": "Cushman Street",
+                    "dollar-tree": "Dollar Tree",
+                    "douglas-avenue": "Douglas Avenue",
+                    "east-street": "East Street",
+                    "elm-street": "Elm Street",
+                    "flower-street": "Flower Street",
+                    "foster-street": "Foster Street",
+                    "french-street": "French Street",
+                    "garden-street": "Garden Street",
+                    "gem-pawnbroker": "Gem Pawnbroker",
+                    "golden-finch-framing": "Golden Finch Framing",
+                    "grant-avenue": "Grant Avenue",
+                    "hoffman-pond": "Hoffman Pond",
+                    "hoffman-street": "Hoffman Street",
+                    "hook-avenue": "Hook Avenue",
+                    "jefferson-street": "Jefferson Street",
+                    "kelsey-street": "Kelsey Street",
+                    "lafayette-park": "LaFayette Park",
+                    "las-coffee-cafe": "L.A.'s Coffee Cafe",
+                    "lincoln-avenue": "Lincoln Avenue",
+                    "lowrys-books": "Lowry's Books",
+                    "lynns-garage": "Lynn's Garage",
+                    "main-street-barbell": "Main Street Barbell",
+                    "main-street-cafe": "Main Street Cafe",
+                    "main-street-fitness": "Main Street Fitness",
+                    "main-street": "Main Street",
+                    "maple-street": "Maple Street",
+                    "marina-park": "Marina Park",
+                    "market-street": "Market Street",
+                    "memory-isle-park": "Memory Isle Park",
+                    "memory-isle": "Memory Isle",
+                    "michigan-avenue": "Michigan Avenue",
+                    "middle-street": "Middle Street",
+                    "millard-street": "Millard Street",
+                    "moore-street": "Moore Street",
+                    "morris-avenue": "Morris Avenue",
+                    "mural-mall": "Mural Mall",
+                    "paisanos-bar-and-grill": "Paisano's Bar and Grill",
+                    "paisley-emporium": "Paisley Emporium",
+                    "paparazzi-tattoo": "Paparazzi Tattoo",
+                    "pealer-street": "Pealer Street",
+                    "pine-street": "Pine Street",
+                    "pizza-hut": "Pizza Hut",
+                    "portage-avenue": "Portage Avenue",
+                    "portage-river": "Portage River",
+                    "preferred-insurance-services": "Preferred Insurance Services",
+                    "railroad-drive": "Railroad Drive",
+                    "river-city-appliance": "River City Appliance",
+                    "river-drive": "River Drive",
+                    "river-road": "River Road",
+                    "river-street": "River Street",
+                    "riverside-cemetery": "Riverside Cemetery",
+                    "riverwalk-trail": "Riverwalk Trail",
+                    "riviera-theatre": "Riviera Theatre",
+                    "rocky-river": "Rocky River",
+                    "saint-joseph-river": "Saint Joseph River",
+                    "scidmore-park-petting-zoo": "Scidmore Park Petting Zoo",
+                    "scidmore-park": "Scidmore Park",
+                    "scouter-park": "Scouter Park",
+                    "sherwin-williams": "Sherwin-Williams",
+                    "south-street": "South Street",
+                    "southern-michigan-bank": "Southern Michigan Bank",
+                    "spring-street": "Spring Street",
+                    "sturgeon-river-road": "Sturgeon River Road",
+                    "three-rivers-city-hall": "Three Rivers City Hall",
+                    "three-rivers-elementary-school": "Three Rivers Elementary School",
+                    "three-rivers-fire-department": "Three Rivers Fire Department",
+                    "three-rivers-high-school": "Three Rivers High School",
+                    "three-rivers-middle-school": "Three Rivers Middle School",
+                    "three-rivers-municipal-airport": "Three Rivers Municipal Airport",
+                    "three-rivers-post-office": "Three Rivers Post Office",
+                    "three-rivers-public-library": "Three Rivers Public Library",
+                    "three-rivers": "Three Rivers",
+                    "unique-jewelry": "Unique Jewelry",
+                    "walnut-street": "Walnut Street",
+                    "washington-street": "Washington Street",
+                    "water-street": "Water Street",
+                    "west-street": "West Street",
+                    "wheeler-street": "Wheeler Street",
+                    "william-towing": "William Towing",
+                    "willow-drive": "Willow Drive",
+                    "wood-street": "Wood Street",
+                    "world-fare": "World Fare"
+                }
+            },
+            "welcome": {
+                "title": "Welcome",
+                "welcome": "Welcome! This walkthrough will teach you the basics of editing on OpenStreetMap.",
+                "practice": "All of the data in this walkthrough is just for practicing, and any edits that you make in the walkthrough will not be saved.",
+                "words": "This walkthrough will introduce some new words and concepts. When we introduce a new word, we'll use *italics*.",
+                "mouse": "You can use any input device to edit the map, but this walkthrough assumes you have a mouse with left and right buttons. **If you want to attach a mouse, do so now, then click OK.**",
+                "leftclick": "When this tutorial asks you to click or double-click, we mean with the left button. On a trackpad it might be a single-click or single-finger tap. **Left-click {num} times.**",
+                "rightclick": "Sometimes we'll also ask you to right-click. This might be the same as control-click, or two-finger tap on a trackpad. Your keyboard might even have a 'menu' key that works like right-click. **Right-click {num} times.**",
+                "chapters": "So far, so good! You can use the buttons below to skip chapters at any time or to restart a chapter if you get stuck. Let's begin! **Click '{next}' to continue.**"
             },
             "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.**",
-                "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.**"
+                "drag": "The main map area shows OpenStreetMap data on top of a background.{br}You can drag the map by pressing and holding the left mouse button while moving the mouse around. You can also use the arrow keys on your keyboard. **Drag the map!**",
+                "zoom": "You can zoom in or out by scrolling with the mouse wheel or trackpad, or by clicking the {plus} / {minus} buttons. **Zoom the map!**",
+                "features": "We use the word *features* to describe the things that appear on the map. Anything in the real world can be mapped as a feature on OpenStreetMap.",
+                "points_lines_areas": "Map features are represented using *points, lines, or areas.*",
+                "nodes_ways": "In OpenStreetMap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*.",
+                "click_townhall": "All features on the map can be selected by clicking on them. **Click on the point to select it.**",
+                "selected_townhall": "Great! The point is now selected. Selected features are drawn with a pulsing glow.",
+                "editor_townhall": "When a feature is selected, the *feature editor* is displayed alongside the map.",
+                "preset_townhall": "The top part of the feature editor shows the feature's type. This point is a {preset}.",
+                "fields_townhall": "The middle part of the feature editor contains *fields* showing the feature's attributes, such as its name and address.",
+                "close_townhall": "**Close the feature editor by hitting escape or pressing the {button} button in the upper corner.**",
+                "search_street": "You can also search for features in the current view, or worldwide. **Search for '{name}'.**",
+                "choose_street": "**Choose {name} from the list to select it.**",
+                "selected_street": "Great! {name} is now selected.",
+                "editor_street": "The fields shown for a street are different than the fields that were shown for the town hall.{br}For this selected street, the feature editor shows fields like '{field1}' and '{field2}'. **Close the feature editor by hitting escape or pressing the {button} button.**",
+                "play": "Try moving the map and clicking on some other features to see what kinds of things can be added to OpenStreetMap. **When you are ready to continue to the next chapter, click '{next}'.**"
             },
             "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 {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 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.**"
+                "add_point": "*Points* can be used to represent features such as shops, restaurants, and monuments.{br}They mark a specific location, and describe what's there. **Click the {button} Point button to add a new point.**",
+                "place_point": "To place the new point on the map, position your mouse cursor where the point should go, then left-click or press the spacebar. **Move the mouse pointer over this building, then left-click or press the spacebar.**",
+                "search_cafe": "There are many different features that can be represented by points. The point you just added is a cafe. **Search for '{preset}'.**",
+                "choose_cafe": "**Choose {preset} from the list.**",
+                "feature_editor": "The point is now marked as a cafe. Using the feature editor, we can add more information about the cafe.",
+                "add_name": "In OpenStreetMap, all of the fields are optional, and it's OK to leave a field blank if you are unsure.{br}Let's pretend that you have local knowledge of this cafe, and you know its name. **Add a name for the cafe.**",
+                "add_close": "The feature editor will remember all of your changes automatically. **When you are finished adding the name, hit escape, enter, or 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 cafe you just created.**",
+                "update": "Let's fill in some more details for this cafe. You can change its name, add a cuisine, or add an address. **Change the cafe details.**",
+                "update_close": "**When you are finished updating the cafe, hit escape, enter, or click the {button} button to close the feature editor.**",
+                "rightclick": "You can right-click on any feature to see the *edit menu*, which shows a list of editing operations that can be performed. **Right-click to select the point you created and show the edit menu.**",
+                "delete": "It's OK to delete features that don't exist in the real world.{br}Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it. **Click on the {button} button to delete the point.**",
+                "undo": "You can always undo any changes up until you save your edits to OpenStreetMap. **Click on the {button} button to undo the delete and get the point back.**",
+                "play": "Now that you know how to create and edit points, try creating a few more points for practice! **When you are ready to continue to the next chapter, click '{next}'.**"
             },
             "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 {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, then click the {button} button to close the feature editor**"
+                "add_playground": "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas.{br}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.**",
+                "start_playground": "Let's add this playground to the map by drawing an area. Areas are drawn by placing *nodes* along the outer edge of the feature. **Click or press spacebar to place a starting node on one of the corners of the playground.**",
+                "continue_playground": "Continue drawing the area by placing more nodes along the playground's edge. It is OK to connect the area to the existing walking paths.{br}Tip: You can hold down the Alt key to prevent nodes from connecting to other features. **Continue drawing an area for the playground.**",
+                "finish_playground": "Finish the area by pressing enter, or clicking again on either the first or last node. **Finish drawing an area for the playground.**",
+                "search_playground": "**Search for '{preset}'.**",
+                "choose_playground": "**Choose {preset} from the list.**",
+                "add_field": "This playground doesn't have an official name, so we won't add anything in the Name field.{br}Instead let's add some additional details about the playground to the Description field. **Open the Add Field list.**",
+                "choose_field": "**Choose {field} from the list.**",
+                "retry_add_field": "You didn't select the {field} field. Let's try again.",
+                "describe_playground": "**Add a description, then click the {button} button to close the feature editor.**",
+                "play": "Good job! Try drawing a few more areas, and see what other kinds of area features you can add to OpenStreetMap. **When you are ready to continue to the next chapter, click '{next}'.**"
             },
             "lines": {
                 "title": "Lines",
-                "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 {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, 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**"
+                "add_line": "*Lines* are used to represent features such as roads, railroads, and rivers. **Click the {button} Line button to add a new line.**",
+                "start_line": "Here is a road that is missing. Let's add it!{br}In OpenStreetMap, lines should be drawn down the center of the road. You can drag and zoom the map while drawing if necessary. **Start a new line by clicking at the top end of this missing road.**",
+                "intersect": "Click or press spacebar to add more nodes to the line.{br}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.**",
+                "retry_intersect": "The road needs to intersect {name}. Let's try again!",
+                "continue_line": "Continue drawing the line for the new road. Remember that you can drag and zoom the map if needed.{br}When you are finished drawing, click on the last node again. **Finish drawing the road.**",
+                "choose_category_road": "**Select {category} from the list.**",
+                "choose_preset_residential": "There are many different types of roads, but this one is a residential road. **Choose the {preset} type.**",
+                "retry_preset_residential": "You didn't select the {preset} type. **Click here to choose again.**",
+                "name_road": "**Give this road a name, then hit escape, enter, or click the {button} button to close the feature editor.**",
+                "did_name_road": "Looks good! Next we will learn how to update the shape of a line.",
+                "update_line": "Sometimes you will need to change the shape of an existing line. Here is a road that doesn't look quite right.",
+                "add_node": "We can add some nodes to this line to improve its shape. One way to add a node is to double-click the line where you want to add a node. **Double-click on the line to create a new node.**",
+                "start_drag_endpoint": "When a line is selected, you can drag any of its nodes by clicking and holding down the left mouse button while you drag. **Drag the endpoint to the place where these roads should intersect.**",
+                "finish_drag_endpoint": "This spot looks good. **Release the left mouse button to finish dragging.**",
+                "start_drag_midpoint": "Small triangles are drawn at the *midpoints* between nodes. Another way to create a new node is to drag a midpoint to a new location. **Drag the midpoint triangle to create a new node along the curve of the road.**",
+                "continue_drag_midpoint": "This line is looking much better! Continue to adjust this line by double-clicking or dragging midpoints until the curve matches the road shape. **When you're happy with how the line looks, click OK.**",
+                "delete_lines": "It's OK to delete lines for roads that don't exist in the real world.{br}Here's an example where the city planned a {street} but never built it. We can improve this part of the map by deleting the extra lines.",
+                "rightclick_intersection": "The last real street is {street1}, so we will *split* {street2} at this intersection and remove everything above it. **Right click on the intersection node.**",
+                "split_intersection": "**Click on the {button} button to split {street}.**",
+                "retry_split": "You didn't click the Split button. Try again.",
+                "did_split_multi": "Good Job! {street1} is now split into two pieces. The top part can be removed. **Click the top part of {street2} to select it.**",
+                "did_split_single": "**Click the top part of {street2} to select it.**",
+                "multi_select": "{selected} is now selected. Let's also select {other1}. You can shift-click to select multiple things. **Shift-click on {other2}.**",
+                "multi_rightclick": "Good! Both lines to delete are now selected. **Right-click on one of the lines to show the edit menu.**",
+                "multi_delete": "**Click on the {button} button to delete the extra lines.**",
+                "retry_delete": "You didn't click the Delete button. Try again.",
+                "play": "Great! Use the skills that you've learned in this chapter to practice editing some more lines. **When you are ready to continue to the next chapter, click '{next}'.**"
+            },
+            "buildings": {
+                "title": "Buildings",
+                "add_building": "OpenStreetMap is the world's largest database of buildings.{br}You can help improve this database by tracing buildings that aren't already mapped. **Click the {button} Area button to add a new area.**",
+                "start_building": "Let's add this house to the map by tracing its outline.{br}Buildings should be traced around their footprint as accurately as possible. **Click or press spacebar to place a starting node on one of the corners of the building.**",
+                "continue_building": "Continue adding more nodes to trace the outline of the building. Remember that you can zoom in if you want to add more details.{br}Finish the building by pressing enter, or clicking again on either the first or last node. **Finish tracing the building.**",
+                "retry_building": "It looks like you had some trouble placing the nodes at the building corners. Try again!",
+                "choose_category_building": "**Choose {category} from the list.**",
+                "choose_preset_house": "There are many different types of buildings, but this one is clearly a house.{br}If you're not sure of the type, it's OK to just choose the generic Building type. **Choose the {preset} type.**",
+                "close": "**Hit escape or click the {button} button to close the feature editor.**",
+                "rightclick_building": "**Right-click to select the building you created and show the edit menu.**",
+                "square_building": "The house that you just added will look even better with perfectly square corners. **Click on the {button} button to square the building shape.**",
+                "retry_square": "You didn't click the Square button. Try again.",
+                "done_square": "See how the corners of the building moved into place? Let's learn another useful trick.",
+                "add_tank": "Next we'll trace this circular storage tank. **Click the {button} Area button to add a new area.**",
+                "start_tank": "Don't worry, you won't need to draw a perfect circle. Just draw an area inside the tank that touches its edge. **Click or press spacebar to place a starting node on the edge of the tank.**",
+                "continue_tank": "Add a few more nodes around the edge. The circle will be created outside the nodes that you draw.{br}Finish the area by pressing enter, or clicking again on either the first or last node. **Finish tracing the tank.**",
+                "search_tank": "**Search for '{preset}'.**",
+                "choose_tank": "**Choose {preset} from the list.**",
+                "rightclick_tank": "**Right-click to select the storage tank you created and show the edit menu.**",
+                "circle_tank": "**Click on the {button} button to make the tank a circle.**",
+                "retry_circle": "You didn't click the Circularize button. Try again.",
+                "play": "Great Job! Practice tracing a few more buildings, and try some of the other commands on the edit menu. **When you are ready to continue to the next chapter, click '{next}'.**"
             },
             "startediting": {
                 "title": "Start Editing",
-                "help": "You can replay this walkthrough or view more documentation by clicking the {button} Help button.",
+                "help": "You're now ready to edit OpenStreetMap!{br}You can replay this walkthrough anytime or view more documentation by clicking the {button} Help button.",
                 "save": "Don't forget to regularly save your changes!",
                 "start": "Start mapping!"
             }
                 "category-landuse": {
                     "name": "Land Use Features"
                 },
+                "category-natural-area": {
+                    "name": "Natural Features"
+                },
+                "category-natural-line": {
+                    "name": "Natural Features"
+                },
+                "category-natural-point": {
+                    "name": "Natural Features"
+                },
                 "category-path": {
                     "name": "Path Features"
                 },
                 "address": {
                     "label": "Address",
                     "placeholders": {
+                        "block_number": "Block Number",
+                        "block_number!jp": "Block No.",
                         "city": "City",
+                        "city!jp": "City/Town/Village/Tokyo Special Ward",
+                        "city!vn": "City/Town",
                         "conscriptionnumber": "123",
                         "country": "Country",
+                        "county": "County",
+                        "county!jp": "District",
                         "district": "District",
+                        "district!vn": "Arrondissement/Town/District",
                         "floor": "Floor",
                         "hamlet": "Hamlet",
                         "housename": "Housename",
                         "housenumber": "123",
+                        "housenumber!jp": "Building No./Lot No.",
+                        "neighbourhood": "Neighbourhood",
+                        "neighbourhood!jp": "Chōme/Aza/Koaza",
                         "place": "Place",
                         "postcode": "Postcode",
                         "province": "Province",
+                        "province!jp": "Prefecture",
+                        "quarter": "Quarter",
+                        "quarter!jp": "Ōaza/Machi",
                         "state": "State",
                         "street": "Street",
                         "subdistrict": "Subdistrict",
-                        "suburb": "Suburb"
+                        "subdistrict!vn": "Ward/Commune/Townlet",
+                        "suburb": "Suburb",
+                        "suburb!jp": "Ward"
                     }
                 },
                 "admin_level": {
                 "amenity": {
                     "label": "Type"
                 },
+                "animal_boarding": {
+                    "label": "For Animals"
+                },
+                "animal_breeding": {
+                    "label": "For Animals"
+                },
+                "animal_shelter": {
+                    "label": "For Animals"
+                },
                 "area/highway": {
                     "label": "Type"
                 },
                 "barrier": {
                     "label": "Type"
                 },
+                "bath/open_air": {
+                    "label": "Open Air"
+                },
+                "bath/sand_bath": {
+                    "label": "Sand Bath"
+                },
+                "bath/type": {
+                    "label": "Specialty",
+                    "options": {
+                        "onsen": "Japanese Onsen",
+                        "foot_bath": "Foot Bath",
+                        "hot_spring": "Hot Spring"
+                    }
+                },
                 "beauty": {
                     "label": "Shop Type"
                 },
                 "building": {
                     "label": "Building"
                 },
+                "bunker_type": {
+                    "label": "Type"
+                },
+                "camera/direction": {
+                    "label": "Direction (Degrees Clockwise)",
+                    "placeholder": "45, 90, 180, 270"
+                },
+                "camera/mount": {
+                    "label": "Camera Mount"
+                },
+                "camera/type": {
+                    "label": "Camera Type",
+                    "options": {
+                        "fixed": "Fixed",
+                        "panning": "Panning",
+                        "dome": "Dome"
+                    }
+                },
                 "capacity": {
                     "label": "Capacity",
                     "placeholder": "50, 100, 200..."
                         "NNW": "North-northwest"
                     }
                 },
+                "castle_type": {
+                    "label": "Type"
+                },
                 "clock_direction": {
                     "label": "Direction",
                     "options": {
                         "anticlockwise": "Counterclockwise"
                     }
                 },
+                "club": {
+                    "label": "Type"
+                },
                 "collection_times": {
                     "label": "Collection Times"
                 },
+                "communication_multi": {
+                    "label": "Communication Types"
+                },
                 "construction": {
                     "label": "Type"
                 },
+                "contact/webcam": {
+                    "label": "Webcam URL",
+                    "placeholder": "http://example.com/"
+                },
                 "content": {
                     "label": "Contents"
                 },
                     "label": "Type"
                 },
                 "crop": {
-                    "label": "Crop"
+                    "label": "Crops"
                 },
                 "crossing": {
                     "label": "Type"
                 },
                 "cuisine": {
-                    "label": "Cuisine"
+                    "label": "Cuisines"
                 },
                 "currency_multi": {
                     "label": "Currency Types"
                 "elevation": {
                     "label": "Elevation"
                 },
+                "email": {
+                    "label": "Email",
+                    "placeholder": "example@example.com"
+                },
                 "emergency": {
                     "label": "Emergency"
                 },
                 "fee": {
                     "label": "Fee"
                 },
+                "fence_type": {
+                    "label": "Type"
+                },
+                "fire_hydrant/position": {
+                    "label": "Position",
+                    "options": {
+                        "lane": "Lane",
+                        "parking_lot": "Parking Lot",
+                        "sidewalk": "Sidewalk",
+                        "green": "Green"
+                    }
+                },
                 "fire_hydrant/type": {
                     "label": "Type",
                     "options": {
                     "label": "Reference",
                     "placeholder": "Hole number (1-18)"
                 },
+                "grape_variety": {
+                    "label": "Grape Varieties"
+                },
                 "handicap": {
                     "label": "Handicap",
                     "placeholder": "1-18"
                     "label": "Handrail"
                 },
                 "height": {
-                    "label": "Height (meters)"
+                    "label": "Height (Meters)"
                 },
                 "highway": {
                     "label": "Type"
                 "historic": {
                     "label": "Type"
                 },
+                "historic/civilization": {
+                    "label": "Historic Civilization"
+                },
                 "hoops": {
                     "label": "Hoops",
                     "placeholder": "1, 2, 4..."
                 "information": {
                     "label": "Type"
                 },
+                "inscription": {
+                    "label": "Inscription"
+                },
                 "internet_access": {
                     "label": "Internet Access",
                     "options": {
                 "internet_access/fee": {
                     "label": "Internet Access Fee"
                 },
+                "internet_access/ssid": {
+                    "label": "SSID (Network Name)"
+                },
                 "kerb": {
                     "label": "Curb Ramp"
                 },
                 "map_type": {
                     "label": "Type"
                 },
+                "maxheight": {
+                    "label": "Max Height",
+                    "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
+                },
                 "maxspeed": {
                     "label": "Speed Limit",
                     "placeholder": "40, 50, 60..."
                 "operator": {
                     "label": "Operator"
                 },
+                "outdoor_seating": {
+                    "label": "Outdoor Seating"
+                },
                 "par": {
                     "label": "Par",
                     "placeholder": "3, 4, 5..."
                 "place": {
                     "label": "Type"
                 },
+                "plant": {
+                    "label": "Plant"
+                },
                 "population": {
                     "label": "Population"
                 },
                 "power": {
                     "label": "Type"
                 },
+                "produce": {
+                    "label": "Produce"
+                },
+                "product": {
+                    "label": "Products"
+                },
                 "railway": {
                     "label": "Type"
                 },
                         "crossover": "Crossover"
                     }
                 },
+                "service_times": {
+                    "label": "Service Times"
+                },
                 "service": {
                     "label": "Type"
                 },
                 "service/bicycle": {
                     "label": "Services"
                 },
+                "service/vehicle": {
+                    "label": "Services"
+                },
                 "shelter_type": {
                     "label": "Type"
                 },
                     }
                 },
                 "social_facility_for": {
-                    "label": "People served",
-                    "placeholder": "Homeless, Disabled, Child, etc"
+                    "label": "People Served"
+                },
+                "social_facility": {
+                    "label": "Type"
                 },
                 "source": {
                     "label": "Source"
                 },
                 "sport_ice": {
-                    "label": "Sport"
+                    "label": "Sports"
                 },
-                "sport_racing": {
-                    "label": "Sport"
+                "sport_racing_motor": {
+                    "label": "Sports"
+                },
+                "sport_racing_nonmotor": {
+                    "label": "Sports"
                 },
                 "sport": {
-                    "label": "Sport"
+                    "label": "Sports"
                 },
                 "stars": {
                     "label": "Stars"
                 },
+                "start_date": {
+                    "label": "Start Date"
+                },
+                "step_count": {
+                    "label": "Number of Steps"
+                },
                 "stop": {
                     "label": "Stop Type",
                     "options": {
                 "surface": {
                     "label": "Surface"
                 },
+                "surveillance": {
+                    "label": "Surveillance Kind"
+                },
+                "surveillance/type": {
+                    "label": "Surveillance Type",
+                    "options": {
+                        "camera": "Camera",
+                        "guard": "Guard",
+                        "ALPR": "Automatic License Plate Reader"
+                    }
+                },
+                "surveillance/zone": {
+                    "label": "Surveillance Zone"
+                },
                 "tactile_paving": {
                     "label": "Tactile Paving"
                 },
                         "bucket": "Bucket"
                     }
                 },
+                "toll": {
+                    "label": "Toll"
+                },
+                "tomb": {
+                    "label": "Type"
+                },
                 "tourism": {
                     "label": "Type"
                 },
                         "area": "Over 20m (65ft)"
                     }
                 },
+                "wall": {
+                    "label": "Type"
+                },
                 "water_point": {
                     "label": "Water Point"
                 },
                     "name": "Chair Lift",
                     "terms": ""
                 },
+                "aerialway/drag_lift": {
+                    "name": "Drag Lift",
+                    "terms": ""
+                },
                 "aerialway/gondola": {
                     "name": "Gondola",
                     "terms": ""
                 },
+                "aerialway/goods": {
+                    "name": "Goods Aerialway",
+                    "terms": ""
+                },
                 "aerialway/magic_carpet": {
                     "name": "Magic Carpet Lift",
                     "terms": ""
                 },
+                "aerialway/mixed_lift": {
+                    "name": "Mixed Lift",
+                    "terms": ""
+                },
                 "aerialway/platter": {
                     "name": "Platter Lift",
                     "terms": "button lift,poma lift"
                     "terms": "ramp"
                 },
                 "aeroway/gate": {
-                    "name": "Airport gate",
+                    "name": "Airport Gate",
                     "terms": ""
                 },
                 "aeroway/hangar": {
                     "terms": ""
                 },
                 "aeroway/terminal": {
-                    "name": "Airport terminal",
+                    "name": "Airport Terminal",
                     "terms": "airport,aerodrome"
                 },
+                "amenity/coworking_space": {
+                    "name": "Coworking Space",
+                    "terms": ""
+                },
+                "amenity/nursing_home": {
+                    "name": "Nursing Home",
+                    "terms": ""
+                },
                 "amenity/register_office": {
                     "name": "Register Office",
                     "terms": ""
                     "name": "Swimming Pool",
                     "terms": ""
                 },
+                "amenity/animal_boarding": {
+                    "name": "Animal Boarding Facility",
+                    "terms": "boarding,cat,dog,horse,kitten,pet boarding,pet care,pet hotel,puppy,reptile"
+                },
+                "amenity/animal_breeding": {
+                    "name": "Animal Breeding Facility",
+                    "terms": "breeding,bull,cat,cow,dog,horse,husbandry,kitten,livestock,pet breeding,puppy,reptile"
+                },
+                "amenity/animal_shelter": {
+                    "name": "Animal Shelter",
+                    "terms": "adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca"
+                },
                 "amenity/arts_centre": {
                     "name": "Arts Center",
                     "terms": ""
                     "name": "Courthouse",
                     "terms": ""
                 },
-                "amenity/coworking_space": {
-                    "name": "Coworking Space",
-                    "terms": "coworking,office"
+                "amenity/crematorium": {
+                    "name": "Crematorium",
+                    "terms": "cemetery,funeral"
                 },
                 "amenity/dentist": {
                     "name": "Dentist",
                     "name": "Drinking Water",
                     "terms": "fountain,potable"
                 },
+                "amenity/driving_school": {
+                    "name": "Driving School",
+                    "terms": ""
+                },
                 "amenity/embassy": {
                     "name": "Embassy",
                     "terms": ""
                     "name": "Fire Station",
                     "terms": ""
                 },
+                "amenity/food_court": {
+                    "name": "Food Court",
+                    "terms": "fast food,restaurant,food"
+                },
                 "amenity/fountain": {
                     "name": "Fountain",
                     "terms": ""
                 },
                 "amenity/hospital": {
                     "name": "Hospital Grounds",
-                    "terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
+                    "terms": "clinic,doctor,emergency room,health,infirmary,institution,sanatorium,sanitarium,sick,surgery,ward"
                 },
                 "amenity/hunting_stand": {
                     "name": "Hunting Stand",
-                    "terms": ""
+                    "terms": "game,gun,lookout,rifle,shoot*,wild,watch"
                 },
                 "amenity/ice_cream": {
                     "name": "Ice Cream Shop",
                     "name": "Car Parking",
                     "terms": ""
                 },
+                "amenity/pavilion": {
+                    "name": "Pavilion",
+                    "terms": ""
+                },
                 "amenity/pharmacy": {
                     "name": "Pharmacy",
                     "terms": "drug*,med*,prescription"
                 },
                 "amenity/pub": {
                     "name": "Pub",
-                    "terms": "dive,beer,bier,booze"
+                    "terms": "alcohol,drink,dive,beer,bier,booze"
+                },
+                "amenity/public_bath": {
+                    "name": "Public Bath",
+                    "terms": "onsen,foot bath,hot springs"
                 },
                 "amenity/public_bookcase": {
                     "name": "Public Bookcase",
                     "name": "Homeless Shelter",
                     "terms": "houseless,unhoused,displaced"
                 },
+                "amenity/social_facility/nursing_home": {
+                    "name": "Nursing Home",
+                    "terms": "elderly,living,nursing,old,senior"
+                },
                 "amenity/studio": {
                     "name": "Studio",
                     "terms": "recording,radio,television"
                     "name": "University Grounds",
                     "terms": "college"
                 },
+                "amenity/vending_machine": {
+                    "name": "Vending Machine",
+                    "terms": ""
+                },
+                "amenity/vending_machine/news_papers": {
+                    "name": "Newspaper Vending Machine",
+                    "terms": "newspaper"
+                },
                 "amenity/vending_machine/cigarettes": {
                     "name": "Cigarette Vending Machine",
                     "terms": "cigarette"
                     "name": "Excrement Bag Vending Machine",
                     "terms": "excrement bags,poop,dog,animal"
                 },
-                "amenity/vending_machine/news_papers": {
+                "amenity/vending_machine/newspapers": {
                     "name": "Newspaper Vending Machine",
                     "terms": "newspaper"
                 },
                     "name": "Snack Vending Machine",
                     "terms": "candy,gum,chip,pretzel,cookie,cracker"
                 },
-                "amenity/vending_machine/vending_machine": {
-                    "name": "Vending Machine",
-                    "terms": ""
-                },
                 "amenity/veterinary": {
                     "name": "Veterinary",
                     "terms": "pet clinic,veterinarian,animal hospital,pet doctor"
                     "name": "RV Drinking Water",
                     "terms": ""
                 },
+                "amenity/watering_place": {
+                    "name": "Animal Watering Place",
+                    "terms": ""
+                },
                 "area": {
                     "name": "Area",
                     "terms": ""
                     "name": "Bollard",
                     "terms": ""
                 },
+                "barrier/border_control": {
+                    "name": "Border Control",
+                    "terms": ""
+                },
                 "barrier/cattle_grid": {
                     "name": "Cattle Grid",
                     "terms": ""
                     "name": "Camp Pitch",
                     "terms": "tent,rv"
                 },
+                "club": {
+                    "name": "Club",
+                    "terms": "social"
+                },
                 "craft": {
                     "name": "Craft",
                     "terms": ""
                 },
                 "emergency/fire_hydrant": {
                     "name": "Fire Hydrant",
-                    "terms": ""
+                    "terms": "fire plug"
                 },
                 "emergency/phone": {
                     "name": "Emergency Phone",
                 },
                 "highway/motorway": {
                     "name": "Motorway",
-                    "terms": ""
+                    "terms": "autobahn,expressway,freeway,highway,interstate,parkway,thruway,turnpike"
                 },
                 "highway/path": {
                     "name": "Path",
                     "terms": ""
                 },
                 "highway/raceway": {
-                    "name": "Motor Raceway",
-                    "terms": "auto*,race*,nascar"
+                    "name": "Racetrack (Motorsport)",
+                    "terms": "auto*,formula one,kart,motocross,nascar,race*,track"
                 },
                 "highway/residential": {
                     "name": "Residential Road",
                     "name": "Service Area",
                     "terms": "services,travel plaza,service station"
                 },
+                "highway/speed_camera": {
+                    "name": "Speed Camera",
+                    "terms": ""
+                },
                 "highway/steps": {
                     "name": "Steps",
                     "terms": "stairs,staircase"
                     "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_mirror": {
+                    "name": "Traffic Mirror",
+                    "terms": "blind spot,convex,corner,curved,roadside,round,safety,sphere,visibility"
+                },
                 "highway/traffic_signals": {
                     "name": "Traffic Signals",
                     "terms": "light,stoplight,traffic light"
                     "name": "Ruins",
                     "terms": ""
                 },
+                "historic/tomb": {
+                    "name": "Tomb",
+                    "terms": ""
+                },
                 "historic/wayside_cross": {
                     "name": "Wayside Cross",
                     "terms": ""
                     "name": "Community Garden",
                     "terms": "allotment,garden"
                 },
+                "landuse/aquaculture": {
+                    "name": "Aquaculture",
+                    "terms": "fish farm,crustacean,algae,aquafarming,shrimp farm,oyster farm,mariculture,algaculture"
+                },
                 "landuse/basin": {
                     "name": "Basin",
                     "terms": ""
                 },
                 "landuse/farmland": {
                     "name": "Farmland",
-                    "terms": ""
+                    "terms": "crop,grow,plant"
                 },
                 "landuse/farmyard": {
                     "name": "Farmyard",
-                    "terms": ""
+                    "terms": "crop,grow,plant"
                 },
                 "landuse/forest": {
                     "name": "Forest",
                     "name": "Grass",
                     "terms": ""
                 },
+                "landuse/harbour": {
+                    "name": "Harbor",
+                    "terms": "boat"
+                },
                 "landuse/industrial": {
                     "name": "Industrial Area",
                     "terms": ""
                     "name": "Military Area",
                     "terms": ""
                 },
+                "landuse/military/airfield": {
+                    "name": "Military Airfield",
+                    "terms": "air force,army,base,bomb,fight,force,guard,heli*,jet,marine,navy,plane,troop,war"
+                },
+                "landuse/military/barracks": {
+                    "name": "Barracks",
+                    "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"
+                },
+                "landuse/military/bunker": {
+                    "name": "Military Bunker",
+                    "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"
+                },
+                "landuse/military/checkpoint": {
+                    "name": "Checkpoint",
+                    "terms": "air force,army,base,force,guard,marine,navy,troop,war"
+                },
+                "landuse/military/danger_area": {
+                    "name": "Danger Area",
+                    "terms": "air force,army,base,blast,bomb,explo*,force,guard,mine,marine,navy,troop,war"
+                },
+                "landuse/military/naval_base": {
+                    "name": "Naval Base",
+                    "terms": "base,fight,force,guard,marine,navy,ship,sub,troop,war"
+                },
+                "landuse/military/nuclear_explosion_site": {
+                    "name": "Nuclear Explosion Site",
+                    "terms": "atom,blast,bomb,detonat*,nuke,site,test"
+                },
+                "landuse/military/obstacle_course": {
+                    "name": "Obstacle Course",
+                    "terms": "army,base,force,guard,marine,navy,troop,war"
+                },
+                "landuse/military/office": {
+                    "name": "Military Office",
+                    "terms": "air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war"
+                },
+                "landuse/military/range": {
+                    "name": "Military Range",
+                    "terms": "air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war"
+                },
+                "landuse/military/training_area": {
+                    "name": "Training Area",
+                    "terms": "air force,army,base,fight,fire,force,guard,gun,marine,navy,rifle,shoot*,snip*,train,troop,war"
+                },
                 "landuse/orchard": {
                     "name": "Orchard",
-                    "terms": ""
+                    "terms": "fruit"
                 },
                 "landuse/plant_nursery": {
                     "name": "Plant Nursery",
-                    "terms": "vivero"
+                    "terms": "flower,garden,grow,vivero"
                 },
                 "landuse/quarry": {
                     "name": "Quarry",
                     "terms": ""
                 },
+                "landuse/railway": {
+                    "name": "Railway Corridor",
+                    "terms": "rail,train,track"
+                },
                 "landuse/recreation_ground": {
                     "name": "Recreation Ground",
                     "terms": "playing fields"
                 },
                 "landuse/vineyard": {
                     "name": "Vineyard",
-                    "terms": ""
+                    "terms": "grape,wine"
                 },
                 "leisure": {
                     "name": "Leisure",
                     "name": "Common",
                     "terms": "open space"
                 },
+                "leisure/dance": {
+                    "name": "Dance Hall",
+                    "terms": "ballroom,jive,swing,tango,waltz"
+                },
                 "leisure/dog_park": {
                     "name": "Dog Park",
                     "terms": ""
                     "name": "Golf Course",
                     "terms": "links"
                 },
+                "leisure/horse_riding": {
+                    "name": "Horseback Riding Facility",
+                    "terms": "equestrian,stable"
+                },
                 "leisure/ice_rink": {
                     "name": "Ice Rink",
                     "terms": "hockey,skating,curling"
                     "name": "Basketball Court",
                     "terms": ""
                 },
+                "leisure/pitch/beachvolleyball": {
+                    "name": "Beach Volleyball Court",
+                    "terms": "volleyball"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Bowling Green",
                     "terms": ""
                 },
+                "leisure/pitch/cricket": {
+                    "name": "Cricket Field",
+                    "terms": ""
+                },
+                "leisure/pitch/equestrian": {
+                    "name": "Riding Arena",
+                    "terms": "dressage,equestrian,horse,horseback,riding"
+                },
                 "leisure/pitch/rugby_league": {
                     "name": "Rugby League Field",
                     "terms": ""
                     "name": "Soccer Field",
                     "terms": ""
                 },
+                "leisure/pitch/table_tennis": {
+                    "name": "Ping Pong Table",
+                    "terms": "table tennis,ping pong"
+                },
                 "leisure/pitch/tennis": {
                     "name": "Tennis Court",
                     "terms": ""
                     "name": "Playground",
                     "terms": "jungle gym,play area"
                 },
-                "leisure/running_track": {
-                    "name": "Running Track",
+                "leisure/resort": {
+                    "name": "Resort",
                     "terms": ""
                 },
+                "leisure/running_track": {
+                    "name": "Racetrack (Running)",
+                    "terms": "race*,running,sprint,track"
+                },
                 "leisure/slipway": {
                     "name": "Slipway",
                     "terms": "boat launch,boat ramp"
                     "terms": "dive,water"
                 },
                 "leisure/track": {
-                    "name": "Racetrack (non-Motorsport)",
-                    "terms": ""
+                    "name": "Racetrack (Non-Motorsport)",
+                    "terms": "cycle,dog,greyhound,horse,race*,track"
                 },
                 "leisure/water_park": {
                     "name": "Water Park",
                     "terms": ""
                 },
                 "man_made/mast": {
-                    "name": "Radio Mast",
-                    "terms": "broadcast tower,cell phone tower,cell tower,guyed tower,mobile phone tower,radio tower,television tower,transmission mast,transmission tower,tv tower"
+                    "name": "Mast",
+                    "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower"
                 },
                 "man_made/observation": {
                     "name": "Observation Tower",
                     "name": "Storage Tank",
                     "terms": "water,oil,gas,petrol"
                 },
+                "man_made/surveillance_camera": {
+                    "name": "Surveillance Camera",
+                    "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
+                },
                 "man_made/surveillance": {
                     "name": "Surveillance",
-                    "terms": "cctv"
+                    "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
                 },
                 "man_made/survey_point": {
                     "name": "Survey Point",
                     "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": ""
-                },
-                "military/barracks": {
-                    "name": "Barracks",
-                    "terms": ""
-                },
-                "military/bunker": {
-                    "name": "Bunker",
-                    "terms": ""
-                },
-                "military/checkpoint": {
-                    "name": "Checkpoint",
-                    "terms": ""
-                },
-                "military/danger_area": {
-                    "name": "Danger Area",
-                    "terms": ""
-                },
-                "military/naval_base": {
-                    "name": "Naval Base",
-                    "terms": ""
-                },
-                "military/obstacle_course": {
-                    "name": "Obstacle Course",
-                    "terms": ""
-                },
-                "military/range": {
-                    "name": "Military Range",
-                    "terms": ""
-                },
-                "military/training_area": {
-                    "name": "Training area",
-                    "terms": ""
+                    "name": "Factory",
+                    "terms": "assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery"
                 },
                 "natural": {
                     "name": "Natural",
                     "terms": ""
                 },
+                "natural/bare_rock": {
+                    "name": "Bare Rock",
+                    "terms": "rock"
+                },
                 "natural/bay": {
                     "name": "Bay",
                     "terms": ""
                 },
                 "natural/beach": {
                     "name": "Beach",
-                    "terms": ""
+                    "terms": "shore"
                 },
                 "natural/cave_entrance": {
                     "name": "Cave Entrance",
                 },
                 "natural/cliff": {
                     "name": "Cliff",
-                    "terms": ""
+                    "terms": "escarpment"
                 },
                 "natural/coastline": {
                     "name": "Coastline",
                 },
                 "natural/grassland": {
                     "name": "Grassland",
-                    "terms": ""
+                    "terms": "prairie,savanna"
                 },
                 "natural/heath": {
                     "name": "Heath",
                     "name": "Peak",
                     "terms": "acme,aiguille,alp,climax,crest,crown,hill,mount,mountain,pinnacle,summit,tip,top"
                 },
+                "natural/ridge": {
+                    "name": "Ridge",
+                    "terms": "crest"
+                },
                 "natural/saddle": {
                     "name": "Saddle",
                     "terms": "pass,mountain pass,top"
                 },
+                "natural/sand": {
+                    "name": "Sand",
+                    "terms": "desert"
+                },
                 "natural/scree": {
                     "name": "Scree",
                     "terms": "loose rocks"
                     "name": "Wood",
                     "terms": "tree"
                 },
+                "noexit/yes": {
+                    "name": "No Exit",
+                    "terms": "no exit,road end,dead end"
+                },
                 "office": {
                     "name": "Office",
                     "terms": ""
                     "name": "Company Office",
                     "terms": ""
                 },
+                "office/coworking": {
+                    "name": "Coworking Space",
+                    "terms": "coworking,office"
+                },
                 "office/educational_institution": {
                     "name": "Educational Institution",
                     "terms": ""
                     "name": "Law Office",
                     "terms": ""
                 },
+                "office/lawyer/notary": {
+                    "name": "Notary Office",
+                    "terms": "clerk,signature,wills,deeds,estate"
+                },
                 "office/newspaper": {
                     "name": "Newspaper",
                     "terms": ""
                     "name": "Piste/Ski Trail",
                     "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
                 },
-                "place/city": {
-                    "name": "City",
-                    "terms": ""
-                },
                 "place/farm": {
                     "name": "Farm",
                     "terms": ""
                 },
+                "place/city": {
+                    "name": "City",
+                    "terms": ""
+                },
                 "place/hamlet": {
                     "name": "Hamlet",
                     "terms": ""
                     "name": "Neighborhood",
                     "terms": "neighbourhood"
                 },
+                "place/quarter": {
+                    "name": "Sub-Borough / Quarter",
+                    "terms": "boro,borough,quarter"
+                },
+                "place/square": {
+                    "name": "Square",
+                    "terms": ""
+                },
                 "place/suburb": {
-                    "name": "Borough",
-                    "terms": "Boro,Quarter"
+                    "name": "Borough / Suburb",
+                    "terms": "boro,borough,quarter"
                 },
                 "place/town": {
                     "name": "Town",
                     "name": "Minor Power Line",
                     "terms": ""
                 },
+                "power/plant": {
+                    "name": "Power Station Grounds",
+                    "terms": "coal,gas,generat*,hydro,nuclear,power,station"
+                },
                 "power/pole": {
                     "name": "Power Pole",
                     "terms": ""
                     "name": "Subway",
                     "terms": ""
                 },
+                "railway/tram_stop": {
+                    "name": "Tram Stop",
+                    "terms": "light rail,streetcar,tram,trolley"
+                },
                 "railway/tram": {
                     "name": "Tram",
-                    "terms": "streetcar"
+                    "terms": "light rail,streetcar,tram,trolley"
                 },
                 "relation": {
                     "name": "Relation",
                     "name": "Garden Center",
                     "terms": "landscape,mulch,shrub,tree"
                 },
+                "shop/gas": {
+                    "name": "Bottled Gas Shop",
+                    "terms": "cng,lpg,natural gas,propane,refill,tank"
+                },
                 "shop/gift": {
                     "name": "Gift Shop",
                     "terms": "souvenir"
                     "name": "Pawn Shop",
                     "terms": ""
                 },
+                "shop/perfumery": {
+                    "name": "Perfume Store",
+                    "terms": ""
+                },
                 "shop/pet": {
                     "name": "Pet Store",
-                    "terms": "cat,dog,fish"
+                    "terms": "animal,cat,dog,fish,kitten,puppy,reptile"
                 },
                 "shop/photo": {
                     "name": "Photography Store",
                     "name": "Video Store",
                     "terms": "DVD"
                 },
+                "shop/watches": {
+                    "name": "Watches Shop",
+                    "terms": ""
+                },
                 "shop/water_sports": {
                     "name": "Watersport/Swim Shop",
                     "terms": ""
                     "name": "Guest Apartment / Condo",
                     "terms": ""
                 },
+                "tourism/aquarium": {
+                    "name": "Aquarium",
+                    "terms": "fish,sea,water"
+                },
                 "tourism/artwork": {
                     "name": "Artwork",
                     "terms": "mural,sculpture,statue"
                 },
                 "tourism/zoo": {
                     "name": "Zoo",
-                    "terms": ""
+                    "terms": "animal"
                 },
                 "traffic_calming": {
                     "name": "Traffic Calming",
                     "name": "Marine Drinking Water",
                     "terms": ""
                 },
+                "waterway/waterfall": {
+                    "name": "Waterfall",
+                    "terms": "fall"
+                },
                 "waterway/weir": {
                     "name": "Weir",
                     "terms": ""