Switch to using rails builtin content security policy support

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 95edb8bb5e1227af782f115f6e8c370c54ca9ce4..7b463421036030b059fb757657dbc1631d27100f 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -142,7 +142,6 @@ en:
         auth_provider: Authentication Provider
         auth_uid: Authentication UID
         email: "Email"
         auth_provider: Authentication Provider
         auth_uid: Authentication UID
         email: "Email"

-        email_confirmation: "Email Confirmation"

         new_email: "New Email Address"
         active: "Active"
         display_name: "Display Name"
         new_email: "New Email Address"
         active: "Active"
         display_name: "Display Name"


@@ -634,6 +633,9 @@ en:
       contact_url_title: Various contact channels explained
       contact: contact
       contact_the_community_html: Feel free to %{contact_link} the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.
       contact_url_title: Various contact channels explained
       contact: contact
       contact_the_community_html: Feel free to %{contact_link} the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.

+    bad_request:
+      title: Bad request
+      description: The operation you requested on the OpenStreetMap server is not valid (HTTP 400)

     forbidden:
       title: Forbidden
       description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)
     forbidden:
       title: Forbidden
       description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)


@@ -1671,8 +1673,8 @@ en:
         your_note_html: "%{commenter} has reactivated one of your map notes near %{place}."
         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
         commented_note_html: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
         your_note_html: "%{commenter} has reactivated one of your map notes near %{place}."
         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
         commented_note_html: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."

-      details: "More details about the note can be found at %{url}."
-      details_html: "More details about the note can be found at %{url}."
+      details: "Reply or learn more about the note at %{url}."
+      details_html: "Reply or learn more about the note at %{url}."

     changeset_comment_notification:
       description: "OpenStreetMap Changeset #%{id}"
       hi: "Hi %{to_user},"
     changeset_comment_notification:
       description: "OpenStreetMap Changeset #%{id}"
       hi: "Hi %{to_user},"


@@ -1687,8 +1689,8 @@ en:
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
         partial_changeset_with_comment_html: "with comment '%{changeset_comment}'"
         partial_changeset_without_comment: "without comment"
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
         partial_changeset_with_comment_html: "with comment '%{changeset_comment}'"
         partial_changeset_without_comment: "without comment"

-      details: "More details about the changeset can be found at %{url}."
-      details_html: "More details about the changeset can be found at %{url}."
+      details: "Reply or learn more about the changeset at %{url}."
+      details_html: "Reply or learn more about the changeset at %{url}."

       unsubscribe: "You can unsubscribe from updates to this changeset at %{url}."
       unsubscribe_html: "You can unsubscribe from updates to this changeset at %{url}."
   confirmations:
       unsubscribe: "You can unsubscribe from updates to this changeset at %{url}."
       unsubscribe_html: "You can unsubscribe from updates to this changeset at %{url}."
   confirmations:


@@ -1848,43 +1850,17 @@ en:
   sessions:
     new:
       title: "Log in"
   sessions:
     new:
       title: "Log in"

-      heading: "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"
       email or username: "Email Address or Username"
       password: "Password"

-      openid_html: "%{logo} OpenID"

       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Log in"
       register now: Register now
       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Log in"
       register now: Register now

-      with external: "Alternatively, use a third party to log in:"
-      no account: Don't have an account?
+      with external: "or log in with a third party"
+      or: "or"

       auth failure: "Sorry, could not log in with those details."
       auth failure: "Sorry, could not log in with those details."

-      openid_logo_alt: "Log in with an OpenID"
-      auth_providers:
-        openid:
-          title: Log in with OpenID
-          alt: Log in with an OpenID URL
-        google:
-          title: Log in with Google
-          alt: Log in with a Google OpenID
-        facebook:
-          title: Log in with Facebook
-          alt: Log in with a Facebook Account
-        microsoft:
-          title: Log in with Microsoft
-          alt: Log in with a Microsoft Account
-        github:
-          title: Log in with GitHub
-          alt: Log in with a GitHub Account
-        wikipedia:
-          title: Log in with Wikipedia
-          alt: Log in with a Wikipedia Account
-        wordpress:
-          title: Log in with Wordpress
-          alt: Log in with a Wordpress OpenID
-        aol:
-          title: Log in with AOL
-          alt: Log in with an AOL OpenID

     destroy:
       title: "Logout"
       heading: "Logout from OpenStreetMap"
     destroy:
       title: "Logout"
       heading: "Logout from OpenStreetMap"


@@ -2098,6 +2074,14 @@ en:
           %{france}: Contains data sourced from
           Direction Générale des Impôts.
         contributors_fr_france: France
           %{france}: Contains data sourced from
           Direction Générale des Impôts.
         contributors_fr_france: France

+        contributors_hr_credit_html: |
+          %{croatia}: Contains data from the %{dgu_link} and %{open_data_portal}
+          (public information of Croatia).
+        contributors_hr_croatia: Croatia
+        contributors_hr_dgu: State Geodetic Administration of Croatia
+        contributors_hr_dgu_url: https://dgu.gov.hr/
+        contributors_hr_open_data_portal: National Open Data Portal
+        contributors_hr_open_data_portal_url: https://data.gov.hr/

         contributors_nl_credit_html: |
           %{netherlands}: Contains © AND data, 2007 (%{and_link})
         contributors_nl_netherlands: Netherlands
         contributors_nl_credit_html: |
           %{netherlands}: Contains © AND data, 2007 (%{and_link})
         contributors_nl_netherlands: Netherlands


@@ -2576,6 +2560,9 @@ 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."


@@ -2591,6 +2578,34 @@ en:
       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

+    auth_providers:
+      openid_logo_alt: "Log in with an OpenID"
+      openid_html: "%{logo} OpenID"
+      openid_login_button: "Continue"
+      openid:
+        title: Log in with OpenID
+        alt: Log in with an OpenID URL
+      google:
+        title: Log in with Google
+        alt: Log in with a Google OpenID
+      facebook:
+        title: Log in with Facebook
+        alt: Log in with a Facebook Account
+      microsoft:
+        title: Log in with Microsoft
+        alt: Log in with a Microsoft Account
+      github:
+        title: Log in with GitHub
+        alt: Log in with a GitHub Account
+      wikipedia:
+        title: Log in with Wikipedia
+        alt: Log in with a Wikipedia Account
+      wordpress:
+        title: Log in with Wordpress
+        alt: Log in with a Wordpress OpenID
+      aol:
+        title: Log in with AOL
+        alt: Log in with an AOL OpenID

   oauth:
     authorize:
       title: "Authorize access to your account"
   oauth:
     authorize:
       title: "Authorize access to your account"


@@ -2628,6 +2643,8 @@ en:
       write_redactions: Redact map data
       read_email: Read user email address
       skip_authorization: Auto approve application
       write_redactions: Redact map data
       read_email: Read user email address
       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"
   oauth_clients:
     new:
       title: "Register a new application"


@@ -2719,23 +2736,34 @@ en:
   users:
     new:
       title: "Sign Up"
   users:
     new:
       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.'
       support: support
       about:
       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.'
       support: support
       about:

-        header: Free and editable
+        header: Free and editable.

         paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.
         paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.

-        paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account.
+        paragraph_2: Sign up to get started contributing.
+        welcome: "Welcome to OpenStreetMap"
+      duplicate_social_email: "If you already have an OpenStreetMap account and wish to use a 3rd party identity provider, please log in using your password and modify the settings of your account."

       display name description: "Your publicly displayed username. You can change this later in the preferences."
       display name description: "Your publicly displayed username. You can change this later in the preferences."

+      by_signing_up_html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}."
+      tou: "terms of use"
+      contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
+      contributor_terms: "contributor terms"

       external auth: "Third Party Authentication:"
       external auth: "Third Party Authentication:"

-      use external auth: "Alternatively, use a third party to log in"
-      auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."

       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"

-      email_confirmation_help_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
+      email_help_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'

       privacy_policy: privacy policy
       privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
       privacy_policy_title: OSMF privacy policy including section on email addresses
       privacy_policy: privacy policy
       privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
       privacy_policy_title: OSMF privacy policy including section on email addresses

+      consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
+      consider_pd: "public domain"
+      consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+      or: "or"
+      use external auth: "or sign up with a third party"

     terms:
       title: "Terms"
       heading: "Terms"
     terms:
       title: "Terms"
       heading: "Terms"


@@ -2970,7 +2998,6 @@ en:
       revoke: "Revoke!"
       confirm: "Are you sure?"
       reason: "Reason for block:"
       revoke: "Revoke!"
       confirm: "Are you sure?"
       reason: "Reason for block:"

-      back: "View all blocks"

       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
     block:
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
     block:


@@ -2986,6 +3013,13 @@ en:
       revoker_name: "Revoked by"
       older: "Older Blocks"
       newer: "Newer Blocks"
       revoker_name: "Revoked by"
       older: "Older Blocks"
       newer: "Newer Blocks"

+    navigation:
+      all_blocks: "All Blocks"
+      blocks_on_me: "Blocks on Me"
+      blocks_on_user: "Blocks on %{user}"
+      blocks_by_me: "Blocks by Me"
+      blocks_by_user: "Blocks by %{user}"
+      block: "Block #%{id}"

   user_mutes:
     index:
       title: "Muted Users"
   user_mutes:
     index:
       title: "Muted Users"


@@ -3053,6 +3087,9 @@ en:
     new:
       title: "New Note"
       intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
     new:
       title: "New Note"
       intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."

+      anonymous_warning_html: "You are not logged in. Please %{log_in} or %{sign_up} if you want to receive updates for your note."
+      anonymous_warning_log_in: "log in"
+      anonymous_warning_sign_up: "sign up"

       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note
   javascripts:
       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note
   javascripts: