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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 36698f02ce024e27dadba4f9699dbf3225b8023a..083c2e42c84d3e7a41186bb1dbe0fb7dd9609333 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -414,6 +414,18 @@ en:
   old_relations:
     not_found:
       sorry: "Sorry, relation #%{id} version %{version} could not be found."
   old_relations:
     not_found:
       sorry: "Sorry, relation #%{id} version %{version} could not be found."

+  changeset_comments:
+    feeds:
+      comment:
+        comment: "New comment on changeset #%{changeset_id} by %{author}"
+        commented_at_by_html: "Updated %{when} by %{user}"
+      comments:
+        comment: "New comment on changeset #%{changeset_id} by %{author}"
+      show:
+        title_all: OpenStreetMap changeset discussion
+        title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+      timeout:
+        sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."

   changesets:
     changeset_paging_nav:
       showing_page: "Page %{page}"
   changesets:
     changeset_paging_nav:
       showing_page: "Page %{page}"


@@ -423,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}"


@@ -490,17 +496,6 @@ en:
       relations_paginated: "Relations (%{x}-%{y} of %{count})"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
       relations_paginated: "Relations (%{x}-%{y} of %{count})"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."

-  changeset_comments:
-    comment:
-      comment: "New comment on changeset #%{changeset_id} by %{author}"
-      commented_at_by_html: "Updated %{when} by %{user}"
-    comments:
-      comment: "New comment on changeset #%{changeset_id} by %{author}"
-    index:
-      title_all: OpenStreetMap changeset discussion
-      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
-    timeout:
-      sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."

   dashboards:
     contact:
       km away: "%{count}km away"
   dashboards:
     contact:
       km away: "%{count}km away"


@@ -673,7 +668,6 @@ en:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        results_from_html: 'Results from %{results_link}'

         latlon: Internal
         osm_nominatim: OpenStreetMap Nominatim
         osm_nominatim_reverse: OpenStreetMap Nominatim
         latlon: Internal
         osm_nominatim: OpenStreetMap Nominatim
         osm_nominatim_reverse: OpenStreetMap Nominatim


@@ -1467,13 +1461,19 @@ en:
       not_updated: Not Updated
       search: Search
       search_guidance: "Search Issues:"
       not_updated: Not Updated
       search: Search
       search_guidance: "Search Issues:"

+      link_to_reports: View Reports
+      states:
+        ignored: Ignored
+        open: Open
+        resolved: Resolved
+    page:

       user_not_found: User does not exist
       issues_not_found: No such issues found
       user_not_found: User does not exist
       issues_not_found: No such issues found

+      reported_user: Reported User

       status: Status
       reports: Reports
       last_updated: Last Updated
       last_updated_time_ago_user_html: "%{time_ago} by %{user}"
       status: Status
       reports: Reports
       last_updated: Last Updated
       last_updated_time_ago_user_html: "%{time_ago} by %{user}"

-      link_to_reports: View Reports

       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"
       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"


@@ -1482,6 +1482,8 @@ en:
         ignored: Ignored
         open: Open
         resolved: Resolved
         ignored: Ignored
         open: Open
         resolved: Resolved

+      older_issues: Older Issues
+      newer_issues: Newer Issues

     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:


@@ -1570,17 +1572,11 @@ en:
     history: History
     export: Export
     issues: Issues
     history: History
     export: Export
     issues: Issues

-    data: Data
-    export_data: Export Data

     gps_traces: GPS Traces
     gps_traces: GPS Traces

-    gps_traces_tooltip: Manage GPS traces

     user_diaries: User Diaries
     user_diaries: User Diaries

-    user_diaries_tooltip: View user diaries

     edit_with: Edit with %{editor}
     edit_with: Edit with %{editor}

-    tag_line: The Free Wiki World Map

     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.

-    intro_2_create_account: "Create a user account"

     hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."
     partners_fastly: "Fastly"
     partners_corpmembers: "OSMF corporate members"
     hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."
     partners_fastly: "Fastly"
     partners_corpmembers: "OSMF corporate members"


@@ -1589,17 +1585,10 @@ en:
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     nothing_to_preview: "Nothing to preview."
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     nothing_to_preview: "Nothing to preview."

-    donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."

     help: Help
     about: About
     copyright: Copyright
     communities: Communities
     help: Help
     about: About
     copyright: Copyright
     communities: Communities

-    community: Community
-    community_blogs: "Community Blogs"
-    community_blogs_title: "Blogs from members of the OpenStreetMap community"
-    make_a_donation:
-      title: Support OpenStreetMap with a monetary donation
-      text: Make a Donation

     learn_more: "Learn More"
     more: More
   user_mailer:
     learn_more: "Learn More"
     more: More
   user_mailer:


@@ -1757,7 +1746,6 @@ en:
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"

-      reply_button: "Reply"

       destroy_button: "Delete"
       unmute_button: "Move to Inbox"
     new:
       destroy_button: "Delete"
       unmute_button: "Move to Inbox"
     new:


@@ -1773,7 +1761,6 @@ en:
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"

-      actions: "Actions"

       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"
       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"


@@ -1910,7 +1897,6 @@ en:
       help: Help
   site:
     about:
       help: Help
   site:
     about:

-      next: Next

       heading_html: "%{copyright}OpenStreetMap %{br} contributors"
       copyright_symbol_html: "©"
       used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
       heading_html: "%{copyright}OpenStreetMap %{br} contributors"
       copyright_symbol_html: "©"
       used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"


@@ -2197,7 +2183,6 @@ en:
       anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
       id_not_configured: "iD has not been configured"
       anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
       id_not_configured: "iD has not been configured"

-      no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."

     export:
       title: "Export"
       manually_select: "Manually select a different area"
     export:
       title: "Export"
       manually_select: "Manually select a different area"


@@ -2301,7 +2286,6 @@ en:
       close: Close
     search:
       search: Search
       close: Close
     search:
       search: Search

-      get_directions: "Get directions"

       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"


@@ -2501,8 +2485,6 @@ en:
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:
       updated: Trace updated
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:
       updated: Trace updated

-    trace_optionals:
-      tags: "Tags"

     show:
       title: "Viewing Trace %{name}"
       heading: "Viewing Trace %{name}"
     show:
       title: "Viewing Trace %{name}"
       heading: "Viewing Trace %{name}"


@@ -2560,8 +2542,6 @@ en:
       newer: "Newer Traces"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
       newer: "Newer Traces"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"

-    make_public:
-      made_public: "Trace made public"

     offline_warning:
       message: "The GPX file upload system is currently unavailable"
     offline:
     offline_warning:
       message: "The GPX file upload system is currently unavailable"
     offline:


@@ -2575,21 +2555,15 @@ 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."

-    require_admin:
-      not_an_admin: You need to be an admin to perform that action.

     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."
     settings_menu:
       account_settings: Account Settings
     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."
     settings_menu:
       account_settings: Account Settings

-      oauth1_settings: OAuth 1 settings

       oauth2_applications: OAuth 2 applications
       oauth2_authorizations: OAuth 2 authorizations
       muted_users: Muted Users
       oauth2_applications: OAuth 2 applications
       oauth2_authorizations: OAuth 2 authorizations
       muted_users: Muted Users


@@ -2615,28 +2589,6 @@ en:
         title: Log in with Wikipedia
         alt: Wikipedia logo
   oauth:
         title: Log in with Wikipedia
         alt: Wikipedia logo
   oauth:

-    authorize:
-      title: "Authorize access to your account"
-      request_access_html: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
-      allow_to: "Allow the client application to:"
-      allow_read_prefs:  "read your user preferences."
-      allow_write_prefs: "modify your user preferences."
-      allow_write_diary: "create diary entries, comments and make friends."
-      allow_write_api:   "modify the map."
-      allow_read_gpx:    "read your private GPS traces."
-      allow_write_gpx:   "upload GPS traces."
-      allow_write_notes: "modify notes."
-      grant_access: "Grant Access"
-    authorize_success:
-      title: "Authorization request allowed"
-      allowed_html: "You have granted application %{app_name} access to your account."
-      verification: "The verification code is %{code}."
-    authorize_failure:
-      title: "Authorization request failed"
-      denied: "You have denied application %{app_name} access to your account."
-      invalid: "The authorization token is not valid."
-    revoke:
-      flash: "You've revoked the token for %{application}"

     permissions:
       missing: "You have not permitted the application access to this facility"
     scopes:
     permissions:
       missing: "You have not permitted the application access to this facility"
     scopes:


@@ -2655,46 +2607,6 @@ en:
       skip_authorization: Auto approve application
     for_roles:
       moderator: This permission is for actions available only to moderators
       skip_authorization: Auto approve application
     for_roles:
       moderator: This permission is for actions available only to moderators

-  oauth_clients:
-    new:
-      title: "Register a new application"
-      disabled: "Registration of OAuth 1 applications has been disabled"
-    edit:
-      title: "Edit your application"
-    show:
-      title: "OAuth details for %{app_name}"
-      key: "Consumer Key:"
-      secret: "Consumer Secret:"
-      url: "Request Token URL:"
-      access_url: "Access Token URL:"
-      authorize_url: "Authorise URL:"
-      support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures."
-      edit: "Edit Details"
-      delete: "Delete Client"
-      confirm: "Are you sure?"
-      requests: "Requesting the following permissions from the user:"
-    index:
-      title: "My OAuth Details"
-      my_tokens: "My Authorised Applications"
-      list_tokens: "The following tokens have been issued to applications in your name:"
-      application: "Application Name"
-      issued_at: "Issued At"
-      revoke: "Revoke!"
-      my_apps: "My Client Applications"
-      no_apps_html: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service."
-      oauth: OAuth
-      registered_apps: "You have the following client applications registered:"
-      register_new: "Register your application"
-    form:
-      requests: "Request the following permissions from the user:"
-    not_found:
-      sorry: "Sorry, that %{type} could not be found."
-    create:
-      flash: "Registered the information successfully"
-    update:
-      flash: "Updated the client information successfully"
-    destroy:
-      flash: "Destroyed the client application registration"

   oauth2_applications:
     index:
       title: "My Client Applications"
   oauth2_applications:
     index:
       title: "My Client Applications"


@@ -2921,13 +2833,11 @@ en:
       heading: Confirm role granting
       are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
       confirm: "Confirm"
       heading: Confirm role granting
       are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
       confirm: "Confirm"

-      fail: "Could not grant role `%{role}' to user `%{name}'. Please check that the user and role are both valid."

     revoke:
       title: Confirm role revoking
       heading: Confirm role revoking
       are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
       confirm: "Confirm"
     revoke:
       title: Confirm role revoking
       heading: Confirm role revoking
       are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
       confirm: "Confirm"

-      fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid."

   user_blocks:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."
   user_blocks:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."