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

diff --combined config/locales/en.yml
index ab6bf8fd238670300bb83bad9aa386da98135b4a,069efb4a4f8cf3a5ee70e5db22110dcc62239f5e..dcb877f7b4a5803611eba9326fbd6c5ec77490ee
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -428,6 -428,15 +428,15 @@@ en
        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}"
@@@ -1813,7 -1822,7 +1822,7 @@@
        heading: "Login"
        email or username: "Email Address or Username"
        password: "Password"
 -      openid_html: "%{logo} OpenID:"
 +      openid_html: "%{logo} OpenID"
        remember: "Remember me"
        lost password link: "Lost your password?"
        login_button: "Login"