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

diff --combined config/locales/en.yml
index 09c2045fffeedde34d2f33e30f39fc9fb8f3e71d,164e70c8d7659e2daa14d16ecf23ec4a47f86013..e136a53c285bd5646652c61f78d8a9782ad7847f
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1607,11 -1607,9 +1607,11 @@@ en
        reportable_title:
          diary_comment: "%{entry_title}, comment #%{comment_id}"
          note: "Note #%{note_id}"
 -      reportable_dates:
 -        created_on_html: "created on %{datetime_created}"
 -        created_on_updated_on_html: "created on %{datetime_created}, updated on %{datetime_updated}"
 +      reportable_heading:
 +        diary_comment_html: "Diary Comment %{title} created on %{datetime_created}, updated on %{datetime_updated}"
 +        diary_entry_html: "Diary Entry %{title} created on %{datetime_created}, updated on %{datetime_updated}"
 +        note_html: "%{title} created on %{datetime_created}, updated on %{datetime_updated}"
 +        user_html: "User %{title} created on %{datetime_created}"
      reporters:
        index:
          title: "Issue #%{issue_id} Reporters"
@@@ -2703,8 -2701,8 +2703,8 @@@
        cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
      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."
+       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
        oauth2_applications: OAuth 2 Applications
@@@ -2757,7 -2755,7 +2757,7 @@@
      permissions:
        missing: "You have not permitted the application access to this facility"
      scopes:
-       openid: Sign-in using OpenStreetMap
+       openid: Sign in using OpenStreetMap
        read_prefs: Read user preferences
        write_prefs: Modify user preferences
        write_diary: Create diary entries and comments