X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1861bcf640c70def4563c500ae9f6f814ac729c6..ae87d2ca7f602cd6005efb2ad41f2c580eb6406f:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index de2a4f89c..f6d79369b 100644 --- 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" - email_confirmation: "Email Confirmation" new_email: "New Email Address" active: "Active" display_name: "Display Name" @@ -1851,7 +1850,6 @@ en: 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: "Log in" @@ -1859,32 +1857,6 @@ en: 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: 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" @@ -2098,6 +2070,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 @@ -2591,6 +2571,35 @@ en: 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" + with external: "Alternatively, use a third party to login:" + 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" @@ -2723,19 +2732,25 @@ en: 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_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." + by_signing_up_html: "By signing up, you agree to our %{contributor_terms_link} and %{tou_link}." + contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms" + contributor_terms: "Contributor terms" 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!" - 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 + consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain" + consider_pd_why: "what's this?" + consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain terms: title: "Terms" heading: "Terms" @@ -2988,7 +3003,10 @@ en: 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"