]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Update to iD v1.7.3
[rails.git] / vendor / assets / iD / iD / locales / en.json
index feabccf9171808831c26fdce689951ad13b43ef5..d21a16cfba269f640c96758302e22c1af2e2cb42 100644 (file)
@@ -72,7 +72,8 @@
                 "area": "Made an area circular."
             },
             "not_closed": "This can't be made circular because it's not a loop.",
-            "too_large": "This can't be made circular because not enough of it is currently visible."
+            "too_large": "This can't be made circular because not enough of it is currently visible.",
+            "connected_to_hidden": "This can't be made circular because it is connected to a hidden feature."
         },
         "orthogonalize": {
             "title": "Square",
                 "area": "Squared the corners of an area."
             },
             "not_squarish": "This can't be made square because it is not squarish.",
-            "too_large": "This can't be made square because not enough of it is currently visible."
+            "too_large": "This can't be made square because not enough of it is currently visible.",
+            "connected_to_hidden": "This can't be made square because it is connected to a hidden feature."
         },
         "straighten": {
             "title": "Straighten",
             "description": "Straighten this line.",
             "key": "S",
             "annotation": "Straightened a line.",
-            "too_bendy": "This can't be straightened because it bends too much."
+            "too_bendy": "This can't be straightened because it bends too much.",
+            "connected_to_hidden": "This line can't be straightened because it is connected to a hidden feature."
         },
         "delete": {
             "title": "Delete",
                 "relation": "Deleted a relation.",
                 "multiple": "Deleted {n} objects."
             },
-            "incomplete_relation": "This feature can't be deleted because it hasn'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."
         },
         "add_member": {
             "annotation": "Added a member to a relation."
             "description": "Disconnect these lines/areas from each other.",
             "key": "D",
             "annotation": "Disconnected lines/areas.",
-            "not_connected": "There aren't enough lines/areas here to disconnect."
+            "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."
         },
         "merge": {
             "title": "Merge",
                 "multiple": "Moved multiple objects."
             },
             "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."
+            "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."
         },
         "rotate": {
             "title": "Rotate",
                 "line": "Rotated a line.",
                 "area": "Rotated an area."
             },
-            "too_large": "This can't be rotated because not enough of it is currently visible."
+            "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."
         },
         "reverse": {
             "title": "Reverse",
                 "multiple": "Split {n} lines/area boundaries."
             },
             "not_eligible": "Lines can't be split at their beginning or end.",
-            "multiple_ways": "There are too many lines here to split."
+            "multiple_ways": "There are too many lines here to split.",
+            "connected_to_hidden": "This can't be split because it is connected to a hidden feature."
         },
         "restriction": {
             "help": {
     "logout": "logout",
     "loading_auth": "Connecting to OpenStreetMap...",
     "report_a_bug": "report a bug",
+    "feature_info": {
+        "hidden_warning": "{count} hidden features",
+        "hidden_details": "These features are currently hidden: {details}"
+    },
     "status": {
         "error": "Unable to connect to API.",
         "offline": "The API is offline. Please try editing later.",
     "commit": {
         "title": "Save Changes",
         "description_placeholder": "Brief description of your contributions",
-        "message_label": "Commit message",
+        "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",
         "list": "Edits by {users}",
         "truncated_list": "Edits by {users} and {count} others"
     },
+    "infobox": {
+        "selected": "{n} selected",
+        "geometry": "Geometry",
+        "closed": "closed",
+        "center": "Center",
+        "perimeter": "Perimeter",
+        "length": "Length",
+        "area": "Area",
+        "centroid": "Centroid",
+        "location": "Location",
+        "metric": "Metric",
+        "imperial": "Imperial"
+    },
+    "geometry": {
+        "point": "point",
+        "vertex": "vertex",
+        "line": "line",
+        "area": "area",
+        "relation": "relation"
+    },
     "geocoder": {
         "search": "Search worldwide...",
         "no_results_visible": "No results in visible map area",
         "node": "Node",
         "way": "Way",
         "relation": "Relation",
-        "location": "Location"
+        "location": "Location",
+        "add_fields": "Add field:"
     },
     "background": {
         "title": "Background",
         "fix_misalignment": "Fix alignment",
         "reset": "reset"
     },
+    "map_data": {
+        "title": "Map Data",
+        "description": "Map Data",
+        "data_layers": "Data Layers",
+        "fill_area": "Fill Areas",
+        "map_features": "Map Features",
+        "autohidden": "These features have been automatically hidden because too many would be shown on the screen.  You can zoom in to edit them."
+    },
+    "feature": {
+        "points": {
+            "description": "Points",
+            "tooltip": "Points of Interest"
+        },
+        "major_roads": {
+            "description": "Major Roads",
+            "tooltip": "Highways, Streets, etc."
+        },
+        "minor_roads": {
+            "description": "Minor Roads",
+            "tooltip": "Service Roads, Parking Aisles, Tracks, etc."
+        },
+        "paths": {
+            "description": "Paths",
+            "tooltip": "Sidewalks, Foot Paths, Cycle Paths, etc."
+        },
+        "buildings": {
+            "description": "Buildings",
+            "tooltip": "Buildings, Shelters, Garages, etc."
+        },
+        "landuse": {
+            "description": "Landuse Features",
+            "tooltip": "Forests, Farmland, Parks, Residential, Commercial, etc."
+        },
+        "boundaries": {
+            "description": "Boundaries",
+            "tooltip": "Administrative Boundaries"
+        },
+        "water": {
+            "description": "Water Features",
+            "tooltip": "Rivers, Lakes, Ponds, Basins, etc."
+        },
+        "rail": {
+            "description": "Rail Features",
+            "tooltip": "Railways"
+        },
+        "power": {
+            "description": "Power Features",
+            "tooltip": "Power Lines, Power Plants, Substations, etc."
+        },
+        "past_future": {
+            "description": "Past/Future",
+            "tooltip": "Proposed, Construction, Abandoned, Demolished, etc."
+        },
+        "others": {
+            "description": "Others",
+            "tooltip": "Everything Else"
+        }
+    },
+    "area_fill": {
+        "wireframe": {
+            "description": "No Fill (Wireframe)",
+            "tooltip": "Enabling wireframe mode makes it easy to see the background imagery."
+        },
+        "partial": {
+            "description": "Partial Fill",
+            "tooltip": "Areas are drawn with fill only around their inner edges. (Recommended for beginner mappers)"
+        },
+        "full": {
+            "description": "Full Fill",
+            "tooltip": "Areas are drawn fully filled."
+        }
+    },
     "restore": {
         "heading": "You have unsaved changes",
         "description": "Do you wish to restore unsaved changes from a previous editing session?",
         "title": "Save",
         "help": "Save changes to OpenStreetMap, making them visible to other users.",
         "no_changes": "No changes to save.",
-        "error": "An error occurred while trying 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.",
-        "unsaved_changes": "You have unsaved changes"
+        "unsaved_changes": "You have unsaved changes",
+        "conflict": {
+            "header": "Resolve conflicting edits",
+            "count": "Conflict {num} of {total}",
+            "previous": "< Previous",
+            "next": "Next >",
+            "keep_local": "Keep mine",
+            "keep_remote": "Use theirs",
+            "restore": "Restore",
+            "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"
+        }
+    },
+    "merge_remote_changes": {
+        "conflict": {
+            "deleted": "This object has been deleted by {user}.",
+            "location": "This object 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}\"."
+        }
     },
     "success": {
         "edited_osm": "Edited OSM!",
         "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"
     },
     "confirm": {
-        "okay": "Okay"
+        "okay": "Okay",
+        "cancel": "Cancel"
     },
     "splash": {
         "welcome": "Welcome to the iD OpenStreetMap editor",
     },
     "help": {
         "title": "Help",
-        "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
+        "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need to\n[log in](https://www.openstreetmap.org/login).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
         "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a rectangle.\nThis will draw a box and select all the points within it.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n",
         "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also click the 'Move' tool or press the `M` shortcut key to move the entire road at\none time, and then click again to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n",
-        "gps": "# GPS\n\nGPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright green\nline. Click on the 'Background Settings' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n",
+        "gps": "# GPS\n\nGPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright purple\nline. Click on the 'Map Data' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n",
         "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the right.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n",
         "addresses": "# Addresses\n\nAddresses are some of the most useful information for the map.\n\nAlthough addresses are often represented as parts of streets, in OpenStreetMap\nthey're recorded as attributes of buildings and places along streets.\n\nYou can add address information to places mapped as building outlines\nas well as those mapped as single points. The optimal source of address\ndata is from an on-the-ground survey or personal knowledge - as with any\nother feature, copying from commercial sources like Google Maps is strictly\nforbidden.\n",
         "inspector": "# Using the Inspector\n\nThe inspector is the section on the left side of the page that allows you to\nedit the details of the selected feature.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click icons to add other details,\nlike [Wikipedia](http://www.wikipedia.org/) information, wheelchair\naccess, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n",
             "barrier": {
                 "label": "Type"
             },
+            "bench": {
+                "label": "Bench"
+            },
             "bicycle_parking": {
                 "label": "Type"
             },
             "boundary": {
                 "label": "Type"
             },
+            "brand": {
+                "label": "Brand"
+            },
             "building": {
                 "label": "Building"
             },
             "construction": {
                 "label": "Type"
             },
+            "content": {
+                "label": "Contents"
+            },
             "country": {
                 "label": "Country"
             },
             "cuisine": {
                 "label": "Cuisine"
             },
+            "delivery": {
+                "label": "Delivery"
+            },
             "denomination": {
                 "label": "Denomination"
             },
             "description": {
                 "label": "Description"
             },
+            "drive_through": {
+                "label": "Drive-Through"
+            },
             "electrified": {
                 "label": "Electrification",
                 "placeholder": "Contact Line, Electrified Rail...",
             "gauge": {
                 "label": "Gauge"
             },
+            "gender": {
+                "label": "Gender",
+                "placeholder": "Unknown",
+                "options": {
+                    "male": "Male",
+                    "female": "Female",
+                    "unisex": "Unisex"
+                }
+            },
             "generator/method": {
                 "label": "Method"
             },
             "incline": {
                 "label": "Incline"
             },
+            "incline_steps": {
+                "label": "Incline",
+                "options": {
+                    "up": "Up",
+                    "down": "Down"
+                }
+            },
             "information": {
                 "label": "Type"
             },
             "layer": {
                 "label": "Layer"
             },
+            "leaf_cycle": {
+                "label": "Leaf Cycle",
+                "options": {
+                    "evergreen": "Evergreen",
+                    "deciduous": "Deciduous",
+                    "semi_evergreen": "Semi-Evergreen",
+                    "semi_deciduous": "Semi-Deciduous",
+                    "mixed": "Mixed"
+                }
+            },
+            "leaf_type": {
+                "label": "Leaf Type",
+                "options": {
+                    "broadleaved": "Broadleaved",
+                    "needleleaved": "Needleleaved",
+                    "mixed": "Mixed",
+                    "leafless": "Leafless"
+                }
+            },
             "leisure": {
                 "label": "Type"
             },
             "power": {
                 "label": "Type"
             },
+            "power_supply": {
+                "label": "Power Supply"
+            },
             "railway": {
                 "label": "Type"
             },
                     "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"
                 }
             },
+            "sanitary_dump_station": {
+                "label": "Toilet Disposal"
+            },
             "seasonal": {
                 "label": "Seasonal"
             },
             "service": {
                 "label": "Type"
             },
+            "service/bicycle/chain_tool": {
+                "label": "Chain Tool",
+                "options": {
+                    "undefined": "Assumed to be No",
+                    "yes": "Yes",
+                    "no": "No"
+                }
+            },
+            "service/bicycle/pump": {
+                "label": "Air Pump",
+                "options": {
+                    "undefined": "Assumed to be No",
+                    "yes": "Yes",
+                    "no": "No"
+                }
+            },
+            "service_rail": {
+                "label": "Service Type",
+                "options": {
+                    "spur": "Spur",
+                    "yard": "Yard",
+                    "siding": "Siding",
+                    "crossover": "Crossover"
+                }
+            },
             "shelter": {
                 "label": "Shelter"
             },
                     "very_bad": "High Clearance: light duty off-road vehicle",
                     "horrible": "Off-Road: heavy duty off-road vehicle",
                     "very_horrible": "Specialized off-road: tractor, ATV",
-                    "impassible": "Impassible / No wheeled vehicle"
+                    "impassable": "Impassable / No wheeled vehicle"
                 }
             },
             "social_facility_for": {
             "studio_type": {
                 "label": "Type"
             },
+            "substation": {
+                "label": "Type"
+            },
             "supervised": {
                 "label": "Supervised"
             },
             "tactile_paving": {
                 "label": "Tactile Paving"
             },
+            "takeaway": {
+                "label": "Takeaway",
+                "placeholder": "Yes, No, Takeaway Only...",
+                "options": {
+                    "yes": "Yes",
+                    "no": "No",
+                    "only": "Takeaway Only"
+                }
+            },
             "toilets/disposal": {
                 "label": "Disposal",
                 "options": {
                     "no": "No: pathless, excellent orientation skills required"
                 }
             },
-            "tree_type": {
-                "label": "Type"
-            },
             "trees": {
                 "label": "Trees"
             },
             "water": {
                 "label": "Type"
             },
+            "water_point": {
+                "label": "Water Point"
+            },
             "waterway": {
                 "label": "Type"
             },
             },
             "wikipedia": {
                 "label": "Wikipedia"
-            },
-            "wood": {
-                "label": "Type"
             }
         },
         "presets": {
                 "name": "Bicycle Rental",
                 "terms": "bike"
             },
+            "amenity/bicycle_repair_station": {
+                "name": "Bicycle Repair Station",
+                "terms": "bike"
+            },
+            "amenity/biergarten": {
+                "name": "Beer Garden",
+                "terms": "beer,bier,booze"
+            },
             "amenity/boat_rental": {
                 "name": "Boat Rental",
                 "terms": ""
                 "name": "Graveyard",
                 "terms": ""
             },
+            "amenity/grit_bin": {
+                "name": "Grit Bin",
+                "terms": "salt,sand"
+            },
             "amenity/hospital": {
                 "name": "Hospital Grounds",
                 "terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
                 "name": "Pub",
                 "terms": "dive,beer,bier,booze"
             },
+            "amenity/public_bookcase": {
+                "name": "Public Bookcase",
+                "terms": "library,bookcrossing"
+            },
             "amenity/ranger_station": {
                 "name": "Ranger Station",
                 "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center"
                 "name": "Recycling",
                 "terms": "can,bottle,garbage,scrap,trash"
             },
+            "amenity/register_office": {
+                "name": "Register Office",
+                "terms": ""
+            },
             "amenity/restaurant": {
                 "name": "Restaurant",
                 "terms": "bar,breakfast,cafe,cafĂ©,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
             },
+            "amenity/sanitary_dump_station": {
+                "name": "RV Toilet Disposal",
+                "terms": "Motor Home,Camper,Sanitary,Dump Station,Elsan,CDP,CTDP,Chemical Toilet"
+            },
             "amenity/school": {
                 "name": "School Grounds",
                 "terms": "academy,elementary school,middle school,high school"
                 "name": "Clockmaker",
                 "terms": ""
             },
-            "craft/confectionary": {
-                "name": "Confectionary",
+            "craft/confectionery": {
+                "name": "Confectionery",
                 "terms": "sweets,candy"
             },
             "craft/dressmaker": {
                 "name": "Wayside Shrine",
                 "terms": ""
             },
+            "junction": {
+                "name": "Junction",
+                "terms": ""
+            },
             "landuse": {
                 "name": "Landuse",
                 "terms": ""
                 "terms": ""
             },
             "landuse/commercial": {
-                "name": "Commercial",
+                "name": "Commercial Area",
                 "terms": ""
             },
             "landuse/construction": {
                 "terms": ""
             },
             "landuse/farm": {
-                "name": "Farm",
+                "name": "Farmland",
                 "terms": ""
             },
             "landuse/farmland": {
             },
             "landuse/forest": {
                 "name": "Forest",
+                "terms": "tree"
+            },
+            "landuse/garages": {
+                "name": "Garages",
                 "terms": ""
             },
             "landuse/grass": {
                 "terms": ""
             },
             "landuse/industrial": {
-                "name": "Industrial",
+                "name": "Industrial Area",
                 "terms": ""
             },
             "landuse/landfill": {
                 "terms": ""
             },
             "landuse/military": {
-                "name": "Military",
+                "name": "Military Area",
                 "terms": ""
             },
             "landuse/orchard": {
                 "terms": ""
             },
             "landuse/residential": {
-                "name": "Residential",
+                "name": "Residential Area",
                 "terms": ""
             },
             "landuse/retail": {
-                "name": "Retail",
+                "name": "Retail Area",
                 "terms": ""
             },
             "landuse/vineyard": {
                 "name": "Marina",
                 "terms": "boat"
             },
+            "leisure/nature_reserve": {
+                "name": "Nature Reserve",
+                "terms": "protected,wildlife"
+            },
             "leisure/park": {
                 "name": "Park",
                 "terms": "esplanade,estate,forest,garden,grass,green,grounds,lawn,lot,meadow,parkland,place,playground,plaza,pleasure garden,recreation area,square,tract,village green,woodland"
                 "name": "Lighthouse",
                 "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"
+            },
             "man_made/observation": {
                 "name": "Observation Tower",
                 "terms": "lookout tower,fire tower"
             },
+            "man_made/petroleum_well": {
+                "name": "Oil Well",
+                "terms": "drilling rig,oil derrick,oil drill,oil horse,oil rig,oil pump,petroleum well,pumpjack"
+            },
             "man_made/pier": {
                 "name": "Pier",
                 "terms": ""
                 "name": "Pipeline",
                 "terms": ""
             },
+            "man_made/silo": {
+                "name": "Silo",
+                "terms": "grain,corn,wheat"
+            },
+            "man_made/storage_tank": {
+                "name": "Storage Tank",
+                "terms": "water,oil,gas,petrol"
+            },
             "man_made/survey_point": {
                 "name": "Survey Point",
                 "terms": ""
                 "name": "Beach",
                 "terms": ""
             },
+            "natural/cave_entrance": {
+                "name": "Cave Entrance",
+                "terms": ""
+            },
             "natural/cliff": {
                 "name": "Cliff",
                 "terms": ""
             },
             "natural/wood": {
                 "name": "Wood",
-                "terms": ""
+                "terms": "tree"
             },
             "office": {
                 "name": "Office",
                 "name": "City",
                 "terms": ""
             },
+            "place/farm": {
+                "name": "Farm",
+                "terms": ""
+            },
             "place/hamlet": {
                 "name": "Hamlet",
                 "terms": ""
                 "name": "Relation",
                 "terms": ""
             },
+            "roundabout": {
+                "name": "Roundabout",
+                "terms": ""
+            },
             "route/ferry": {
                 "name": "Ferry Route",
                 "terms": ""
                 "name": "Hifi Store",
                 "terms": "stereo,video"
             },
+            "shop/houseware": {
+                "name": "Houseware Store",
+                "terms": "home,household"
+            },
             "shop/interior_decoration": {
                 "name": "Interior Decoration Store",
                 "terms": ""
             },
             "tourism/camp_site": {
                 "name": "Camp Site",
-                "terms": ""
+                "terms": "Tent"
             },
             "tourism/caravan_site": {
                 "name": "RV Park",
-                "terms": ""
+                "terms": "Motor Home,Camper"
             },
             "tourism/chalet": {
                 "name": "Chalet",
                 "name": "Drain",
                 "terms": ""
             },
+            "waterway/fuel": {
+                "name": "Marine Fuel Station",
+                "terms": "petrol,gas,diesel,boat"
+            },
             "waterway/river": {
                 "name": "River",
                 "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"
                 "name": "Riverbank",
                 "terms": ""
             },
+            "waterway/sanitary_dump_station": {
+                "name": "Marine Toilet Disposal",
+                "terms": "Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump out,Elsan,CDP,CTDP,Chemical Toilet"
+            },
             "waterway/stream": {
                 "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"