X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/92e3e425f126fe6c490a5701ad5100db0acbc90a..c79da4746a7fcea96da37aa2021c309100762d21:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index ed58ef3f1..95edb8bb5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5,6 +5,8 @@ en: formats: friendly: "%e %B %Y at %H:%M" blog: "%e %B %Y" + count: + at_least_pattern: "%{count}+" helpers: file: prompt: Choose file @@ -38,6 +40,13 @@ en: messages: invalid_email_address: does not appear to be a valid e-mail address email_address_not_routable: is not routable + display_name_is_user_n: can't be user_n unless n is your user id + models: + user_mute: + attributes: + subject: + format: "%{message}" + is_already_muted: "is already muted" # Translates all the model names, which is used in error handling on the website models: acl: "Access Control List" @@ -154,7 +163,6 @@ en: reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms. needs_view: Does the user need to log in before this block will be cleared? user: - email_confirmation: 'Your address is not displayed publicly, see our privacy policy for more information.' new_email: "(never displayed publicly)" datetime: distance_in_words_ago: @@ -196,9 +204,9 @@ en: one: "%{count} year ago" other: "%{count} years ago" printable_name: - with_id: "%{id}" - with_version: "%{id}, v%{version}" + version: "v%{version}" with_name_html: "%{name} (%{id})" + current_and_old_links_html: "%{current_link}, %{old_link}" editor: default: "Default (currently %{name})" id: @@ -213,7 +221,7 @@ en: openid: OpenID google: Google facebook: Facebook - windowslive: Windows Live + microsoft: Microsoft github: GitHub wikipedia: Wikipedia api: @@ -229,6 +237,7 @@ en: reopened_at_by_html: "Reactivated %{when} by %{user}" rss: title: "OpenStreetMap Notes" + description_all: "A list of reported, commented on or closed notes" description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]" description_item: "An rss feed for note %{id}" opened: "new note (near %{place})" @@ -254,6 +263,7 @@ en: retain_notes: Your map notes and note comments, if any, will be retained but hidden from view. retain_changeset_discussions: Your changeset discussions, if any, will be retained. retain_email: Your email address will be retained. + recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}." confirm_delete: Are you sure? cancel: Cancel accounts: @@ -298,15 +308,10 @@ en: destroy: success: "Account Deleted." browse: - created: "Created" - closed: "Closed" - created_html: "Created %{time}" - closed_html: "Closed %{time}" - created_by_html: "Created %{time} by %{user}" - deleted_by_html: "Deleted %{time} by %{user}" - edited_by_html: "Edited %{time} by %{user}" - closed_by_html: "Closed %{time} 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)" @@ -319,30 +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})" - comment: "Comments (%{count})" - hidden_commented_by_html: "Hidden comment from %{user} %{when}" - commented_by_html: "Comment from %{user} %{when}" - changesetxml: "Changeset XML" - osmchangexml: "osmChange XML" - feed: - title: "Changeset %{id}" - title_comment: "Changeset %{id} - %{comment}" - 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}" @@ -351,6 +339,7 @@ en: history_title_html: "Way History: %{name}" nodes: "Nodes" nodes_count: + one: "%{count} node" other: "%{count} nodes" also_part_of_html: one: "part of way %{related_ways}" @@ -417,6 +406,15 @@ en: introduction: "Click on the map to find nearby features." nearby: "Nearby features" enclosing: "Enclosing features" + old_nodes: + not_found: + sorry: "Sorry, node #%{id} version %{version} could not be found." + old_ways: + not_found: + sorry: "Sorry, way #%{id} version %{version} could not be found." + old_relations: + not_found: + sorry: "Sorry, relation #%{id} version %{version} could not be found." changesets: changeset_paging_nav: showing_page: "Page %{page}" @@ -445,6 +443,47 @@ en: no_more_area: "No more changesets in this area." no_more_user: "No more changesets by this user." load_more: "Load more" + 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 + unsubscribe: + heading: Unsubscribe from the following changeset discussion? + button: Unsubscribe from discussion + heading: + title: "Changeset %{id}" + created_by_html: "Created by %{link_user} on %{created}." + no_such_entry: + 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: @@ -462,6 +501,7 @@ en: contact: km away: "%{count}km away" m away: "%{count}m away" + latest_edit_html: "Latest edit (%{ago}):" popup: your location: "Your location" nearby mapper: "Nearby mapper" @@ -503,9 +543,10 @@ en: show: title: "%{user}'s Diary | %{title}" user_title: "%{user}'s Diary" + 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}" @@ -516,9 +557,9 @@ en: comment_link: Comment on this entry reply_link: Send a message to the author comment_count: - zero: No comments one: "%{count} comment" other: "%{count} comments" + no_comments: No comments edit_link: Edit this entry hide_link: Hide this entry unhide_link: Unhide this entry @@ -555,11 +596,38 @@ 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: + account_selection_required: "The authorization server requires end-user account selection" + consent_required: "The authorization server requires end-user consent" + interaction_required: "The authorization server requires end-user interaction" + login_required: "The authorization server requires end-user authentication" flash: applications: create: notice: Application Registered. + openid_connect: + errors: + messages: + # Configuration error messages + auth_time_from_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner missing configuration." + reauthenticate_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner missing configuration." + resource_owner_from_access_token_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token missing configuration." + select_account_for_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner missing configuration." + subject_not_configured: "ID Token generation failed due to Doorkeeper::OpenidConnect.configure.subject missing configuration." + scopes: + address: "View your physical address" + email: "View your email address" + openid: "Authenticate your account" + phone: "View your phone number" + profile: "View your profile information" errors: contact: contact_url: https://wiki.openstreetmap.org/wiki/Contact @@ -591,9 +659,13 @@ en: geocoder: search: title: - latlon_html: 'Results from Internal' - osm_nominatim_html: 'Results from OpenStreetMap Nominatim' - osm_nominatim_reverse_html: 'Results from OpenStreetMap Nominatim' + 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: @@ -1387,8 +1459,7 @@ en: status: Status reports: Reports last_updated: Last Updated - last_updated_time_html: "%{time}" - last_updated_time_user_html: "%{time} by %{user}" + last_updated_time_ago_user_html: "%{time_ago} by %{user}" link_to_reports: View Reports reports_count: one: "%{count} Report" @@ -1401,12 +1472,12 @@ en: show: title: "%{status} Issue #%{issue_id}" reports: - zero: No reports one: "%{count} report" other: "%{count} reports" - report_created_at: "First reported at %{datetime}" - last_resolved_at: "Last resolved at %{datetime}" - last_updated_at: "Last updated at %{datetime} by %{displayname}" + no_reports: No reports + report_created_at_html: "First reported at %{datetime}" + last_resolved_at_html: "Last resolved at %{datetime}" + last_updated_at_html: "Last updated at %{datetime} by %{displayname}" resolve: Resolve ignore: Ignore reopen: Reopen @@ -1497,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." @@ -1520,12 +1590,15 @@ en: more: More user_mailer: diary_comment_notification: + description: "OpenStreetMap Diary Entry #%{id}" subject: "[OpenStreetMap] %{user} commented on a diary entry" hi: "Hi %{to_user}," header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:" header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:" footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}" footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}" + footer_unsubscribe: "You can unsubscribe from the discussion at %{unsubscribeurl}" + footer_unsubscribe_html: "You can unsubscribe from the discussion at %{unsubscribeurl}" message_notification: subject: "[OpenStreetMap] %{message_title}" hi: "Hi %{to_user}," @@ -1555,6 +1628,7 @@ en: loaded: one: "loaded successfully with %{trace_points} out of a possible %{count} point." other: "loaded successfully with %{trace_points} out of a possible %{count} points." + all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}." subject: "[OpenStreetMap] GPX Import success" signup_confirm: subject: "[OpenStreetMap] Welcome to OpenStreetMap" @@ -1573,6 +1647,7 @@ en: hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account." click_the_link: "If this is you, please click the link below to reset your password." note_comment_notification: + description: "OpenStreetMap Note #%{id}" anonymous: An anonymous user greeting: "Hi," commented: @@ -1599,6 +1674,7 @@ en: details: "More details about the note can be found at %{url}." details_html: "More details about the note can be found at %{url}." changeset_comment_notification: + description: "OpenStreetMap Changeset #%{id}" hi: "Hi %{to_user}," greeting: "Hi," commented: @@ -1613,8 +1689,8 @@ en: 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}." - unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".' - unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".' + unsubscribe: "You can unsubscribe from updates to this changeset at %{url}." + unsubscribe_html: "You can unsubscribe from updates to this changeset at %{url}." confirmations: confirm: heading: Check your email! @@ -1644,8 +1720,6 @@ en: messages: inbox: title: "Inbox" - my_inbox: "My Inbox" - my_outbox: "My Outbox" messages: "You have %{new_messages} and %{old_messages}" new_messages: one: "%{count} new message" @@ -1653,16 +1727,20 @@ en: old_messages: one: "%{count} old message" other: "%{count} old messages" + no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" + people_mapping_nearby: "people mapping nearby" + messages_table: from: "From" + to: "To" subject: "Subject" date: "Date" - no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" - people_mapping_nearby: "people mapping nearby" + actions: "Actions" message_summary: unread_button: "Mark as unread" read_button: "Mark as read" reply_button: "Reply" destroy_button: "Delete" + unmute_button: "Move to Inbox" new: title: "Send message" send_message_to_html: "Send a new message to %{name}" @@ -1676,45 +1754,55 @@ en: body: "Sorry there is no message with that id." outbox: title: "Outbox" - my_inbox: "My Inbox" - my_outbox: "My Outbox" + actions: "Actions" messages: one: "You have %{count} sent message" other: "You have %{count} sent messages" - to: "To" - subject: "Subject" - date: "Date" no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" people_mapping_nearby: "people mapping nearby" + muted: + title: "Muted Messages" + messages: + 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: + my_inbox: "My Inbox" + my_outbox: "My Outbox" + muted_messages: "Muted messages" mark: as_read: "Message marked as read" as_unread: "Message marked as unread" + unmute: + notice: "Message has been moved to Inbox" + error: "The message could not be moved to the Inbox." destroy: destroyed: "Message deleted" passwords: - lost_password: + new: title: "Lost password" heading: "Forgotten Password?" - email address: "Email Address:" + email address: "Email Address" 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." - 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." - reset_password: + create: + 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}" reset: "Reset Password" + flash token bad: "Did not find that token, check the URL maybe?" + update: flash changed: "Your password has been changed." flash token bad: "Did not find that token, check the URL maybe?" preferences: @@ -1751,49 +1839,52 @@ en: home location: "Home Location" no home location: "You have not entered your home location." update home location on click: "Update home location when I click on the map?" + show: "Show" + delete: "Delete" + undelete: "Undo delete" update: success: Profile updated. failure: Couldn't update profile. sessions: new: - title: "Login" - heading: "Login" - email or username: "Email Address or Username:" - password: "Password:" - openid_html: "%{logo} OpenID:" + 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 - windowslive: - title: Login with Windows Live - alt: Login with a Windows Live Account + 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: 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" @@ -1819,6 +1910,7 @@ en: image: Image alt: Alt text url: URL + codeblock: Code block richtext_field: edit: Edit preview: Preview @@ -1989,6 +2081,12 @@ en: Resources Canada), and StatCan (Geography Division, Statistics Canada). contributors_ca_canada: Canada + contributors_cz_credit_html: | + %{czechia}: Contains data from the State Administration of Land Surveying + and Cadastre licensed under %{cc_licence_link} + contributors_cz_czechia: Czechia + contributors_cz_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0) + contributors_cz_cc_licence_url: https://creativecommons.org/licenses/by/4.0/ contributors_fi_credit_html: | %{finland}: Contains data from the National Land Survey of Finland's Topographic Database @@ -2013,14 +2111,22 @@ en: contributors_nz_linz_data_service_url: https://data.linz.govt.nz/ contributors_nz_cc_by: CC BY 4.0 contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/ + contributors_rs_credit_html: | + %{serbia}: Contains data from the %{rgz_link} and %{open_data_portal} + (public information of Serbia), 2018. + contributors_rs_serbia: Serbia + contributors_rs_rgz: Serbian Geodetic Authority + contributors_rs_rgz_url: https://geosrbija.rs/ + contributors_rs_open_data_portal: National Open Data Portal + contributors_rs_open_data_portal_url: https://data.gov.rs/sr/ contributors_si_credit_html: | %{slovenia}: Contains data from the %{gu_link} and %{mkgp_link} (public information of Slovenia). contributors_si_slovenia: Slovenia contributors_si_gu: Surveying and Mapping Authority - contributors_si_gu_url: http://www.gu.gov.si/en/ + contributors_si_gu_url: https://www.gov.si/en/state-authorities/bodies-within-ministries/surveying-and-mapping-authority/ contributors_si_mkgp: Ministry of Agriculture, Forestry and Food - contributors_si_mkgp_url: http://www.mkgp.gov.si/en/ + contributors_si_mkgp_url: https://www.gov.si/en/state-authorities/ministries/ministry-of-agriculture-forestry-and-food/ contributors_es_credit_html: | %{spain}: Contains data sourced from the Spanish National Geographic Institute (%{ign_link}) and @@ -2028,16 +2134,16 @@ en: licensed for reuse under %{cc_by_link}. contributors_es_spain: Spain contributors_es_ign: IGN - contributors_es_ign_url: http://www.ign.es/ + contributors_es_ign_url: https://www.ign.es/ contributors_es_scne: SCNE - contributors_es_scne_url: http://www.scne.es/ + contributors_es_scne_url: https://www.scne.es/ contributors_es_cc_by: CC BY 4.0 contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/ contributors_za_credit_html: | %{south_africa}: Contains data sourced from %{ngi_link}, State copyright reserved. contributors_za_south_africa: South Africa contributors_za_ngi: "Chief Directorate: National Geo-Spatial Information" - contributors_za_ngi_url: http://www.ngi.gov.za/ + contributors_za_ngi_url: https://ngi.dalrrd.gov.za/ contributors_gb_credit_html: | %{united_kingdom}: Contains Ordnance Survey data © Crown copyright and database right @@ -2095,12 +2201,7 @@ en: no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature." export: title: "Export" - area_to_export: "Area to Export" manually_select: "Manually select a different area" - format_to_export: "Format to Export" - osm_xml_data: "OpenStreetMap XML Data" - map_image: "Map Image (shows standard layer)" - embeddable_html: "Embeddable HTML" licence: "Licence" licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL). odbl: Open Data Commons Open Database License @@ -2120,17 +2221,6 @@ en: other: title: "Other Sources" description: "Additional sources listed on the OpenStreetMap Wiki" - options: "Options" - format: "Format" - scale: "Scale" - max: "max" - image_size: "Image Size" - zoom: "Zoom" - add_marker: "Add a marker to the map" - latitude: "Lat:" - longitude: "Lon:" - output: "Output" - paste_html: "Paste HTML to embed in website" export_button: "Export" fixthemap: title: Report a problem / Fix the map @@ -2142,8 +2232,8 @@ en: If you have noticed a problem with our map data, for example a road is missing or your address, the best way to proceed is to join the OpenStreetMap community and add or repair the data yourself. add_a_note: - instructions_html: | - Just click or the same icon on the map display. + instructions_1_html: | + Just click %{note_icon} or the same icon on the map display. This will add a marker to the map, which you can move by dragging. Add your message, then click save, and other mappers will investigate. other_concerns: @@ -2167,18 +2257,14 @@ en: url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide title: Beginners' Guide description: Community maintained guide for beginners. - help: - url: https://help.openstreetmap.org/ - title: Help Forum - description: Ask a question or look up answers on OpenStreetMap's question-and-answer site. + community: + url: https://community.openstreetmap.org/ + title: Help & Community Forum + description: A shared place for to seek help and have conversations about OpenStreetMap. mailing_lists: url: https://lists.openstreetmap.org/ title: Mailing Lists description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. - community: - url: https://community.openstreetmap.org/ - title: Community forum - description: A shared place for conversations about OpenStreetMap. irc: url: https://irc.openstreetmap.org/ title: IRC @@ -2233,67 +2319,83 @@ en: primary: "Primary road" secondary: "Secondary road" unclassified: "Unclassified road" + pedestrian: "Pedestrian way" track: "Track" bridleway: "Bridleway" cycleway: "Cycleway" cycleway_national: "National cycleway" cycleway_regional: "Regional cycleway" cycleway_local: "Local cycleway" + cycleway_mtb: "Mountain bike route" footway: "Footway" rail: "Railway" + train: "Train" subway: "Subway" - tram: - - Light rail - - tram - cable: - - Cable car - - chair lift - runway: - - Airport Runway - - taxiway - apron: - - Airport apron - - terminal + ferry: "Ferry" + light_rail: "Light rail" + tram: "Tram" + trolleybus: "Trolleybus" + bus: "Bus" + cable_car: "Cable car" + chair_lift: "Chair lift" + runway: "Airport Runway" + taxiway: "Taxiway" + apron: "Airport apron" admin: "Administrative boundary" + capital: "Capital" + city: "City" + orchard: "Orchard" + vineyard: "Vineyard" forest: "Forest" wood: "Wood" + farmland: "Farmland" + grass: "Grass" + meadow: "Meadow" + bare_rock: "Bare rock" + sand: "Sand" golf: "Golf course" park: "Park" + common: "Common" + built_up: "Built-up area" resident: "Residential area" - common: - - Common - - meadow - - garden retail: "Retail area" industrial: "Industrial area" commercial: "Commercial area" heathland: "Heathland" - lake: - - Lake - - reservoir + scrubland: "Scrubland" + lake: "Lake" + reservoir: "Reservoir" + intermittent_water: "Intermittent waterbody" + glacier: "Glacier" + reef: "Reef" + wetland: "Wetland" farm: "Farm" brownfield: "Brownfield site" cemetery: "Cemetery" allotments: "Allotments" pitch: "Sports pitch" centre: "Sports centre" + beach: "Beach" reserve: "Nature reserve" military: "Military area" - school: - - School - - university + school: "School" + university: "University" + hospital: "Hospital" building: "Significant building" station: "Railway station" - summit: - - Summit - - peak + summit: "Summit" + peak: "Peak" tunnel: "Dashed casing = tunnel" bridge: "Black casing = bridge" private: "Private access" destination: "Destination access" construction: "Roads under construction" + bus_stop: "Bus stop" + stop: "Stop" bicycle_shop: "Bicycle shop" + bicycle_rental: "Bicycle rental" bicycle_parking: "Bicycle parking" + bicycle_parking_small: "Small bicycle parking" toilets: "Toilets" welcome: title: Welcome! @@ -2337,6 +2439,7 @@ en: automated_edits: Automated Edits automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct start_mapping: Start Mapping + continue_authorization: Continue Authorization add_a_note: title: No Time To Edit? Add a Note! para_1: | @@ -2423,7 +2526,6 @@ en: visibility: "Visibility:" confirm_delete: "Delete this trace?" trace_paging_nav: - showing_page: "Page %{page}" older: "Older Traces" newer: "Newer Traces" trace: @@ -2439,8 +2541,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" @@ -2488,6 +2590,7 @@ en: oauth1_settings: OAuth 1 settings oauth2_applications: OAuth 2 applications oauth2_authorizations: OAuth 2 authorizations + muted_users: Muted Users oauth: authorize: title: "Authorize access to your account" @@ -2514,6 +2617,7 @@ en: permissions: missing: "You have not permitted the application access to this facility" scopes: + openid: Sign-in using OpenStreetMap read_prefs: Read user preferences write_prefs: Modify user preferences write_diary: Create diary entries, comments and make friends @@ -2521,11 +2625,13 @@ en: read_gpx: Read private GPS traces write_gpx: Upload GPS traces write_notes: Modify notes + write_redactions: Redact map data read_email: Read user email address skip_authorization: Auto approve application oauth_clients: new: title: "Register a new application" + disabled: "Registration of OAuth 1 applications has been disabled" edit: title: "Edit your application" show: @@ -2604,7 +2710,9 @@ en: title: "My Authorized Applications" application: "Application" permissions: "Permissions" + last_authorized: "Last Authorized" no_applications_html: "You have not yet authorized any %{oauth2} applications." + oauth_2: "OAuth 2" application: revoke: "Revoke Access" confirm_revoke: "Revoke access for this application?" @@ -2620,10 +2728,14 @@ 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!" + email_confirmation_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 terms: title: "Terms" heading: "Terms" @@ -2670,6 +2782,8 @@ en: my_dashboard: My Dashboard blocks on me: Blocks on Me blocks by me: Blocks by Me + create_mute: Mute this User + destroy_mute: Unmute this User edit_profile: Edit Profile send message: Send Message diary: Diary @@ -2679,10 +2793,10 @@ en: remove as friend: Unfriend add as friend: Add Friend mapper since: "Mapper since:" + uid: "User id:" ct status: "Contributor terms:" ct undecided: Undecided ct declined: Declined - latest edit: "Latest edit (%{ago}):" email address: "Email address:" created from: "Created from:" status: "Status:" @@ -2690,14 +2804,18 @@ en: role: administrator: "This user is an administrator" moderator: "This user is a moderator" + importer: "This user is a importer" grant: administrator: "Grant administrator access" moderator: "Grant moderator access" + importer: "Grant importer access" revoke: administrator: "Revoke administrator access" moderator: "Revoke moderator access" + importer: "Revoke importer access" block_history: "Active Blocks" moderator_history: "Blocks Given" + revoke_all_blocks: "Revoke all blocks" comments: "Comments" create_block: "Block this User" activate_user: "Activate this User" @@ -2714,9 +2832,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 @@ -2741,7 +2861,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: @@ -2795,11 +2915,21 @@ en: revoke: title: "Revoking block on %{block_on}" heading_html: "Revoking block on %{block_on} by %{block_by}" - time_future: "This block will end in %{time}." - past: "This block ended %{time} and cannot be revoked now." + time_future_html: "This block will end in %{time}." + past_html: "This block ended %{time} and cannot be revoked now." confirm: "Are you sure you wish to revoke this block?" revoke: "Revoke!" flash: "This block has been revoked." + revoke_all: + title: "Revoking all blocks on %{block_on}" + heading_html: "Revoking all blocks on %{block_on}" + empty: "%{name} has no active blocks." + confirm: "Are you sure you wish to revoke %{active_blocks}?" + active_blocks: + one: "%{count} active block" + other: "%{count} active blocks" + revoke: "Revoke!" + flash: "All active blocks have been revoked." helper: time_future_html: "Ends in %{time}." until_login: "Active until the user logs in." @@ -2854,14 +2984,38 @@ 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" + user_mutes: + index: + title: "Muted Users" + my_muted_users: "My muted users" + you_have_muted_n_users: + one: "You have muted %{count} User" + other: "You have muted %{count} users" + user_mute_explainer: "Messages of muted users are moved into a separate Inbox and you won't receive email notifications." + user_mute_admins_and_moderators: "You can mute Admins and Moderators but their messages will not be muted." + table: + thead: + muted_user: "Muted User" + actions: "Actions" + tbody: + unmute: "Unmute" + send_message: "Send message" + + create: + notice: "You muted %{name}." + error: "%{name} could not be muted. %{full_message}." + destroy: + notice: "You unmuted %{name}." + error: "User could not be unmuted. Please try again." notes: index: title: "Notes submitted or commented on by %{user}" heading: "%{user}'s Notes" - subheading_html: "Notes submitted or commented on by %{user}" + subheading_html: "Notes %{submitted} or %{commented} by %{user}" + subheading_submitted: "submitted" + subheading_commented: "commented on" no_notes: No notes id: "Id" creator: "Creator" @@ -2874,15 +3028,15 @@ en: open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" - opened_by_html: "Created by %{user} %{when}" - opened_by_anonymous_html: "Created by anonymous %{when}" - commented_by_html: "Comment from %{user} %{when}" - commented_by_anonymous_html: "Comment from anonymous %{when}" - closed_by_html: "Resolved by %{user} %{when}" - closed_by_anonymous_html: "Resolved by anonymous %{when}" - reopened_by_html: "Reactivated by %{user} %{when}" - reopened_by_anonymous_html: "Reactivated by anonymous %{when}" - hidden_by_html: "Hidden by %{user} %{when}" + event_opened_by_html: "Created by %{user} %{time_ago}" + event_opened_by_anonymous_html: "Created by anonymous %{time_ago}" + event_commented_by_html: "Comment from %{user} %{time_ago}" + event_commented_by_anonymous_html: "Comment from anonymous %{time_ago}" + event_closed_by_html: "Resolved by %{user} %{time_ago}" + event_closed_by_anonymous_html: "Resolved by anonymous %{time_ago}" + event_reopened_by_html: "Reactivated by %{user} %{time_ago}" + event_reopened_by_anonymous_html: "Reactivated by anonymous %{time_ago}" + event_hidden_by_html: "Hidden by %{user} %{time_ago}" report: report this note coordinates_html: "%{latitude}, %{longitude}" anonymous_warning: This note includes comments from anonymous users which should be independently verified. @@ -2891,6 +3045,7 @@ en: reactivate: Reactivate comment_and_resolve: Comment & Resolve comment: Comment + log_in_to_comment: "Log in to comment on this note" report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}." other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment." other_problems_resolved: "For all other problems, resolving is sufficient." @@ -2945,8 +3100,8 @@ en: cyclosm: CyclOSM cycle_map: Cycle Map transport_map: Transport Map + tracestracktop_topo: Tracestrack Topo hot: Humanitarian - opnvkarte: ÖPNVKarte layers: header: Map Layers notes: Map Notes @@ -2954,13 +3109,19 @@ en: gps: Public GPS Traces overlays: Enable overlays for troubleshooting the map title: "Layers" - copyright: "© OpenStreetMap contributors" - donate_link_text: "" - terms: "Website and API terms" - cyclosm: "Tiles style by CyclOSM hosted by OpenStreetMap France" - thunderforest: "Tiles courtesy of Andy Allan" - opnvkarte: "Tiles courtesy of MeMoMaps" - hotosm: "Tiles style by Humanitarian OpenStreetMap Team hosted by OpenStreetMap France" + copyright_text: "© %{copyright_link}" + openstreetmap_contributors: "OpenStreetMap contributors" + make_a_donation: Make a Donation + website_and_api_terms: Website and API terms + cyclosm_credit: "Tiles style by %{cyclosm_link} hosted by %{osm_france_link}" + cyclosm_name: CyclOSM + osm_france: OpenStreetMap France + thunderforest_credit: "Tiles courtesy of %{thunderforest_link}" + andy_allan: Andy Allan + tracestrack_credit: "Tiles courtesy of %{tracestrack_link}" + tracestrack: Tracestrack + hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}" + hotosm_name: Humanitarian OpenStreetMap Team site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map @@ -2970,6 +3131,7 @@ en: map_data_zoom_in_tooltip: Zoom in to see map data 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"