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

diff --combined config/locales/en.yml
index 1f9792d39608c15770e62285b2d5185de26b4eaf,e4100d307d3f7edcb3262d0e8d50ef411725bb6c..6c0a780384a59549c043c78b90fb7079c0940d62
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1922,7 -1922,7 +1922,7 @@@ en
        failure: Couldn't update profile.
    sessions:
      new:
-       tab_title: "Log in"
+       tab_title: "Log In"
        login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
        email or username: "Email Address or Username"
        password: "Password"
@@@ -2653,8 -2653,8 +2653,8 @@@
        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
-       oauth2_authorizations: OAuth 2 authorizations
+       oauth2_applications: OAuth 2 Applications
+       oauth2_authorizations: OAuth 2 Authorizations
        muted_users: Muted Users
      auth_providers:
        openid_url: "OpenID URL"
@@@ -2713,7 -2713,6 +2713,7 @@@
        write_gpx: Upload GPS traces
        write_notes: Modify notes
        write_redactions: Redact map data
 +      write_blocks: Create and revoke user blocks
        read_email: Read user email address
        consume_messages: Read, update status and delete user messages
        send_messages: Send private messages to other users
@@@ -2771,7 -2770,7 +2771,7 @@@
    users:
      new:
        title: "Sign Up"
-       tab_title: "Sign up"
+       tab_title: "Sign Up"
        signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}."
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
        please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
@@@ -2904,7 -2903,7 +2904,7 @@@
        index:
          heading_html: "%{user}'s Comments"
          changesets: "Changesets"
-         diary_entries: "Diary entries"
+         diary_entries: "Diary Entries"
          no_comments: "No comments"
      changeset_comments:
        index:
@@@ -3317,9 -3316,6 +3317,9 @@@
        show_address: Show address
        query_features: Query features
        centre_map: Centre map here
 +    home:
 +      marker_title: My home location
 +      not_set: Home location is not set for your account
    redactions:
      edit:
        heading: "Edit Redaction"

diff --combined test/application_system_test_case.rb
index 496f37c16be4be820d16dfb753ab1bed77c8cd2a,76c5469b2269d87bf568677b62b10c84cb51f243..852f270b6ef713571339a1ada651a4c3ed219826
--- 1/test/application_system_test_case.rb
--- 2/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@@ -9,7 -9,6 +9,7 @@@ en
  class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
    driven_by :selenium, :using => :headless_firefox do |options|
      options.add_preference("intl.accept_languages", "en")
 +    options.binary = Settings.system_test_firefox_binary if Settings.system_test_firefox_binary
    end
  
    def before_setup
@@@ -46,4 -45,8 +46,8 @@@
    def within_content_body(&)
      within("#content > .content-body", &)
    end
+ 
+   def within_content_heading(&)
+     within("#content > .content-heading", &)
+   end
  end