X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/71cb2c50fcaf29e2b933fc981e40a00223d94d34..74af34ccf75afcf5c032bddf4c20b22aafd6467b:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index 2f1e4d016..9af2dd566 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -308,15 +308,10 @@ en: destroy: success: "Account Deleted." browse: - created: "Created" - closed: "Closed" - created_ago_html: "Created %{time_ago}" - closed_ago_html: "Closed %{time_ago}" - created_ago_by_html: "Created %{time_ago} by %{user}" - closed_ago_by_html: "Closed %{time_ago} by %{user}" deleted_ago_by_html: "Deleted %{time_ago} by %{user}" edited_ago_by_html: "Edited %{time_ago} by %{user}" version: "Version" + redacted_version: "Redacted Version" in_changeset: "Changeset" anonymous: "anonymous" no_comment: "(no comment)" @@ -329,26 +324,13 @@ en: other: "%{count} ways" download_xml: "Download XML" view_history: "View History" + view_unredacted_history: "View Unredacted History" view_details: "View Details" + view_redacted_data: "View Redacted Data" + view_redaction_message: "View Redaction Message" location: "Location:" common_details: coordinates_html: "%{latitude}, %{longitude}" - changeset: - title: "Changeset: %{id}" - belongs_to: "Author" - node: "Nodes (%{count})" - node_paginated: "Nodes (%{x}-%{y} of %{count})" - way: "Ways (%{count})" - way_paginated: "Ways (%{x}-%{y} of %{count})" - relation: "Relations (%{count})" - relation_paginated: "Relations (%{x}-%{y} of %{count})" - hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}" - comment_by_html: "Comment from %{user} %{time_ago}" - changesetxml: "Changeset XML" - osmchangexml: "osmChange XML" - join_discussion: "Log in to join the discussion" - discussion: Discussion - still_open: "Changeset still open - discussion will open once the changeset is closed." node: title_html: "Node: %{name}" history_title_html: "Node History: %{name}" @@ -464,6 +446,9 @@ en: feed: title: "Changeset %{id}" title_comment: "Changeset %{id} - %{comment}" + created: "Created" + closed: "Closed" + belongs_to: "Author" subscribe: heading: Subscribe to the following changeset discussion? button: Subscribe to discussion @@ -477,6 +462,28 @@ en: title: "No such changeset" heading: "No entry with the id: %{id}" body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." + show: + title: "Changeset: %{id}" + created: "Created: %{when}" + closed: "Closed: %{when}" + created_ago_html: "Created %{time_ago}" + closed_ago_html: "Closed %{time_ago}" + created_ago_by_html: "Created %{time_ago} by %{user}" + closed_ago_by_html: "Closed %{time_ago} by %{user}" + discussion: Discussion + join_discussion: "Log in to join the discussion" + still_open: "Changeset still open - discussion will open once the changeset is closed." + comment_by_html: "Comment from %{user} %{time_ago}" + hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}" + changesetxml: "Changeset XML" + osmchangexml: "osmChange XML" + paging_nav: + nodes: "Nodes (%{count})" + nodes_paginated: "Nodes (%{x}-%{y} of %{count})" + ways: "Ways (%{count})" + ways_paginated: "Ways (%{x}-%{y} of %{count})" + relations: "Relations (%{count})" + relations_paginated: "Relations (%{x}-%{y} of %{count})" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." changeset_comments: @@ -539,7 +546,7 @@ en: 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}" @@ -1561,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" - 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_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." @@ -1760,17 +1766,17 @@ en: 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" - 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: + heading: my_inbox: "My Inbox" my_outbox: "My Outbox" muted_messages: "Muted messages" @@ -1790,8 +1796,7 @@ en: new password button: "Reset password" help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password." create: - notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon." - notice email cannot find: "Could not find that email address, sorry." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." edit: title: "Reset password" heading: "Reset Password for %{user}" @@ -1842,44 +1847,44 @@ en: 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?" - login_button: "Login" + login_button: "Log in" 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: - title: Login with OpenID - alt: Login with an OpenID URL + title: Log in with OpenID + alt: Log in with an OpenID URL google: - title: Login with Google - alt: Login with a Google OpenID + title: Log in with Google + alt: Log in with a Google OpenID facebook: - title: Login with Facebook - alt: Login with a Facebook Account + title: Log in with Facebook + alt: Log in with a Facebook Account microsoft: - title: Login with Microsoft - alt: Login with a Microsoft Account + title: Log in with Microsoft + alt: Log in with a Microsoft Account github: - title: Login with GitHub - alt: Login with a GitHub Account + title: Log in with GitHub + alt: Log in with a GitHub Account wikipedia: - title: Login with Wikipedia - alt: Login with a Wikipedia Account + title: Log in with Wikipedia + alt: Log in with a Wikipedia Account wordpress: - title: Login with Wordpress - alt: Login with a Wordpress OpenID + title: Log in with Wordpress + alt: Log in with a Wordpress OpenID 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" @@ -2723,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:" - 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!" @@ -2854,7 +2859,7 @@ en: 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: