X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/671355e9bc032d77e9c6a83c5f1ea95e8837e17c..ede8cda2ef790ef36b025dda0dd8160f1dd19507:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 251012d46..77002268b 100644 --- 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" - login: "Login" + login: "Log in" no_such_entry: title: "No such diary entry" heading: "No entry with the id: %{id}" @@ -1766,14 +1766,14 @@ 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: @@ -1847,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" @@ -2098,6 +2098,14 @@ en: %{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 @@ -2541,8 +2549,8 @@ en: 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" @@ -2728,7 +2736,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!" @@ -2832,9 +2840,11 @@ en: 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 @@ -2859,7 +2869,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: @@ -2968,7 +2978,6 @@ en: 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: @@ -2982,9 +2991,15 @@ en: reason: "Reason for block" status: "Status" revoker_name: "Revoked by" - showing_page: "Page %{page}" - next: "Next »" - previous: "« Previous" + 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"