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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0cc35863b4fbbe77e2020ac440c4d5c70c56214d..ec5e544425e28081f322c0fb8337386537fedc9e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -546,7 +546,7 @@ en:
       discussion: "Discussion"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       discussion: "Discussion"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"

-      login: "Login"
+      login: "Log in"

     no_such_entry:
       title: "No such diary entry"
       heading: "No entry with the id: %{id}"
     no_such_entry:
       title: "No such diary entry"
       heading: "No entry with the id: %{id}"


@@ -1568,10 +1568,9 @@ en:
     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"
     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_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."
-    partners_ucl: "UCL"
+    hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."

     partners_fastly: "Fastly"
     partners_fastly: "Fastly"

-    partners_bytemark: "Bytemark Hosting"
+    partners_corpmembers: "OSMF corporate members"

     partners_partners: "partners"
     tou: "Terms of Use"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     partners_partners: "partners"
     tou: "Terms of Use"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."


@@ -1767,14 +1766,14 @@ en:
         one: "%{count} muted message"
         other: "You have %{count} muted messages"
     reply:
         one: "%{count} muted message"
         other: "You have %{count} muted messages"
     reply:

-      wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
+      wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply."

     show:
       title: "Read message"
       reply_button: "Reply"
       unread_button: "Mark as unread"
       destroy_button: "Delete"
       back: "Back"
     show:
       title: "Read message"
       reply_button: "Reply"
       unread_button: "Mark as unread"
       destroy_button: "Delete"
       back: "Back"

-      wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
+      wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it."

     sent_message_summary:
       destroy_button: "Delete"
     heading:
     sent_message_summary:
       destroy_button: "Delete"
     heading:


@@ -1848,44 +1847,44 @@ en:
       failure: Couldn't update profile.
   sessions:
     new:
       failure: Couldn't update profile.
   sessions:
     new:

-      title: "Login"
-      heading: "Login"
+      title: "Log in"
+      heading: "Log in"

       email or username: "Email Address or Username"
       password: "Password"
       openid_html: "%{logo} OpenID"
       remember: "Remember me"
       lost password link: "Lost your 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: "Login"
+      login_button: "Log in"

       register now: Register now
       register now: Register now

-      with external: "Alternatively, use a third party to login:"
+      with external: "Alternatively, use a third party to log in:"

       no account: Don't have an account?
       auth failure: "Sorry, could not log in with those details."
       openid_logo_alt: "Log in with an OpenID"
       auth_providers:
         openid:
       no account: Don't have an account?
       auth failure: "Sorry, could not log in with those details."
       openid_logo_alt: "Log in with an OpenID"
       auth_providers:
         openid:

-          title: Login with OpenID
-          alt: Login with an OpenID URL
+          title: Log in with OpenID
+          alt: Log in with an OpenID URL

         google:
         google:

-          title: Login with Google
-          alt: Login with a Google OpenID
+          title: Log in with Google
+          alt: Log in with a Google OpenID

         facebook:
         facebook:

-          title: Login with Facebook
-          alt: Login with a Facebook Account
+          title: Log in with Facebook
+          alt: Log in with a Facebook Account

         microsoft:
         microsoft:

-          title: Login with Microsoft
-          alt: Login with a Microsoft Account
+          title: Log in with Microsoft
+          alt: Log in with a Microsoft Account

         github:
         github:

-          title: Login with GitHub
-          alt: Login with a GitHub Account
+          title: Log in with GitHub
+          alt: Log in with a GitHub Account

         wikipedia:
         wikipedia:

-          title: Login with Wikipedia
-          alt: Login with a Wikipedia Account
+          title: Log in with Wikipedia
+          alt: Log in with a Wikipedia Account

         wordpress:
         wordpress:

-          title: Login with Wordpress
-          alt: Login with a Wordpress OpenID
+          title: Log in with Wordpress
+          alt: Log in with a Wordpress OpenID

         aol:
         aol:

-          title: Login with AOL
-          alt: Login with an AOL OpenID
+          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"


@@ -2542,8 +2541,8 @@ en:
       identifiable: "IDENTIFIABLE"
       private: "PRIVATE"
       trackable: "TRACKABLE"
       identifiable: "IDENTIFIABLE"
       private: "PRIVATE"
       trackable: "TRACKABLE"

-      by: "by"
-      in: "in"
+      details_with_tags_html: "%{time_ago} by %{user} in %{tags}"
+      details_without_tags_html: "%{time_ago} by %{user}"

     index:
       public_traces: "Public GPS Traces"
       my_gps_traces: "My GPS Traces"
     index:
       public_traces: "Public GPS Traces"
       my_gps_traces: "My GPS Traces"


@@ -2729,7 +2728,7 @@ en:
         paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account.
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"
         paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account.
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"

-      use external auth: "Alternatively, use a third party to login"
+      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!"
       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!"


@@ -2833,9 +2832,11 @@ en:
     index:
       title: Users
       heading: Users
     index:
       title: Users
       heading: Users

-      showing:
-        one: Page %{page} (%{first_item} of %{items})
-        other: Page %{page} (%{first_item}-%{last_item} of %{items})
+      older: "Older Users"
+      newer: "Newer Users"
+      found_users:
+        one: "%{count} user found"
+        other: "%{count} users found"

       summary_html: "%{name} created from %{ip_address} on %{date}"
       summary_no_ip_html: "%{name} created on %{date}"
       confirm: Confirm Selected Users
       summary_html: "%{name} created from %{ip_address} on %{date}"
       summary_no_ip_html: "%{name} created on %{date}"
       confirm: Confirm Selected Users


@@ -2860,7 +2861,7 @@ en:
         If you are new to OpenStreetMap, please create a new account
         using the form below.
       option_2: |
         If you are new to OpenStreetMap, please create a new account
         using the form below.
       option_2: |

-        If you already have an account, you can login to your account
+        If you already have an account, you can log in to your account

         using your username and password and then associate the account
         with your ID in your user settings.
   user_role:
         using your username and password and then associate the account
         with your ID in your user settings.
   user_role: