]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Update to iD v2.14.3
[rails.git] / vendor / assets / iD / iD / locales / en.json
index e1786907e4a0f275ad0adb22d22ad2bbaf51d89e..ad85bdf3706258a32736b9e3f2ac8d56960b3d2c 100644 (file)
                 "restriction": "These features can't be merged because it would damage a \"{relation}\" relation.",
                 "relation": "These features can't be merged because they have conflicting relation roles.",
                 "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."
+                "conflicting_tags": "These features can't be merged because some of their tags have conflicting values.",
+                "paths_intersect": "These features can't be merged because the resulting path would intersect itself."
             },
             "move": {
                 "title": "Move",
             "cancel": "Cancel",
             "changes": "{count} Changes",
             "download_changes": "Download osmChange file",
+            "errors": "Errors",
             "warnings": "Warnings",
             "modified": "Modified",
             "deleted": "Deleted",
             "created": "Created",
+            "outstanding_errors_message": "Please resolve all errors first. {count} remaining.",
+            "comment_needed_message": "Please add a changeset comment first.",
             "about_changeset_comments": "About changeset comments",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
             "google_warning": "You mentioned Google in this comment: remember that copying from Google Maps is strictly forbidden.",
             "locating": "Locating, please wait..."
         },
         "inspector": {
-            "no_documentation_combination": "There is no documentation available for this tag combination",
-            "no_documentation_key": "There is no documentation available for this key",
-            "documentation_redirect": "This documentation has been redirected to a new page",
+            "zoom_to": {
+                "key": "Z",
+                "title": "Zoom to this",
+                "tooltip_feature": "Center and zoom the map to focus on this feature.",
+                "tooltip_note": "Center and zoom the map to focus on this note.",
+                "tooltip_data": "Center and zoom the map to focus on this data.",
+                "tooltip_issue": "Center and zoom the map to focus on this issue."
+            },
             "show_more": "Show More",
             "view_on_osm": "View on openstreetmap.org",
+            "view_on_keepRight": "View on keepright.at",
             "all_fields": "All fields",
             "all_tags": "All tags",
             "all_members": "All members",
             "role": "Role",
             "choose": "Select feature type",
             "results": "{n} results for {search}",
-            "reference": "View on OpenStreetMap Wiki",
+            "no_documentation_key": "There is no documentation available.",
+            "edit_reference": "edit/translate",
+            "wiki_reference": "View documentation",
+            "wiki_en_reference": "View documentation in English",
+            "hidden_preset": {
+                "manual": "{features} are hidden. Enable them in the Map Data pane.",
+                "zoom": "{features} are hidden. Zoom in to enable them."
+            },
             "back_tooltip": "Change feature",
             "remove": "Remove",
             "search": "Search",
                     "tooltip": "Note data from OpenStreetMap",
                     "title": "OpenStreetMap notes"
                 },
+                "keepRight": {
+                    "tooltip": "Automatically detected map issues from keepright.at",
+                    "title": "KeepRight Issues"
+                },
+                "improveOSM": {
+                    "tooltip": "Missing data automatically detected by improveosm.org",
+                    "title": "ImproveOSM Issues"
+                },
                 "custom": {
                     "tooltip": "Drag and drop a data file onto the page, or click the button to setup",
                     "title": "Custom Map Data",
                 "tooltip": "Power Lines, Power Plants, Substations, etc."
             },
             "past_future": {
-                "description": "Past/Future",
+                "description": "Past/Future Features",
                 "tooltip": "Proposed, Construction, Abandoned, Demolished, etc."
             },
             "others": {
-                "description": "Others",
+                "description": "Other Features",
                 "tooltip": "Everything Else"
             }
         },
             "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_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: {p} nodes, {l} lines, {a} areas, {r} relations. 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": {
             "in": "Zoom in",
             "out": "Zoom out"
         },
         "cannot_zoom": "Cannot zoom out further in current mode.",
         "full_screen": "Toggle Full Screen",
+        "QA": {
+            "improveOSM": {
+                "title": "ImproveOSM Detection",
+                "geometry_types": {
+                    "path": "paths",
+                    "parking": "parking",
+                    "road": "roads",
+                    "both": "roads and parking"
+                },
+                "directions": {
+                    "east": "east",
+                    "north": "north",
+                    "northeast": "northeast",
+                    "northwest": "northwest",
+                    "south": "south",
+                    "southeast": "southeast",
+                    "southwest": "southwest",
+                    "west": "west"
+                },
+                "error_types": {
+                    "ow": {
+                        "title": "Missing One-way",
+                        "description": "Along this section of {highway}, {percentage}% of {num_trips} recorded trips travel from {from_node} to {to_node}. There may be missing a \"oneway\" tag."
+                    },
+                    "mr": {
+                        "title": "Missing Geometry",
+                        "description": "{num_trips} recorded trips in this area suggest there may be unmapped {geometry_type} here.",
+                        "description_alt": "Data from a 3rd party suggests there may be unmapped {geometry_type} here."
+                    },
+                    "tr": {
+                        "title": "Missing Turn Restriction",
+                        "description": "{num_passed} of {num_trips} recorded trips (travelling {travel_direction}) make a turn from {from_way} to {to_way} at {junction}. There may be a missing \"{turn_restriction}\" restriction."
+                    }
+                }
+            },
+            "keepRight": {
+                "title": "KeepRight Error",
+                "detail_title": "Error",
+                "detail_description": "Description",
+                "comment": "Comment",
+                "comment_placeholder": "Enter a comment to share with other users.",
+                "close": "Close (Error Fixed)",
+                "ignore": "Ignore (Not an Error)",
+                "save_comment": "Save Comment",
+                "close_comment": "Close and Comment",
+                "ignore_comment": "Ignore and Comment",
+                "error_parts": {
+                    "this_node": "this node",
+                    "this_way": "this way",
+                    "this_relation": "this relation",
+                    "this_oneway": "this oneway",
+                    "this_highway": "this highway",
+                    "this_railway": "this railway",
+                    "this_waterway": "this waterway",
+                    "this_cycleway": "this cycleway",
+                    "this_cycleway_footpath": "this cycleway/footpath",
+                    "this_riverbank": "this riverbank",
+                    "this_crossing": "this crossing",
+                    "this_railway_crossing": "this railway crossing",
+                    "this_bridge": "this bridge",
+                    "this_tunnel": "this tunnel",
+                    "this_boundary": "this boundary",
+                    "this_turn_restriction": "this turn restriction",
+                    "this_roundabout": "this roundabout",
+                    "this_mini_roundabout": "this mini-roundabout",
+                    "this_track": "this track",
+                    "this_feature": "this feature",
+                    "highway": "highway",
+                    "railway": "railway",
+                    "waterway": "waterway",
+                    "cycleway": "cycleway",
+                    "cycleway_footpath": "cycleway/footpath",
+                    "riverbank": "riverbank",
+                    "place_of_worship": "place of worship",
+                    "pub": "pub",
+                    "restaurant": "restaurant",
+                    "school": "school",
+                    "university": "university",
+                    "hospital": "hospital",
+                    "library": "library",
+                    "theatre": "theatre",
+                    "courthouse": "courthouse",
+                    "bank": "bank",
+                    "cinema": "cinema",
+                    "pharmacy": "pharmacy",
+                    "cafe": "cafe",
+                    "fast_food": "fast food",
+                    "fuel": "fuel",
+                    "from": "from",
+                    "to": "to",
+                    "left_hand": "left-hand",
+                    "right_hand": "right-hand"
+                },
+                "errorTypes": {
+                    "20": {
+                        "title": "Multiple nodes on the same spot",
+                        "description": "There is more than one node in this spot. Node IDs: {var1}."
+                    },
+                    "30": {
+                        "title": "Non-closed area",
+                        "description": "{var1} is tagged with \"{var2}\" and should be a closed loop."
+                    },
+                    "40": {
+                        "title": "Impossible oneway",
+                        "description": "The first node {var1} of {var2} is not connected to any other way."
+                    },
+                    "41": {
+                        "description": "The last node {var1} of {var2} is not connected to any other way."
+                    },
+                    "42": {
+                        "description": "You cannot reach {var1} because all ways leading from it are oneway."
+                    },
+                    "43": {
+                        "description": "You cannot escape from {var1} because all ways leading to it are oneway."
+                    },
+                    "50": {
+                        "title": "Almost junction",
+                        "description": "{var1} is very close but not connected to way {var2}."
+                    },
+                    "60": {
+                        "title": "Deprecated tag",
+                        "description": "{var1} uses deprecated tag \"{var2}\". Please use \"{var3}\" instead."
+                    },
+                    "70": {
+                        "title": "Missing tag",
+                        "description": "{var1} has an empty tag: \"{var2}\"."
+                    },
+                    "71": {
+                        "description": "{var1} has no tags."
+                    },
+                    "72": {
+                        "description": "{var1} is not member of any way and doesn't have any tags."
+                    },
+                    "73": {
+                        "description": "{var1} has a \"{var2}\" tag but no \"highway\" tag."
+                    },
+                    "74": {
+                        "description": "{var1} has an empty tag: \"{var2}\"."
+                    },
+                    "75": {
+                        "description": "{var1} has a name \"{var2}\" but no other tags."
+                    },
+                    "90": {
+                        "title": "Motorway without ref tag",
+                        "description": "{var1} is tagged as a motorway and therefore needs a \"ref\", \"nat_ref\", or \"int_ref\" tag."
+                    },
+                    "100": {
+                        "title": "Place of worship without religion",
+                        "description": "{var1} is tagged as a place of worship and therefore needs a religion tag."
+                    },
+                    "110": {
+                        "title": "Point of interest without name",
+                        "description": "{var1} is tagged as a \"{var2}\" and therefore needs a name tag."
+                    },
+                    "120": {
+                        "title": "Way without nodes",
+                        "description": "{var1} has just one single node."
+                    },
+                    "130": {
+                        "title": "Disconnected way",
+                        "description": "{var1} is not connected to the rest of the map."
+                    },
+                    "150": {
+                        "title": "Railway crossing without tag",
+                        "description": "{var1} of a highway and a railway needs to be tagged as \"railway=crossing\" or \"railway=level_crossing\"."
+                    },
+                    "160": {
+                        "title": "Railway layer conflict",
+                        "description": "There are ways in different layers (e.g. tunnel or bridge) meeting at {var1}."
+                    },
+                    "170": {
+                        "title": "FIXME tagged item",
+                        "description": "{var1} has a FIXME tag: {var2}"
+                    },
+                    "180": {
+                        "title": "Relation without type",
+                        "description": "{var1} is missing a \"type\" tag."
+                    },
+                    "190": {
+                        "title": "Intersection without junction",
+                        "description": "{var1} intersects the {var2} {var3} but there is no junction node, bridge, or tunnel."
+                    },
+                    "200": {
+                        "title": "Overlapping ways",
+                        "description": "{var1} overlaps the {var2} {var3}."
+                    },
+                    "210": {
+                        "title": "Self-intersecting way",
+                        "description": "There is an unspecified issue with self intersecting ways."
+                    },
+                    "211": {
+                        "description": "{var1} contains more than one node multiple times. Nodes are {var2}. This may or may not be an error."
+                    },
+                    "212": {
+                        "description": "{var1} has only two different nodes and contains one of them more than once."
+                    },
+                    "220": {
+                        "title": "Misspelled tag",
+                        "description": "{var1} is tagged \"{var2}\" where \"{var3}\" looks like \"{var4}\"."
+                    },
+                    "221": {
+                        "description": "{var1} has a suspicious tag \"{var2}\"."
+                    },
+                    "230": {
+                        "title": "Layer conflict",
+                        "description": "{var1} is a junction of ways on different layers."
+                    },
+                    "231": {
+                        "description": "{var1} is a junction of ways on different layers: {var2}.",
+                        "layer": "(layer: {layer})"
+                    },
+                    "232": {
+                        "description": "{var1} is tagged with \"layer={var2}\". This need not be an error but it looks strange."
+                    },
+                    "270": {
+                        "title": "Unusual motorway connection",
+                        "description": "{var1} is a junction of a motorway and a highway other than \"motorway\", \"motorway_link\", \"trunk\", \"rest_area\", or \"construction\". Connection to \"service\" or \"unclassified\" is only valid if it has \"access=no/private\", or it leads to a motorway service area, or if it is a \"service=parking_aisle\"."
+                    },
+                    "280": {
+                        "title": "Boundary issue",
+                        "description": "There is an unspecified issue with this boundary."
+                    },
+                    "281": {
+                        "title": "Boundary missing name",
+                        "description": "{var1} has no name."
+                    },
+                    "282": {
+                        "title": "Boundary missing admin level",
+                        "description": "The boundary of {var1} has no valid numeric admin_level. Please do not mix admin levels (e.g. \"6;7\"). Always tag the lowest admin_level of all boundaries."
+                    },
+                    "283": {
+                        "title": "Boundary not a closed loop",
+                        "description": "The boundary of {var1} is not a closed loop."
+                    },
+                    "284": {
+                        "title": "Boundary is split",
+                        "description": "The boundary of {var1} splits here."
+                    },
+                    "285": {
+                        "title": "Boundary admin_level too high",
+                        "description": "{var1} has \"admin_level={var2}\" but belongs to a relation with lower \"admin_level\" (e.g. higher priority); it should have the lowest \"admin_level\" of all relations."
+                    },
+                    "290": {
+                        "title": "Restriction issue",
+                        "description": "There is an unspecified issue with this restriction."
+                    },
+                    "291": {
+                        "title": "Restriction missing type",
+                        "description": "{var1} has an unrecognized restriction type."
+                    },
+                    "292": {
+                        "title": "Restriction missing \"from\" way",
+                        "description": "{var1} has {var2} \"from\" members, but it should have 1."
+                    },
+                    "293": {
+                        "title": "Restriction missing \"to\" way",
+                        "description": "{var1} has {var2} \"to\" members, but it should have 1."
+                    },
+                    "294": {
+                        "title": "Restriction \"from\" or \"to\" is not a way",
+                        "description": "{var1} has \"from\" or \"to\" members which should be ways. {var2}."
+                    },
+                    "295": {
+                        "title": "Restriction \"via\" is not an endpoint",
+                        "description": "{var1} has a \"via\" (node {var2}) which is not the first or the last member of \"{var3}\" (way {var4})."
+                    },
+                    "296": {
+                        "title": "Unusual restriction angle",
+                        "description": "{var1} has a restriction type \"{var2}\" but the angle is {var3} degrees. Maybe the restriction type is not appropriate?"
+                    },
+                    "297": {
+                        "title": "Wrong direction of \"to\" way",
+                        "description": "{var1} does not match the direction of \"to\" way {var2}."
+                    },
+                    "298": {
+                        "title": "Redundant restriction - oneway",
+                        "description": "{var1} may be redundant. Entry already prohibited by \"oneway\" tag on {var2}."
+                    },
+                    "300": {
+                        "title": "Missing maxspeed",
+                        "description": "{var1} is missing a \"maxspeed\" tag and is tagged as motorway, trunk, primary, or secondary."
+                    },
+                    "310": {
+                        "title": "Roundabout issue",
+                        "description": "There is an unspecified issue with this roundabout."
+                    },
+                    "311": {
+                        "title": "Roundabout not closed loop",
+                        "description": "{var1} is part of a roundabout but is not closed-loop. (Split carriageways approaching a roundabout should not be tagged as roundabout)."
+                    },
+                    "312": {
+                        "title": "Roundabout wrong direction",
+                        "description": "If {var1} is in a country with {var2} traffic then its orientation goes the wrong way around."
+                    },
+                    "313": {
+                        "title": "Roundabout weakly connected",
+                        "description": "{var1} has only {var2} other road(s) connected. Roundabouts typically have 3 or more."
+                    },
+                    "320": {
+                        "title": "Improper link connection",
+                        "description": "{var1} is tagged as \"{var2}\" but doesn't have a connection to any other \"{var3}\" or \"{var4}\"."
+                    },
+                    "350": {
+                        "title": "Improper bridge tag",
+                        "description": "{var1} doesn't have a tag in common with its surrounding ways that shows the purpose of this bridge. There should be one of these tags: {var2}."
+                    },
+                    "360": {
+                        "title": "Missing local name tag",
+                        "description": "It would be nice if {var1} had a local name tag \"name:XX={var2}\" where XX shows the language of its common name \"{var2}\"."
+                    },
+                    "370": {
+                        "title": "Doubled places",
+                        "description": "{var1} has tags in common with the surrounding way {var2} {var3} and seems to be redundant.",
+                        "including_the_name": "(including the name {name})"
+                    },
+                    "380": {
+                        "title": "Non-physical use of sport tag",
+                        "description": "{var1} is tagged \"{var2}\" but has no physical tag (e.g. \"leisure\", \"building\", \"amenity\", or \"highway\")."
+                    },
+                    "390": {
+                        "title": "Missing tracktype",
+                        "description": "{var1} doesn't have a \"tracktype\" tag."
+                    },
+                    "400": {
+                        "title": "Geometry issue",
+                        "description": "There is an unspecified issue with the geometry here."
+                    },
+                    "401": {
+                        "title": "Missing turn restriction",
+                        "description": "Ways {var1} and {var2} join in a very sharp angle here and there is no oneway tag or turn restriction that prevents turning."
+                    },
+                    "402": {
+                        "title": "Impossible angle",
+                        "description": "{var1} bends in a very sharp angle here."
+                    },
+                    "410": {
+                        "title": "Website issue",
+                        "description": "There is an unspecified issue with a contact website or URL."
+                    },
+                    "411": {
+                        "description": "{var1} may have an outdated URL: {var2} returned HTTP status code {var3}."
+                    },
+                    "412": {
+                        "description": "{var1} may have an outdated URL: {var2} contained suspicious text \"{var3}\"."
+                    },
+                    "413": {
+                        "description": "{var1} may have an outdated URL: {var2} did not contain keywords \"{var3}\"."
+                    }
+                }
+            }
+        },
         "streetside": {
             "tooltip": "Streetside photos from Microsoft",
             "title": "Photo Overlay (Bing Streetside)",
                 "navigation_zoom": "You can zoom in or out by scrolling with the mouse wheel or trackpad, or by clicking the {plus} / {minus} buttons along the side of the map. You can also use the `+`, `-` keys on your keyboard.",
                 "features_h": "Map Features",
                 "features": "We use the word *features* to describe things that appear on the map, such as roads, buildings, or points of interest. Anything in the real world can be mapped as a feature on OpenStreetMap. Map features are represented on the map using *points*, *lines*, or *areas*.",
-                "nodes_ways": "In OpenStreetmap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*."
+                "nodes_ways": "In OpenStreetMap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*."
             },
             "editing": {
                 "title": "Editing & Saving",
                 "sources": "By default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is chosen as the background image. Depending on where you are editing, other imagery sources will be available. Some may be newer or have higher resolution, so it is always useful to check and see which layer is the best one to use as a mapping reference.",
                 "offsets_h": "Adjusting Imagery Offset",
                 "offset": "Imagery is sometimes offset slightly from accurate map data. If you see a lot of roads or buildings shifted from the background imagery, it may be the imagery that's incorrect, so don't move them all to match the background. Instead, you can adjust the background so that it matches the existing data by expanding the \"Adjust Imagery Offset\" section at the bottom of the Background Settings pane.",
-                "offset_change": "Click on the small triangles to adjust the imagery offset in small steps, or hold the left mouse button and drag within the gray square to slide the imagery into alignment."
+                "offset_change": "Click on the small triangles to adjust the imagery offset in small steps, or hold the {leftclick} left mouse button and drag within the gray square to slide the imagery into alignment."
             },
             "streetlevel": {
                 "title": "Street Level Photos",
                 "tracing": "The GPS track isn't sent to OpenStreetMap - the best way to use it is to draw on the map, using it as a guide for the new features that you add.",
                 "upload": "You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) for other users to use."
             },
+            "qa": {
+                "title": "Quality Assurance",
+                "intro": "*Quality Assurance* (Q/A) tools can find improper tags, disconnected roads, and other issues with OpenStreetMap, which mappers can then fix. To view existing Q/A issues, click the {data} **Map data** panel to enable a specific Q/A layer.",
+                "tools_h": "Tools",
+                "tools": "The following tools are currently supported: [KeepRight](https://www.keepright.at/) and [ImproveOSM](https://improveosm.org/en/). Expect iD to support [Osmose](https://osmose.openstreetmap.fr/) and more Q/A tools in the future.",
+                "issues_h": "Handling Issues",
+                "issues": "Handling Q/A issues is similar to handling notes. Click on a marker to view the issue details in the sidebar. Each tool has its own capabilities, but generally you can comment and/or close an issue."
+            },
             "field": {
                 "restrictions": {
                     "title": "Turn Restrictions Help",
                 }
             }
         },
+        "issues": {
+            "title": "Issues",
+            "key": "I",
+            "list_title": "Issues ({count})",
+            "errors": {
+                "list_title": "Errors ({count})"
+            },
+            "warnings": {
+                "list_title": "Warnings ({count})"
+            },
+            "rules": {
+                "title": "Rules"
+            },
+            "no_issues": {
+                "message": "Everything looks fine",
+                "info": "Any issues will show up here as you edit"
+            },
+            "almost_junction": {
+                "title": "Almost Junctions",
+                "message": "{feature} is very close but not connected to {feature2}",
+                "highway-highway": {
+                    "tip": "Intersecting highways should share a junction vertex."
+                }
+            },
+            "crossing_ways": {
+                "title": "Crossings Ways",
+                "message": "{feature} crosses {feature2}",
+                "tip": "Highways, railways, waterways, and buildings should not cross ambiguously.",
+                "building-building": {
+                    "tip": "Buildings should not intersect except on different layers."
+                },
+                "building-highway": {
+                    "tip": "Highways crossing buildings should use bridges, tunnels, coverings, or entrances."
+                },
+                "building-railway": {
+                    "tip": "Railways crossing buildings should use bridges or tunnels."
+                },
+                "building-waterway": {
+                    "tip": "Waterways crossing buildings should use tunnels or different layers."
+                },
+                "highway-highway": {
+                    "tip": "Crossing highways should use bridges, tunnels, or intersections."
+                },
+                "highway-railway": {
+                    "tip": "Highways crossing railways should use bridges, tunnels, or level crossings."
+                },
+                "highway-waterway": {
+                    "tip": "Highways crossing waterways should use bridges, tunnels, or fords."
+                },
+                "railway-railway": {
+                    "tip": "Crossing railways should be connected or use bridges or tunnels."
+                },
+                "railway-waterway": {
+                    "tip": "Railways crossing waterways should use bridges or tunnels."
+                },
+                "waterway-waterway": {
+                    "tip": "Crossing waterways should be connected or use tunnels."
+                },
+                "tunnel-tunnel": {
+                    "tip": "Crossing tunnels should use different layers."
+                },
+                "tunnel-tunnel_connectable": {
+                    "tip": "Crossing tunnels should be connected or use different layers."
+                },
+                "bridge-bridge": {
+                    "tip": "Crossing bridges should use different layers."
+                },
+                "bridge-bridge_connectable": {
+                    "tip": "Crossing bridges should be connected or use different layers."
+                },
+                "indoor-indoor": {
+                    "tip": "Crossing indoor features should use different levels."
+                },
+                "indoor-indoor_connectable": {
+                    "tip": "Crossing indoor features should be connected or use different levels."
+                }
+            },
+            "deprecated_tag": {
+                "title": "Deprecated Tags",
+                "single": {
+                    "message": "{feature} has the outdated tag \"{tag}\""
+                },
+                "combination": {
+                    "message": "{feature} has an outdated tag combination: {tags}"
+                },
+                "tip": "Some tags become deprecated over time and should be replaced."
+            },
+            "disconnected_way": {
+                "title": "Disconnected Ways",
+                "highway": {
+                    "message": "{highway} is disconnected from other roads and paths",
+                    "tip": "Highways should connect to other highways or building entrances."
+                }
+            },
+            "generic_name": {
+                "title": "Generic Names",
+                "message": "{feature} has the generic name \"{name}\"",
+                "tip": "Names should be the actual, on-the-ground names of features."
+            },
+            "many_deletions": {
+                "title": "Many Deletions",
+                "points-lines-areas": {
+                    "message": "Deleting {n} features: {p} points, {l} lines, and {a} areas"
+                },
+                "points-lines-areas-relations": {
+                    "message": "Deleting {n} features: {p} points, {l} lines, {a} areas, and {r} relations"
+                },
+                "tip": "Only redundant or nonexistent features should be deleted."
+            },
+            "missing_role": {
+                "title": "Missing Roles",
+                "message": "{member} has no role within {relation}",
+                "multipolygon": {
+                    "tip": "Multipolygon members must have an inner or outer role."
+                }
+            },
+            "missing_tag": {
+                "title": "Missing Tags",
+                "any": {
+                    "message": "{feature} has no tags"
+                },
+                "descriptive": {
+                    "message": "{feature} has no descriptive tags"
+                },
+                "specific": {
+                    "message": "{feature} has no \"{tag}\" tag"
+                },
+                "tip": "Features must have tags that define what they are."
+            },
+            "old_multipolygon": {
+                "title": "Misplaced Multipolygon Tags",
+                "message": "{multipolygon} has misplaced tags",
+                "tip": "Multipolygons should be tagged on their relation, not their outer way."
+            },
+            "tag_suggests_area": {
+                "title": "Lines Tagged as Areas",
+                "message": "{feature} should be a closed area based on the tag \"{tag}\"",
+                "tip": "Areas must have connected endpoints."
+            },
+            "fix": {
+                "connect_almost_junction": {
+                    "annotation": "Connected very close features."
+                },
+                "connect_crossing_features": {
+                    "annotation": "Connected crossing features."
+                },
+                "connect_endpoints": {
+                    "title": "Connect the ends",
+                    "annotation": "Connected the endpoints of a way."
+                },
+                "connect_features": {
+                    "title": "Connect the features"
+                },
+                "continue_from_start": {
+                    "title": "Continue drawing from start"
+                },
+                "continue_from_end": {
+                    "title": "Continue drawing from end"
+                },
+                "delete_feature": {
+                    "title": "Delete this feature"
+                },
+                "move_tags": {
+                    "title": "Move the tags",
+                    "annotation": "Moved tags."
+                },
+                "remove_deprecated_tag": {
+                    "annotation": "Removed an old tag."
+                },
+                "remove_deprecated_tag_combo": {
+                    "annotation": "Removed an old tag combination."
+                },
+                "remove_from_relation": {
+                    "title": "Remove from relation"
+                },
+                "remove_generic_name": {
+                    "title": "Remove the name",
+                    "annotation": "Removed a generic name."
+                },
+                "remove_tag": {
+                    "title": "Remove the tag",
+                    "annotation": "Removed tag."
+                },
+                "remove_tags": {
+                    "title": "Remove the tags"
+                },
+                "reposition_features": {
+                    "title": "Reposition the features"
+                },
+                "select_preset": {
+                    "title": "Select a feature type"
+                },
+                "set_as_inner": {
+                    "title": "Set as inner"
+                },
+                "set_as_outer": {
+                    "title": "Set as outer"
+                },
+                "tag_as_disconnected": {
+                    "title": "Tag as disconnected",
+                    "annotation": "Tagged very close features as disconnected."
+                },
+                "upgrade_tag": {
+                    "title": "Upgrade the tag",
+                    "annotation": "Upgraded an old tag."
+                },
+                "upgrade_tag_combo": {
+                    "title": "Upgrade the tags",
+                    "annotation": "Upgraded an old tag combination."
+                },
+                "use_bridge_or_tunnel": {
+                    "title": "Use a bridge or tunnel"
+                },
+                "use_different_layers": {
+                    "title": "Use different layers"
+                },
+                "use_different_levels": {
+                    "title": "Use different levels"
+                },
+                "use_tunnel": {
+                    "title": "Use a tunnel"
+                }
+            }
+        },
         "intro": {
             "done": "done",
             "ok": "OK",
                 },
                 "with_selected": {
                     "title": "With feature selected",
-                    "edit_menu": "Toggle edit menu"
+                    "edit_menu": "Toggle edit menu",
+                    "zoom_to": "Zoom to selected feature"
                 },
                 "vertex_selected": {
                     "title": "With node selected",
                 "category-building": {
                     "name": "Building Features"
                 },
-                "category-golf": {
+                "category-golf-area": {
+                    "name": "Golf Features"
+                },
+                "category-golf-line": {
                     "name": "Golf Features"
                 },
                 "category-landuse": {
                 "animal_shelter": {
                     "label": "For Animals"
                 },
+                "architect": {
+                    "label": "Architect"
+                },
                 "area/highway": {
                     "label": "Type"
                 },
                 "atm": {
                     "label": "ATM"
                 },
+                "attraction": {
+                    "label": "Type"
+                },
                 "backrest": {
                     "label": "Backrest"
                 },
+                "bar": {
+                    "label": "Bar"
+                },
                 "barrier": {
                     "label": "Type"
                 },
                     }
                 },
                 "beauty": {
-                    "label": "Shop Type"
+                    "label": "Beauty Specialty"
                 },
                 "bench": {
                     "label": "Bench"
                 "building": {
                     "label": "Building"
                 },
+                "building/material": {
+                    "label": "Material"
+                },
                 "bunker_type": {
                     "label": "Type"
                 },
                 "castle_type": {
                     "label": "Type"
                 },
+                "check_date": {
+                    "label": "Last Checked Date"
+                },
                 "clothes": {
                     "label": "Clothes"
                 },
                 "country": {
                     "label": "Country"
                 },
+                "couplings": {
+                    "label": "Couplings",
+                    "placeholder": "1, 2, 3..."
+                },
                 "covered": {
                     "label": "Covered"
                 },
                 "denotation": {
                     "label": "Denotation"
                 },
+                "departures_board": {
+                    "label": "Departures Board",
+                    "options": {
+                        "yes": "Yes",
+                        "timetable": "Timetable",
+                        "realtime": "Realtime",
+                        "no": "None"
+                    }
+                },
                 "description": {
                     "label": "Description"
                 },
                 "design": {
                     "label": "Design"
                 },
+                "destination_oneway": {
+                    "label": "Destinations"
+                },
+                "destination/ref_oneway": {
+                    "label": "Destination Road Numbers"
+                },
+                "destination/symbol_oneway": {
+                    "label": "Destination Symbols"
+                },
                 "devices": {
                     "label": "Devices",
                     "placeholder": "1, 2, 3..."
                 "diaper": {
                     "label": "Diaper Changing Available"
                 },
+                "diet_multi": {
+                    "label": "Diet Types"
+                },
                 "direction_cardinal": {
                     "label": "Direction",
                     "options": {
                 "dock": {
                     "label": "Type"
                 },
+                "dog": {
+                    "label": "Dogs",
+                    "options": {
+                        "yes": "Allowed",
+                        "leashed": "Leashed Only",
+                        "no": "Not Allowed"
+                    }
+                },
                 "drive_through": {
                     "label": "Drive-Through"
                 },
                 "emergency": {
                     "label": "Emergency"
                 },
+                "enforcement": {
+                    "label": "Type"
+                },
                 "entrance": {
                     "label": "Type"
                 },
                 "fence_type": {
                     "label": "Type"
                 },
-                "fire_hydrant/position": {
-                    "label": "Position",
-                    "options": {
-                        "lane": "Lane",
-                        "parking_lot": "Parking Lot",
-                        "sidewalk": "Sidewalk",
-                        "green": "Green"
-                    }
+                "fire_hydrant/diameter": {
+                    "label": "Diameter (mm, in, or letters)"
+                },
+                "fire_hydrant/pressure": {
+                    "label": "Pressure (bar)"
                 },
                 "fire_hydrant/type": {
-                    "label": "Type",
+                    "label": "Shape",
                     "options": {
                         "pillar": "Pillar/Aboveground",
                         "underground": "Underground",
                         "wall": "Wall",
-                        "pond": "Pond"
+                        "pipe": "Capped Pipe"
                     }
                 },
                 "fireplace": {
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "frequency_electrified": {
+                    "label": "Operating Frequency"
+                },
                 "frequency": {
                     "label": "Operating Frequency"
                 },
                 "internet_access/ssid": {
                     "label": "SSID (Network Name)"
                 },
+                "junction_line": {
+                    "label": "Junction",
+                    "options": {
+                        "roundabout": "Roundabout",
+                        "circular": "Traffic Circle",
+                        "jughandle": "Jughandle"
+                    }
+                },
+                "junction/ref_oneway": {
+                    "label": "Junction Number"
+                },
                 "kerb": {
                     "label": "Curb"
                 },
                 "memorial": {
                     "label": "Type"
                 },
+                "minspeed": {
+                    "label": "Minimum Speed Limit",
+                    "placeholder": "20, 30, 40..."
+                },
                 "monitoring_multi": {
                     "label": "Monitoring"
                 },
                         "alternating": "Alternating"
                     }
                 },
+                "oneway/bicycle": {
+                    "label": "One Way (Bicycles)"
+                },
+                "opening_date": {
+                    "label": "Expected Opening Date"
+                },
                 "opening_hours": {
                     "label": "Hours"
                 },
                         "lane": "Roadside Lane"
                     }
                 },
-                "passenger_information_display": {
-                    "label": "Passenger information display"
-                },
                 "payment_multi": {
                     "label": "Payment Types"
                 },
                 "restrictions": {
                     "label": "Turn Restrictions"
                 },
+                "roof/colour": {
+                    "label": "Roof Color"
+                },
                 "rooms": {
                     "label": "Rooms"
                 },
                         "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"
                     }
                 },
+                "salt": {
+                    "label": "Salt"
+                },
                 "sanitary_dump_station": {
                     "label": "Toilet Disposal"
                 },
                 "surveillance/zone": {
                     "label": "Surveillance Zone"
                 },
+                "survey/date": {
+                    "label": "Last Survey Date"
+                },
                 "swimming_pool": {
                     "label": "Type"
                 },
                         "only": "Takeaway Only"
                     }
                 },
+                "tidal": {
+                    "label": "Tidal"
+                },
                 "to": {
                     "label": "To"
                 },
                 "tomb": {
                     "label": "Type"
                 },
-                "tourism_attraction": {
-                    "label": "Tourism"
-                },
                 "tourism": {
                     "label": "Type"
                 },
                         "scoria": "Scoria"
                     }
                 },
+                "voltage_electrified": {
+                    "label": "Voltage"
+                },
                 "voltage": {
                     "label": "Voltage"
                 },
                 "water_point": {
                     "label": "Water Point"
                 },
+                "water_source": {
+                    "label": "Water Source"
+                },
+                "water_volume": {
+                    "label": "Water Reserve Volume (m³)"
+                },
                 "water": {
                     "label": "Type"
                 },
                 },
                 "website": {
                     "label": "Website",
-                    "placeholder": "http://example.com/"
+                    "placeholder": "https://example.com"
                 },
                 "wetland": {
                     "label": "Type"
             "presets": {
                 "aerialway": {
                     "name": "Aerialway",
-                    "terms": "ski lift,funifor,funitel"
+                    "terms": ""
                 },
                 "aeroway": {
                     "name": "Aeroway",
                     "name": "Amenity",
                     "terms": ""
                 },
+                "attraction": {
+                    "name": "Attraction",
+                    "terms": ""
+                },
+                "boundary": {
+                    "name": "Boundary",
+                    "terms": ""
+                },
                 "circular": {
                     "name": "Traffic Circle",
                     "terms": ""
                     "name": "Highway",
                     "terms": ""
                 },
+                "landuse": {
+                    "name": "Land Use",
+                    "terms": ""
+                },
+                "leisure": {
+                    "name": "Leisure",
+                    "terms": ""
+                },
+                "man_made": {
+                    "name": "Man Made",
+                    "terms": ""
+                },
+                "natural": {
+                    "name": "Natural",
+                    "terms": ""
+                },
                 "place": {
                     "name": "Place",
                     "terms": ""
                     "name": "Seamark",
                     "terms": ""
                 },
+                "tourism": {
+                    "name": "Tourism",
+                    "terms": ""
+                },
                 "waterway": {
                     "name": "Waterway",
                     "terms": ""
                     "name": "Clock",
                     "terms": ""
                 },
+                "amenity/clock/sundial": {
+                    "name": "Sundial",
+                    "terms": "gnomon,shadow"
+                },
                 "amenity/college": {
                     "name": "College Grounds",
-                    "terms": "university"
+                    "terms": "university,undergraduate school"
                 },
                 "amenity/community_centre": {
                     "name": "Community Center",
                 },
                 "amenity/drinking_water": {
                     "name": "Drinking Water",
-                    "terms": "fountain,potable"
+                    "terms": "potable water source,water fountain,drinking fountain,bubbler,water tap"
                 },
                 "amenity/driving_school": {
                     "name": "Driving School",
                     "name": "Kebab Fast Food",
                     "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
                 },
+                "amenity/fast_food/mexican": {
+                    "name": "Mexican Fast Food",
+                    "terms": "breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,tacos,burritos,enchiladas,fajitas,nachos,tortillas,salsa,tamales,quesadillas"
+                },
                 "amenity/fast_food/pizza": {
                     "name": "Pizza Fast Food",
                     "terms": "dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice"
                     "terms": "interactive kiosk,ekiosk,atm,bill pay,tax pay,phone pay,finance,cash,money transfer,card"
                 },
                 "amenity/pharmacy": {
-                    "name": "Pharmacy",
-                    "terms": "apothecary,drug*,med*,prescription"
+                    "name": "Pharmacy Counter",
+                    "terms": "apothecary,drug store,drugstore,med*,prescription"
+                },
+                "amenity/photo_booth": {
+                    "name": "Photo Booth",
+                    "terms": "photobooth,photo,booth,kiosk,camera"
                 },
                 "amenity/place_of_worship": {
                     "name": "Place of Worship",
                     "terms": "stupa,vihara,monastery,temple,pagoda,zendo,dojo"
                 },
                 "amenity/place_of_worship/christian": {
-                    "name": "Church",
+                    "name": "Christian Church",
                     "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
                 },
                 "amenity/place_of_worship/hindu": {
                     "terms": "kovil,devasthana,mandir,kshetram,alayam,shrine,temple"
                 },
                 "amenity/place_of_worship/jewish": {
-                    "name": "Synagogue",
+                    "name": "Jewish Synagogue",
                     "terms": "jewish"
                 },
                 "amenity/place_of_worship/muslim": {
-                    "name": "Mosque",
+                    "name": "Muslim Mosque",
                     "terms": "muslim"
                 },
                 "amenity/place_of_worship/shinto": {
                 },
                 "amenity/university": {
                     "name": "University Grounds",
-                    "terms": "college"
+                    "terms": "college,graduate school,PhD program,master's degree program"
                 },
                 "amenity/vehicle_inspection": {
                     "name": "Vehicle Inspection",
                     "terms": "coin,crush,elongated,flatten,penny,souvenir"
                 },
                 "amenity/vending_machine/excrement_bags": {
-                    "name": "Excrement Bag Vending Machine",
-                    "terms": "excrement bags,poop,dog,animal"
+                    "name": "Excrement Bag Dispenser",
+                    "terms": "excrement bags,poop,waste,dog,animal"
                 },
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "Feminine Hygiene Vending Machine",
                     "terms": ""
                 },
                 "building/train_station": {
-                    "name": "Train Station",
+                    "name": "Train Station Building",
                     "terms": ""
                 },
                 "building/apartments": {
                     "name": "Club",
                     "terms": "social"
                 },
+                "club/sport": {
+                    "name": "Sports Club",
+                    "terms": "athletics club,sporting club,sports association,sports society"
+                },
                 "craft": {
                     "name": "Craft",
                     "terms": ""
                 },
                 "emergency/fire_hydrant": {
                     "name": "Fire Hydrant",
-                    "terms": "fire plug"
+                    "terms": "fire plug,fire water well,hydrant"
                 },
                 "emergency/first_aid_kit": {
                     "name": "First Aid Kit",
                     "name": "Sand Trap",
                     "terms": "hazard,bunker"
                 },
+                "golf/cartpath_service": {
+                    "name": "Golf Cartpath / Service Road",
+                    "terms": ""
+                },
+                "golf/cartpath": {
+                    "name": "Golf Cartpath",
+                    "terms": ""
+                },
+                "golf/driving_range": {
+                    "name": "Driving Range",
+                    "terms": ""
+                },
                 "golf/fairway": {
                     "name": "Fairway",
                     "terms": ""
                     "name": "Golf Hole",
                     "terms": ""
                 },
-                "golf/lateral_water_hazard_area": {
+                "golf/lateral_water_hazard": {
                     "name": "Lateral Water Hazard",
                     "terms": ""
                 },
-                "golf/lateral_water_hazard_line": {
-                    "name": "Lateral Water Hazard",
+                "golf/path": {
+                    "name": "Golf Walking Path",
                     "terms": ""
                 },
                 "golf/rough": {
                     "name": "Tee Box",
                     "terms": "teeing ground"
                 },
-                "golf/water_hazard_area": {
-                    "name": "Water Hazard",
-                    "terms": ""
-                },
-                "golf/water_hazard_line": {
+                "golf/water_hazard": {
                     "name": "Water Hazard",
                     "terms": ""
                 },
                     "name": "Bus Guideway",
                     "terms": ""
                 },
+                "highway/construction": {
+                    "name": "Road Closed",
+                    "terms": "closed,closure,construction"
+                },
                 "highway/corridor": {
                     "name": "Indoor Corridor",
                     "terms": "gallery,hall,hallway,indoor,passage,passageway"
                     "name": "Junction",
                     "terms": ""
                 },
-                "landuse": {
-                    "name": "Land Use",
+                "landuse/basin": {
+                    "name": "Basin",
                     "terms": ""
                 },
                 "landuse/farm": {
                     "name": "Farmland",
                     "terms": ""
                 },
+                "landuse/pond": {
+                    "name": "Pond",
+                    "terms": ""
+                },
+                "landuse/reservoir": {
+                    "name": "Reservoir",
+                    "terms": ""
+                },
                 "landuse/allotments": {
                     "name": "Community Garden",
                     "terms": "allotment,garden"
                     "name": "Aquaculture",
                     "terms": "fish farm,crustacean,algae,aquafarming,shrimp farm,oyster farm,mariculture,algaculture"
                 },
-                "landuse/basin": {
-                    "name": "Basin",
-                    "terms": ""
-                },
                 "landuse/brownfield": {
                     "name": "Brownfield",
                     "terms": ""
                     "terms": "crop,grow,plant"
                 },
                 "landuse/forest": {
-                    "name": "Forest",
-                    "terms": "cut,forest,lumber,tree"
+                    "name": "Managed Forest",
+                    "terms": "cut,forest,forestry,lumber,silviculture,tree"
                 },
                 "landuse/garages": {
                     "name": "Garage Landuse",
                     "name": "Vineyard",
                     "terms": "grape,wine"
                 },
-                "leisure": {
-                    "name": "Leisure",
-                    "terms": ""
-                },
                 "leisure/adult_gaming_centre": {
                     "name": "Adult Gaming Center",
                     "terms": "gambling,slot machine"
                 },
                 "leisure/fitness_centre/yoga": {
                     "name": "Yoga Studio",
-                    "terms": "studio"
+                    "terms": "studio,asanas,modern yoga,meditation"
                 },
                 "leisure/fitness_station": {
                     "name": "Outdoor Fitness Station",
                     "name": "Picnic Table",
                     "terms": "bench"
                 },
+                "leisure/picnic_table/chess": {
+                    "name": "Chess Table",
+                    "terms": "bench,chess board,checkerboard,checkers,chequerboard,game table"
+                },
                 "leisure/pitch": {
                     "name": "Sport Pitch",
                     "terms": "field"
                 },
                 "leisure/pitch/american_football": {
                     "name": "American Football Field",
-                    "terms": ""
+                    "terms": "football,gridiron"
+                },
+                "leisure/pitch/australian_football": {
+                    "name": "Australian Football Field",
+                    "terms": "Aussie,AFL,football"
                 },
                 "leisure/pitch/badminton": {
                     "name": "Badminton Court",
                     "name": "Riding Arena",
                     "terms": "dressage,equestrian,horse,horseback,riding"
                 },
+                "leisure/pitch/netball": {
+                    "name": "Netball Court",
+                    "terms": ""
+                },
                 "leisure/pitch/rugby_league": {
                     "name": "Rugby League Field",
                     "terms": ""
                     "name": "Resort",
                     "terms": ""
                 },
-                "leisure/running_track": {
-                    "name": "Racetrack (Running)",
-                    "terms": "race*,running,sprint,track"
-                },
                 "leisure/sauna": {
                     "name": "Sauna",
                     "terms": ""
                     "name": "Sports Center / Complex",
                     "terms": ""
                 },
+                "leisure/sports_centre/climbing": {
+                    "name": "Climbing Gym",
+                    "terms": "abseiling,artificial climbing wall,belaying,bouldering,rock climbing facility,indoor rock wall,rappeling,rock gym,ropes"
+                },
                 "leisure/sports_centre/swimming": {
                     "name": "Swimming Pool Facility",
                     "terms": "dive,water"
                     "name": "Racetrack (Non-Motorsport)",
                     "terms": "cycle,dog,greyhound,horse,race*,track"
                 },
+                "leisure/track/horse_racing": {
+                    "name": "Racetrack (Horse Racing)",
+                    "terms": "race*,horse,track"
+                },
+                "leisure/track/running": {
+                    "name": "Racetrack (Running)",
+                    "terms": "race*,running,sprint,track"
+                },
                 "leisure/water_park": {
                     "name": "Water Park",
                     "terms": "swim,pool,dive"
                     "name": "Line",
                     "terms": ""
                 },
-                "man_made": {
-                    "name": "Man Made",
-                    "terms": ""
-                },
                 "man_made/adit": {
                     "name": "Adit",
                     "terms": "entrance,underground,mine,cave"
                     "name": "Tower",
                     "terms": ""
                 },
+                "man_made/tower/bell_tower": {
+                    "name": "Bell Tower",
+                    "terms": "belfry,bell gable,campanile,church tower,klockstapel"
+                },
                 "man_made/tower/communication": {
                     "name": "Communication Tower",
                     "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/tower/minaret": {
+                    "name": "Minaret",
+                    "terms": "Islam,mosque,Muezzin,Muslim"
+                },
                 "man_made/tower/observation": {
                     "name": "Observation Tower",
                     "terms": "lookout tower,fire tower"
                     "name": "Telecom Manhole",
                     "terms": "cover,phone,hole,telecom,telephone,bt"
                 },
-                "natural": {
-                    "name": "Natural",
-                    "terms": ""
-                },
                 "natural/bare_rock": {
                     "name": "Bare Rock",
                     "terms": "rock"
                     "name": "Water",
                     "terms": ""
                 },
+                "natural/water/basin": {
+                    "name": "Basin",
+                    "terms": "detention,drain,overflow,rain,retention"
+                },
+                "natural/water/canal": {
+                    "name": "Canal",
+                    "terms": ""
+                },
                 "natural/water/lake": {
                     "name": "Lake",
                     "terms": "lakelet,loch,mere"
                     "name": "Reservoir",
                     "terms": ""
                 },
+                "natural/water/river": {
+                    "name": "River",
+                    "terms": "beck,branch,brook,course,creek,estuary,rill,riverbank,rivulet,run,runnel,stream,tributary,watercourse"
+                },
+                "natural/water/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"
+                },
                 "natural/wetland": {
                     "name": "Wetland",
                     "terms": "bog,marsh,reedbed,swamp,tidalflat"
                 },
                 "office/estate_agent": {
                     "name": "Real Estate Office",
-                    "terms": ""
+                    "terms": "real estate"
                 },
                 "office/financial": {
                     "name": "Financial Office",
                     "name": "Downhill Piste/Ski Run",
                     "terms": "ski,alpine,snowboard,downhill,piste"
                 },
+                "piste/downhill/halfpipe": {
+                    "name": "Halfpipe",
+                    "terms": "ski,alpine,halfpipe,half pipe,snowboard,downhill,piste"
+                },
                 "piste/hike": {
                     "name": "Snowshoeing or Winter Hiking Trail",
                     "terms": "hike,winter hiking,snowshoe,snowshoeing,piste,ski"
                     "name": "Transformer",
                     "terms": ""
                 },
-                "public_transport/linear_platform_aerialway": {
-                    "name": "Aerialway Stop / Platform",
-                    "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
-                },
-                "public_transport/linear_platform_bus": {
-                    "name": "Bus Stop / Platform",
-                    "terms": "bus,platform,public transit,public transportation,transit,transportation"
-                },
-                "public_transport/linear_platform_ferry": {
-                    "name": "Ferry Stop / Platform",
-                    "terms": "boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation"
-                },
-                "public_transport/linear_platform_light_rail": {
-                    "name": "Light Rail Stop / Platform",
-                    "terms": "electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
-                },
-                "public_transport/linear_platform_monorail": {
-                    "name": "Monorail Stop / Platform",
-                    "terms": "monorail,platform,public transit,public transportation,rail,transit,transportation"
-                },
-                "public_transport/linear_platform_subway": {
-                    "name": "Subway Stop / Platform",
-                    "terms": "metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground"
-                },
-                "public_transport/linear_platform_train": {
-                    "name": "Train Stop / Platform",
-                    "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
-                },
-                "public_transport/linear_platform_tram": {
-                    "name": "Tram Stop / Platform",
-                    "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
-                },
-                "public_transport/linear_platform_trolleybus": {
-                    "name": "Trolleybus Stop / Platform",
-                    "terms": "bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
-                },
-                "public_transport/linear_platform": {
-                    "name": "Transit Stop / Platform",
-                    "terms": "platform,public transit,public transportation,transit,transportation"
-                },
                 "public_transport/platform_aerialway": {
                     "name": "Aerialway Stop / Platform",
                     "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
                 },
                 "shop/bakery": {
                     "name": "Bakery",
-                    "terms": ""
+                    "terms": "bread,cakes,rolls"
                 },
                 "shop/bathroom_furnishing": {
                     "name": "Bathroom Furnishing Store",
                 },
                 "shop/beverages": {
                     "name": "Beverage Store",
-                    "terms": ""
+                    "terms": "drinks"
                 },
                 "shop/bicycle": {
                     "name": "Bicycle Shop",
-                    "terms": "bike,repair"
+                    "terms": "bike,repair,tricycle,unicycle"
                 },
                 "shop/bookmaker": {
                     "name": "Bookmaker",
-                    "terms": "betting"
+                    "terms": "betting,bookie"
                 },
                 "shop/books": {
                     "name": "Book Store",
                 },
                 "shop/butcher": {
                     "name": "Butcher",
-                    "terms": "meat"
+                    "terms": "chicken,beef,lamb,meat,pork"
                 },
                 "shop/candles": {
                     "name": "Candle Shop",
-                    "terms": ""
+                    "terms": "wax"
                 },
                 "shop/car_parts": {
                     "name": "Car Parts Store",
-                    "terms": "auto"
+                    "terms": "automobile,automotive"
                 },
                 "shop/car_repair": {
                     "name": "Car Repair Shop",
-                    "terms": "auto,garage,service"
+                    "terms": "automobile,automotive,garage,service"
                 },
                 "shop/car": {
                     "name": "Car Dealership",
-                    "terms": "auto"
+                    "terms": "automobile,automotive"
+                },
+                "shop/caravan": {
+                    "name": "RV Dealership",
+                    "terms": "auto,camper,recreational vehicle"
                 },
                 "shop/carpet": {
                     "name": "Carpet Store",
                 },
                 "shop/chemist": {
                     "name": "Drugstore",
-                    "terms": "apothecary,med*,drug*,gift"
+                    "terms": "apothecary,beauty,drug store,drugstore,gift,hair,med*,pharmacy,prescription,tooth"
                 },
                 "shop/chocolate": {
                     "name": "Chocolate Store",
-                    "terms": ""
+                    "terms": "cocoa"
                 },
                 "shop/clothes": {
                     "name": "Clothing Store",
                 },
                 "shop/computer": {
                     "name": "Computer Store",
-                    "terms": ""
+                    "terms": "desktop,laptop,hardware,operating system,software"
                 },
                 "shop/confectionery": {
                     "name": "Candy Store",
                 },
                 "shop/copyshop": {
                     "name": "Copy Store",
-                    "terms": ""
+                    "terms": "print,scan"
                 },
                 "shop/cosmetics": {
                     "name": "Cosmetics Store",
-                    "terms": ""
+                    "terms": "make-up,makeup"
                 },
                 "shop/country_store": {
                     "name": "Country Store",
                 },
                 "shop/e-cigarette": {
                     "name": "E-Cigarette Shop",
-                    "terms": "electronic,vapor"
+                    "terms": "electronic,vape,vaping,vapor"
                 },
                 "shop/electronics": {
                     "name": "Electronics Store",
                     "name": "Fashion Store",
                     "terms": ""
                 },
+                "shop/fireplace": {
+                    "name": "Fireplace Store",
+                    "terms": "fireplace,stove,masonry heater"
+                },
+                "shop/fishing": {
+                    "name": "Fishing Shop",
+                    "terms": "bait,fishing line,flies,fly,lure,reel,rod,tackle"
+                },
                 "shop/florist": {
                     "name": "Florist",
                     "terms": "flower"
                     "name": "Framing Shop",
                     "terms": "art*,paint*,photo*,frame"
                 },
+                "shop/frozen_food": {
+                    "name": "Frozen Food",
+                    "terms": ""
+                },
+                "shop/fuel": {
+                    "name": "Fuel Shop",
+                    "terms": ""
+                },
                 "shop/funeral_directors": {
                     "name": "Funeral Home",
                     "terms": "undertaker,memorial home"
                 },
                 "shop/greengrocer": {
                     "name": "Greengrocer",
-                    "terms": "fruit,vegetable"
+                    "terms": "fruit,produce,vegetable"
                 },
                 "shop/hairdresser_supply": {
                     "name": "Hairdresser Supply Store",
                 },
                 "shop/hifi": {
                     "name": "Hifi Store",
-                    "terms": "stereo,video"
+                    "terms": "audio,hi-fi,high fidelity,stereo,video"
                 },
                 "shop/houseware": {
                     "name": "Houseware Store",
                     "terms": "home,household"
                 },
+                "shop/hunting": {
+                    "name": "Hunting Shop",
+                    "terms": "arrows,bows,bullets,crossbows,rifles,traps"
+                },
                 "shop/interior_decoration": {
                     "name": "Interior Decoration Store",
                     "terms": ""
                 },
                 "shop/jewelry": {
-                    "name": "Jeweler",
-                    "terms": "diamond,gem,ring"
+                    "name": "Jewelry Store",
+                    "terms": "bracelet,diamond,earrings,gem,gold,jeweler,jewellery,jeweller,necklace,pins,ring,silver"
                 },
                 "shop/kiosk": {
                     "name": "Kiosk",
                 },
                 "shop/kitchen": {
                     "name": "Kitchen Design Store",
-                    "terms": ""
+                    "terms": "cabinets,countertops,sinks"
                 },
                 "shop/laundry": {
                     "name": "Laundry",
                 },
                 "shop/music": {
                     "name": "Music Store",
-                    "terms": "CD,vinyl"
+                    "terms": "tape casettes,CDs,compact discs,vinyl records"
                 },
                 "shop/musical_instrument": {
                     "name": "Musical Instrument Store",
                 },
                 "shop/outdoor": {
                     "name": "Outdoors Store",
-                    "terms": "camping,climbing,hiking"
+                    "terms": "camping,climbing,hiking,outfitter,outdoor equipment,outdoor supplies"
                 },
                 "shop/paint": {
                     "name": "Paint Store",
                 },
                 "shop/pet_grooming": {
                     "name": "Pet Grooming Store",
-                    "terms": "dog"
+                    "terms": "cat,dog"
                 },
                 "shop/pet": {
                     "name": "Pet Store",
                 },
                 "shop/radiotechnics": {
                     "name": "Radio/Electronic Component Store",
-                    "terms": ""
+                    "terms": "antenna,transistor"
                 },
                 "shop/religion": {
                     "name": "Religious Store",
                 },
                 "shop/shoes": {
                     "name": "Shoe Store",
-                    "terms": ""
+                    "terms": "boots,cleats,clogs,heels,loafers,oxfords,sneakers"
                 },
                 "shop/sports": {
                     "name": "Sporting Goods Store",
-                    "terms": ""
+                    "terms": "athletics"
                 },
                 "shop/stationery": {
                     "name": "Stationery Store",
                 },
                 "shop/storage_rental": {
                     "name": "Storage Rental",
-                    "terms": ""
+                    "terms": "garages"
                 },
                 "shop/supermarket": {
                     "name": "Supermarket",
                 },
                 "shop/tattoo": {
                     "name": "Tattoo Parlor",
-                    "terms": ""
+                    "terms": "ink"
                 },
                 "shop/tea": {
                     "name": "Tea Store",
                 },
                 "shop/ticket": {
                     "name": "Ticket Seller",
-                    "terms": ""
+                    "terms": "box office"
                 },
                 "shop/tiles": {
                     "name": "Tile Shop",
                 },
                 "shop/tobacco": {
                     "name": "Tobacco Shop",
-                    "terms": ""
+                    "terms": "cigarettes,cigars"
                 },
                 "shop/toys": {
                     "name": "Toy Store",
-                    "terms": ""
+                    "terms": "games"
                 },
                 "shop/trade": {
                     "name": "Trade Shop",
                 },
                 "shop/video": {
                     "name": "Video Store",
-                    "terms": "DVD"
+                    "terms": "DVD,VHS,video casette"
                 },
                 "shop/watches": {
                     "name": "Watches Shop",
                     "name": "Watersport/Swim Shop",
                     "terms": ""
                 },
+                "shop/water": {
+                    "name": "Drinking Water Shop",
+                    "terms": ""
+                },
                 "shop/weapons": {
                     "name": "Weapon Shop",
                     "terms": "ammo,gun,knife,knives"
                     "name": "Wine Shop",
                     "terms": ""
                 },
-                "tourism": {
-                    "name": "Tourism",
-                    "terms": ""
-                },
                 "tourism/alpine_hut": {
                     "name": "Alpine Hut",
                     "terms": "climbing hut"
                     "name": "Administrative Boundary",
                     "terms": ""
                 },
+                "type/enforcement": {
+                    "name": "Enforcement",
+                    "terms": ""
+                },
                 "type/restriction": {
                     "name": "Restriction",
                     "terms": ""
                     "name": "Other",
                     "terms": ""
                 },
+                "waterway/riverbank": {
+                    "name": "Riverbank",
+                    "terms": ""
+                },
                 "waterway/boatyard": {
                     "name": "Boatyard",
                     "terms": ""
                     "name": "River",
                     "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"
                 },
-                "waterway/riverbank": {
-                    "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"
                 "description": "Japan GSI ortho Imagery. Usually better than bing, but a bit older.",
                 "name": "Japan GSI ortho Imagery"
             },
+            "gsi.go.jp_airphoto": {
+                "attribution": {
+                    "text": "GSI Japan"
+                },
+                "description": "Japan GSI airphoto Imagery. Not fully orthorectified, but a bit newer and/or differently covered than GSI ortho Imagery.",
+                "name": "Japan GSI airphoto Imagery"
+            },
+            "gsi.go.jp_seamlessphoto": {
+                "attribution": {
+                    "text": "GSI Japan seamless photo"
+                },
+                "description": "Japan GSI seamlessphoto Imagery. The collection of latest imageries of GSI ortho, airphoto, post disaster and others.",
+                "name": "Japan GSI seamlessphoto Imagery"
+            },
             "gsi.go.jp_std_map": {
                 "attribution": {
                     "text": "GSI Japan"
                 "description": "Improve OpenStreetMap in Indonesia",
                 "extendedDescription": "Mapping in Indonesia? Have questions, want to connect with the community here? Join us at {Url}. All are welcome!"
             },
+            "osm-iran-aparat": {
+                "name": "OpenStreetMap Iran Aparat",
+                "description": "Subscribe to our channel at {url}",
+                "extendedDescription": "A good resource of videos about anything related to OpenStreetMap. Mainly in Persian."
+            },
+            "osm-iran-forum": {
+                "name": "OpenStreetMap Iran web forum",
+                "description": "OpenStreetMap Iran web forum",
+                "extendedDescription": "A web forum for OpenStreetMap users in Iran. Feel free to ask questions and discuss with others!"
+            },
+            "osm-iran-telegram": {
+                "name": "OpenStreetMap Iran Telegram",
+                "description": "You're welcome to join our Telegram channel at {url}. We also have a supergroup of many OSMers interested in Iran. Find its link in bio of channel."
+            },
             "OSM-japan-facebook": {
                 "name": "OpenStreetMap Japan Community",
                 "description": "Mappers and OpenStreetMap users in Japan"
                 "name": "OpenStreetMap Japan",
                 "description": "Mappers and OpenStreetMap users in Japan"
             },
-            "OSM-korea-telegram": {
-                "name": "OSM Korea Telegram Channel",
-                "description": "Unofficial Channnel for OpenStreetMap contributors, communities and users in Korea to share and discuss."
-            },
             "OSM-MY-facebook": {
                 "name": "OpenStreetMap Malaysia on Facebook",
                 "description": "For chat about anything related to OpenStreetMap!"
                 "description": "Improve OpenStreetMap in Nepal",
                 "extendedDescription": "Mapping in Nepal? Have questions, want to connect with the community here? Join us at {Url}. All are welcome!"
             },
+            "OSM-Asia-mailinglist": {
+                "name": "OpenStreetMap Asia Mailinglist",
+                "description": "Talk-asia is the official Mailinglist for Asian Community"
+            },
+            "osm-asia-telegram": {
+                "name": "OpenStreetMap Asia Telegram",
+                "description": "Join our family: {url}"
+            },
             "OSM-PH-facebook": {
                 "name": "OpenStreetMap PH Facebook",
                 "description": "Welcome to OpenStreetMap Philippines, where we encourage all fellow Filipinos to contribute to the OpenStreetMap project."
                 "name": "OpenStreetMap RU telegram",
                 "description": "OpenStreetMap Russia telegram chat"
             },
-            "OSM-LKA-facebook": {
+            "OSM-south-korea-telegram": {
+                "name": "OSM South Korea Telegram",
+                "description": "Unofficial Channnel for OpenStreetMap contributors, communities, and users in South Korea to share and discuss."
+            },
+            "OSM-sri-lanka-facebook": {
                 "name": "OpenStreetMap Sri Lanka",
                 "description": "Improve OpenStreetMap in Sri Lanka",
                 "extendedDescription": "Mapping in Sri Lanka? Have questions, want to connect with the community here? Join us at {Url}. All are welcome!"
                 "name": "OpenStreetMap Norway mailing list",
                 "description": "Mailing list for mappers and OpenStreetMap users, developers and enthusiasts in Norway"
             },
+            "no-telegram": {
+                "name": "@OSM_no on Telegram",
+                "description": "OpenStreetMap Norway Telegram chat"
+            },
             "OSM-PL-facebook-group": {
                 "name": "OpenStreetMap Poland Facebook group",
                 "description": "Group for mappers and users of OpenStreetMap in Poland"