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

diff --combined config/locales/en.yml
index 2aa69699f0347fb911e021c2c38f0e63c11c5017,b74a6d31e271c9ba5fd0df182a0dd94bea4fe21a..324a806da1090c22f3e60f3bb6825e28385fd825
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2590,14 -2590,13 +2590,12 @@@ en
      permission_denied: You do not have permission to access that action
      require_cookies:
        cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
-     require_admin:
-       not_an_admin: You need to be an admin to perform that action.
      setup_user_auth:
        blocked_zero_hour: "You have an urgent message on the OpenStreetMap website. You need to read the message before you will be able to save your edits."
        blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
        need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
      settings_menu:
        account_settings: Account Settings
 -      oauth1_settings: OAuth 1 settings
        oauth2_applications: OAuth 2 applications
        oauth2_authorizations: OAuth 2 authorizations
        muted_users: Muted Users
@@@ -2623,6 -2622,28 +2621,6 @@@
          title: Log in with Wikipedia
          alt: Wikipedia logo
    oauth:
 -    authorize:
 -      title: "Authorize access to your account"
 -      request_access_html: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
 -      allow_to: "Allow the client application to:"
 -      allow_read_prefs:  "read your user preferences."
 -      allow_write_prefs: "modify your user preferences."
 -      allow_write_diary: "create diary entries, comments and make friends."
 -      allow_write_api:   "modify the map."
 -      allow_read_gpx:    "read your private GPS traces."
 -      allow_write_gpx:   "upload GPS traces."
 -      allow_write_notes: "modify notes."
 -      grant_access: "Grant Access"
 -    authorize_success:
 -      title: "Authorization request allowed"
 -      allowed_html: "You have granted application %{app_name} access to your account."
 -      verification: "The verification code is %{code}."
 -    authorize_failure:
 -      title: "Authorization request failed"
 -      denied: "You have denied application %{app_name} access to your account."
 -      invalid: "The authorization token is not valid."
 -    revoke:
 -      flash: "You've revoked the token for %{application}"
      permissions:
        missing: "You have not permitted the application access to this facility"
      scopes:
@@@ -2641,6 -2662,46 +2639,6 @@@
        skip_authorization: Auto approve application
      for_roles:
        moderator: This permission is for actions available only to moderators
 -  oauth_clients:
 -    new:
 -      title: "Register a new application"
 -      disabled: "Registration of OAuth 1 applications has been disabled"
 -    edit:
 -      title: "Edit your application"
 -    show:
 -      title: "OAuth details for %{app_name}"
 -      key: "Consumer Key:"
 -      secret: "Consumer Secret:"
 -      url: "Request Token URL:"
 -      access_url: "Access Token URL:"
 -      authorize_url: "Authorise URL:"
 -      support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures."
 -      edit: "Edit Details"
 -      delete: "Delete Client"
 -      confirm: "Are you sure?"
 -      requests: "Requesting the following permissions from the user:"
 -    index:
 -      title: "My OAuth Details"
 -      my_tokens: "My Authorised Applications"
 -      list_tokens: "The following tokens have been issued to applications in your name:"
 -      application: "Application Name"
 -      issued_at: "Issued At"
 -      revoke: "Revoke!"
 -      my_apps: "My Client Applications"
 -      no_apps_html: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service."
 -      oauth: OAuth
 -      registered_apps: "You have the following client applications registered:"
 -      register_new: "Register your application"
 -    form:
 -      requests: "Request the following permissions from the user:"
 -    not_found:
 -      sorry: "Sorry, that %{type} could not be found."
 -    create:
 -      flash: "Registered the information successfully"
 -    update:
 -      flash: "Updated the client information successfully"
 -    destroy:
 -      flash: "Destroyed the client application registration"
    oauth2_applications:
      index:
        title: "My Client Applications"