Merge remote-tracking branch 'upstream/pull/5408'

diff --combined config/locales/en.yml
index 112b540440303c6cbf3e3cedcc153b6eef1fa1b3,a6fee55f4a1e173f80124ee7739248aaa837beb2..1ad17e786c9f49c91a0ac0f26355851966d3e3bf
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1001,14 -1001,6 +1001,14 @@@ en
            wayside_shrine: "Wayside Shrine"
            wreck: "Wreck"
            "yes": "Historic Site"
 +        information:
 +          guidepost: "Guidepost"
 +          board: "Information Board"
 +          map: "Map"
 +          office: "Tourist Office"
 +          terminal: "Information Terminal"
 +          sign: "Information Sign"
 +          stele: "Information Stele"
          junction:
            "yes": "Junction"
          landuse:
@@@ -1081,8 -1073,6 +1081,8 @@@
            track: "Running Track"
            water_park: "Water Park"
            "yes": "Leisure"
 +        lock:
 +          "yes": "Lock"
          man_made:
            adit: "Adit"
            advertising: "Advertising"
@@@ -1423,17 -1413,6 +1423,17 @@@
            building_passage: "Building Passage"
            culvert: "Culvert"
            "yes": "Tunnel"
 +        water:
 +          lake: "Lake"
 +          pond: "Pond"
 +          reservoir: "Reservoir"
 +          basin: "Water basin"
 +          fishpond: "Fish Pond"
 +          lagoon: "Lagoon"
 +          wastewater: "Waste Water"
 +          oxbow: "Oxbow"
 +          stream_pool: "Stream Pool"
 +          lock: "Lock"
          waterway:
            artificial: "Artificial Waterway"
            boatyard: "Boatyard"
@@@ -3053,6 -3032,9 +3053,9 @@@
        anonymous_warning_sign_up: "sign up"
        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
        add: Add Note
+     new_readonly:
+       title: "New Note"
+       warning: "New notes cannot be created because the OpenStreetMap API is currently in read-only mode."
      notes_paging_nav:
        showing_page: "Page %{page}"
        next: "Next"