From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Sep 2024 18:15:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5243'
X-Git-Tag: live~535
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/edd04ef67a4652b1ec3775ec2c8a591a9e0070bd?hp=-c

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

edd04ef67a4652b1ec3775ec2c8a591a9e0070bd
diff --combined config/locales/en.yml
index 534020eba,cde02ad50..f40709e48
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1844,7 -1844,6 +1844,6 @@@ en
        failure: Couldn't update profile.
    sessions:
      new:
-       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"
@@@ -2292,7 -2291,6 +2291,6 @@@
        welcome_mat_url: https://welcome.openstreetmap.org/
      sidebar:
        search_results: Search Results
-       close: Close
      search:
        search: Search
        get_directions_title: "Find directions between two points"
@@@ -2911,9 -2909,12 +2909,9 @@@
        created: "Created:"
        duration: "Duration:"
        status: "Status:"
 -      show: "Show"
        edit: "Edit"
 -      confirm: "Are you sure?"
        reason: "Reason for block:"
        revoker: "Revoker:"
 -      needs_view: "The user needs to log in before this block will be cleared."
      block:
        not_revoked: "(not revoked)"
        show: "Show"