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

diff --combined config/locales/en.yml
index dcb877f7b4a5803611eba9326fbd6c5ec77490ee,0dc8c7be1adb9aac32ebe2a90b0eecafbaf9b975..c7325e64f117652d13e92d51a37c51aff4fb940d
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -40,7 -40,6 +40,7 @@@ en
        messages:
          invalid_email_address: does not appear to be a valid e-mail address
          email_address_not_routable: is not routable
 +        display_name_is_user_n: can't be user_n unless n is your user id
        models:
          user_mute:
            attributes:
@@@ -428,15 -427,6 +428,15 @@@
        introduction: "Click on the map to find nearby features."
        nearby: "Nearby features"
        enclosing: "Enclosing features"
 +  old_nodes:
 +    not_found:
 +      sorry: "Sorry, node #%{id} version %{version} could not be found."
 +  old_ways:
 +    not_found:
 +      sorry: "Sorry, way #%{id} version %{version} could not be found."
 +  old_relations:
 +    not_found:
 +      sorry: "Sorry, relation #%{id} version %{version} could not be found."
    changesets:
      changeset_paging_nav:
        showing_page: "Page %{page}"
@@@ -1762,7 -1752,7 +1762,7 @@@
      new:
        title: "Lost password"
        heading: "Forgotten Password?"
 -      email address: "Email Address:"
 +      email address: "Email Address"
        new password button: "Reset password"
        help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
      create:
@@@ -1820,9 -1810,9 +1820,9 @@@
      new:
        title: "Login"
        heading: "Login"
 -      email or username: "Email Address or Username:"
 -      password: "Password:"
 -      openid_html: "%{logo} OpenID:"
 +      email or username: "Email Address or Username"
 +      password: "Password"
 +      openid_html: "%{logo} OpenID"
        remember: "Remember me"
        lost password link: "Lost your password?"
        login_button: "Login"
@@@ -2172,7 -2162,12 +2172,7 @@@
        no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
      export:
        title: "Export"
 -      area_to_export: "Area to Export"
        manually_select: "Manually select a different area"
 -      format_to_export: "Format to Export"
 -      osm_xml_data: "OpenStreetMap XML Data"
 -      map_image: "Map Image (shows standard layer)"
 -      embeddable_html: "Embeddable HTML"
        licence: "Licence"
        licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
        odbl: Open Data Commons Open Database License
@@@ -2192,6 -2187,17 +2192,6 @@@
          other:
            title: "Other Sources"
            description: "Additional sources listed on the OpenStreetMap Wiki"
 -      options: "Options"
 -      format: "Format"
 -      scale: "Scale"
 -      max: "max"
 -      image_size: "Image Size"
 -      zoom: "Zoom"
 -      add_marker: "Add a marker to the map"
 -      latitude: "Lat:"
 -      longitude: "Lon:"
 -      output: "Output"
 -      paste_html: "Paste HTML to embed in website"
        export_button: "Export"
      fixthemap:
        title: Report a problem / Fix the map
@@@ -3074,7 -3080,6 +3074,6 @@@
          transport_map: Transport Map
          tracestracktop_topo: Tracestrack Topo
          hot: Humanitarian
-         opnvkarte: ÖPNVKarte
        layers:
          header: Map Layers
          notes: Map Notes
@@@ -3091,8 -3096,6 +3090,6 @@@
        osm_france: OpenStreetMap France
        thunderforest_credit: "Tiles courtesy of %{thunderforest_link}"
        andy_allan: Andy Allan
-       opnvkarte_credit: "Tiles courtesy of %{memomaps_link}"
-       memomaps: MeMoMaps
        tracestrack_credit: "Tiles courtesy of %{tracestrack_link}"
        tracestrack: Tracestrack
        hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"