X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/10ad7688f8477958d9d6758506c18a3c620f0bd3..271384e683bfbee1ee3377f36df07e48bff5e39f:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 77002268b..4ad1687a6 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" @@ -473,8 +472,13 @@ en: discussion: Discussion join_discussion: "Log in to join the discussion" still_open: "Changeset still open - discussion will open once the changeset is closed." + subscribe: "Subscribe" + unsubscribe: "Unsubscribe" comment_by_html: "Comment from %{user} %{time_ago}" hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}" + hide_comment: "hide" + unhide_comment: "unhide" + comment: "Comment" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" paging_nav: @@ -544,6 +548,8 @@ en: title: "%{user}'s Diary | %{title}" user_title: "%{user}'s Diary" discussion: "Discussion" + subscribe: "Subscribe" + unsubscribe: "Unsubscribe" leave_a_comment: "Leave a comment" login_to_leave_a_comment_html: "%{login_link} to leave a comment" login: "Log in" @@ -586,7 +592,14 @@ en: all: title: "OpenStreetMap diary entries" description: "Recent diary entries from users of OpenStreetMap" - comments: + subscribe: + heading: Subscribe to the following diary entry discussion? + button: Subscribe to discussion + unsubscribe: + heading: Unsubscribe from the following diary entry discussion? + button: Unsubscribe from discussion + diary_comments: + index: title: "Diary Comments added by %{user}" heading: "%{user}'s Diary Comments" subheading_html: "Diary Comments added by %{user}" @@ -596,12 +609,6 @@ en: comment: Comment newer_comments: "Newer Comments" older_comments: "Older Comments" - subscribe: - heading: Subscribe to the following diary entry discussion? - button: Subscribe to discussion - unsubscribe: - heading: Unsubscribe from the following diary entry discussion? - button: Unsubscribe from discussion doorkeeper: errors: messages: @@ -634,6 +641,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. + 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) @@ -661,11 +671,8 @@ en: title: results_from_html: 'Results from %{results_link}' latlon: Internal - latlon_url: https://openstreetmap.org/ osm_nominatim: OpenStreetMap Nominatim - osm_nominatim_url: https://nominatim.openstreetmap.org/ osm_nominatim_reverse: OpenStreetMap Nominatim - osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/ search_osm_nominatim: prefix_format: "%{name}" prefix: @@ -1671,8 +1678,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}." - 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}," @@ -1687,8 +1694,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" - 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: @@ -1848,43 +1855,17 @@ en: 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" - openid_html: "%{logo} OpenID" 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." - 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" @@ -1977,6 +1958,7 @@ en: legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy partners_title: Partners copyright: + title: Copyright and License foreign: title: About this translation html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence @@ -1987,7 +1969,6 @@ en: native_link: THIS_LANGUAGE_NAME_HERE version mapping_link: start mapping legal_babble: - title_html: Copyright and License introduction_1_html: | OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF). @@ -2190,9 +2171,6 @@ en: index: js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript." js_2: "OpenStreetMap uses JavaScript for its slippy map." - permalink: Permalink - shortlink: Shortlink - createnote: Add a note license: copyright: "Copyright OpenStreetMap and contributors, under an open license" license_url: "https://openstreetmap.org/copyright" @@ -2584,6 +2562,9 @@ en: 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." @@ -2599,6 +2580,34 @@ 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" + 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" @@ -2636,6 +2645,8 @@ en: 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" @@ -2727,23 +2738,34 @@ en: 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: - 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. + 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." + 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:" - 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_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" @@ -2801,6 +2823,8 @@ en: remove as friend: Unfriend add as friend: Add Friend mapper since: "Mapper since:" + last map edit: "Last map edit:" + no activity yet: "No activity yet" uid: "User id:" ct status: "Contributor terms:" ct undecided: Undecided @@ -3067,6 +3091,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." + 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: @@ -3146,13 +3173,6 @@ en: queryfeature_tooltip: Query features queryfeature_disabled_tooltip: Zoom in to query features embed_html_disabled: HTML embedding is not available for this map layer - changesets: - show: - comment: "Comment" - subscribe: "Subscribe" - unsubscribe: "Unsubscribe" - hide_comment: "hide" - unhide_comment: "unhide" edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: ascend: "Ascend"