Merge branch 'pull/5141'

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2fa7294923a45cfb646636a0239b6b47b446fbf2..a3bb71b1283e2a853ccbf4f50a7d86a6c061c48b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -435,12 +435,6 @@ en:
       anonymous: "Anonymous"
       no_edits: "(no edits)"
       view_changeset_details: "View changeset details"
       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}"
     index:
       title: "Changesets"
       title_user: "Changesets by %{user}"


@@ -1584,7 +1578,6 @@ en:
     gps_traces: GPS Traces
     gps_traces_tooltip: Manage GPS traces
     user_diaries: User Diaries
     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!
     edit_with: Edit with %{editor}
     tag_line: The Free Wiki World Map
     intro_header: Welcome to OpenStreetMap!


@@ -2580,9 +2573,6 @@ en:
         other: "GPX file with %{count} points from %{user}"
       description_without_count: "GPX file from %{user}"
   application:
         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}"
-    oauth_10a_disabled: "OAuth 1.0 and 1.0a are 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."
     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."