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

diff --combined config/locales/en.yml
index 06a60f977e03506df919c7ce64b266fe9c01acd3,6b910c327bfed583859ad0c523220cf496238344..d114e0a88865e5783979454282b676b782468399
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -403,30 -403,15 +403,30 @@@ en
        introduction: "Click on the map to find nearby features."
        nearby: "Nearby features"
        enclosing: "Enclosing features"
 +  nodes:
 +    timeout:
 +      sorry: "Sorry, the data for the node with the id %{id}, took too long to retrieve."
    old_nodes:
      not_found:
        sorry: "Sorry, node #%{id} version %{version} could not be found."
 +    timeout:
 +      sorry: "Sorry, the history of the node with the id %{id}, took too long to retrieve."
 +  ways:
 +    timeout:
 +      sorry: "Sorry, the data for the way with the id %{id}, took too long to retrieve."
    old_ways:
      not_found:
        sorry: "Sorry, way #%{id} version %{version} could not be found."
 +    timeout:
 +      sorry: "Sorry, the history of the way with the id %{id}, took too long to retrieve."
 +  relations:
 +    timeout:
 +      sorry: "Sorry, the data for the relation with the id %{id}, took too long to retrieve."
    old_relations:
      not_found:
        sorry: "Sorry, relation #%{id} version %{version} could not be found."
 +    timeout:
 +      sorry: "Sorry, the history of the relation with the id %{id}, took too long to retrieve."
    changeset_comments:
      feeds:
        comment:
@@@ -1449,10 -1434,6 +1449,6 @@@
          level9: "Village Boundary"
          level10: "Suburb Boundary"
          level11: "Neighbourhood Boundary"
-       types:
-         cities: Cities
-         towns: Towns
-         places: Places
      results:
        no_results: "No results found"
        more_results: "More results"
@@@ -1687,7 -1668,6 +1683,6 @@@
      changeset_comment_notification:
        description: "OpenStreetMap Changeset #%{id}"
        hi: "Hi %{to_user},"
-       greeting: "Hi,"
        commented:
          subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
          subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
@@@ -2699,7 -2679,6 +2694,6 @@@
          contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
          contributor_terms: "contributor terms"
        tou: "terms of use"
-       external auth: "Third Party Authentication:"
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
        email_help: