From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 2 Sep 2024 22:03:13 +0000 (+0300)
Subject: Merge branch 'pull/5141'
X-Git-Tag: live~617
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b816bad72615a3112ae39c26c0afcc699f16cb9d?hp=-c

Merge branch 'pull/5141'
---

b816bad72615a3112ae39c26c0afcc699f16cb9d
diff --combined config/locales/en.yml
index d5cf5b2bf,08706e42b..a3bb71b12
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -435,6 -435,12 +435,6 @@@ en
        anonymous: "Anonymous"
        no_edits: "(no edits)"
        view_changeset_details: "View changeset details"
 -    changesets:
 -      id: "ID"
 -      saved_at: "Saved at"
 -      user: "User"
 -      comment: "Comment"
 -      area: "Area"
      index:
        title: "Changesets"
        title_user: "Changesets by %{user}"
@@@ -1578,6 -1584,7 +1578,6 @@@
      gps_traces: GPS Traces
      gps_traces_tooltip: Manage GPS traces
      user_diaries: User Diaries
 -    user_diaries_tooltip: View user diaries
      edit_with: Edit with %{editor}
      tag_line: The Free Wiki World Map
      intro_header: Welcome to OpenStreetMap!
@@@ -2573,8 -2580,6 +2573,6 @@@
          other: "GPX file with %{count} points from %{user}"
        description_without_count: "GPX file from %{user}"
    application:
-     basic_auth_disabled: "HTTP Basic Authentication is disabled: %{link}"
-     auth_disabled_link: "https://wiki.openstreetmap.org/wiki/2024_authentication_update"
      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."