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

diff --combined config/locales/en.yml
index 28698fa522787766f63afbd153c8de37c7a5d489,fcd71d217114209b4cd652614f102fd7b135a6a2..4e74be841886eb659142b1af66f724d8e1bf9889
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -580,6 -580,8 +580,6 @@@ en
        report: Report this comment
      location:
        location: "Location:"
 -      view: "View"
 -      edit: "Edit"
        coordinates: "%{latitude}; %{longitude}"
      feed:
        user:
@@@ -2689,7 -2691,6 +2689,6 @@@
          privacy_policy_title: OSMF privacy policy including section on email addresses
          contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
          contributor_terms: "contributor terms"
-       tou: "terms of use"
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
        email_help:
@@@ -2717,9 -2718,9 +2716,9 @@@
        guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
        readable_summary: human readable summary
        informal_translations: informal translations
-       continue: Continue
+       continue: "Continue"
        declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
-       decline: "Decline"
+       cancel: "Cancel"
        you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
        legale_select: "Country of residence:"
        legale_names: