X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/18b642bfa9d2afdc3da747be25cf6a8ba91ab6b4..53ce4161bf1a0796d33f06c136afb7b2d1a160ec:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 71ebd34cf..c1f55bb44 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -52,7 +52,6 @@ en: message: "Message" node: "Node" node_tag: "Node Tag" - notifier: "Notifier" old_node: "Old Node" old_node_tag: "Old Node Tag" old_relation: "Old Relation" @@ -95,9 +94,10 @@ en: diary_entry: user: "User" title: "Subject" + body: "Body" latitude: "Latitude" longitude: "Longitude" - language: "Language" + language_code: "Language" doorkeeper/application: name: Name redirect_uri: Redirect URIs @@ -272,9 +272,6 @@ en: enabled link text: "what is this?" disabled: "Disabled and cannot edit data, all previous edits are anonymous." disabled link text: "why can't I edit?" - public editing note: - heading: "Public editing" - html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why)." contributor terms: heading: "Contributor Terms" agreed: "You have agreed to the new Contributor Terms." @@ -284,8 +281,17 @@ en: link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms" link text: "what is this?" save changes button: Save Changes - make edits public button: Make all my edits public delete_account: Delete Account... + go_public: + heading: "Public editing" + currently_not_public: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below." + only_public_can_edit: Since the 0.6 API changeover, only public users can edit map data. + find_out_why_html: (%{link}). + find_out_why: "find out why" + find_out_why_url: https://wiki.openstreetmap.org/wiki/Anonymous_edits + email_not_revealed: Your email address will not be revealed by becoming public. + not_reversible: This action cannot be reversed and all new users are now public by default. + make_edits_public_button: Make all my edits public update: success_confirm_needed: "User information updated successfully. Check your email for a note to confirm your new email address." success: "User information updated successfully." @@ -406,24 +412,6 @@ en: telephone_link: "Call %{phone_number}" colour_preview: "Colour %{colour_value} preview" email_link: "Email %{email}" - note: - title: "Note: %{id}" - new_note: "New Note" - description: "Description" - 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}" - report: report this note - coordinates_html: "%{latitude}, %{longitude}" query: title: "Query Features" introduction: "Click on the map to find nearby features." @@ -572,6 +560,21 @@ en: applications: create: notice: Application Registered. + errors: + contact: + contact_url: https://wiki.openstreetmap.org/wiki/Contact + 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. + forbidden: + title: Forbidden + description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403) + internal_server_error: + title: Application error + description: The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500) + not_found: + title: File not found + description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404) friendships: make_friend: heading: "Add %{user} as a friend?" @@ -589,11 +592,8 @@ en: search: title: latlon_html: 'Results from Internal' - ca_postcode_html: 'Results from Geocoder.CA' osm_nominatim_html: 'Results from OpenStreetMap Nominatim' - geonames_html: 'Results from GeoNames' osm_nominatim_reverse_html: 'Results from OpenStreetMap Nominatim' - geonames_reverse_html: 'Results from GeoNames' search_osm_nominatim: prefix_format: "%{name}" prefix: @@ -975,7 +975,7 @@ en: fitness_station: "Fitness Station" garden: "Garden" golf_course: "Golf Course" - horse_riding: "Horse Riding" + horse_riding: "Horse Riding Centre" ice_rink: "Ice Rink" marina: "Marina" miniature_golf: "Miniature Golf" @@ -1398,10 +1398,6 @@ en: ignored: Ignored open: Open resolved: Resolved - update: - new_report: Your report has been registered successfully - successful_update: Your report has been updated successfully - provide_details: Please provide the required details show: title: "%{status} Issue #%{issue_id}" reports: @@ -1484,10 +1480,8 @@ en: home: Go to Home Location logout: Log Out log_in: Log In - log_in_tooltip: Log in with an existing account sign_up: Sign Up start_mapping: Start Mapping - sign_up_tooltip: Create an account for editing edit: Edit history: History export: Export @@ -1519,8 +1513,6 @@ en: community: Community community_blogs: "Community Blogs" community_blogs_title: "Blogs from members of the OpenStreetMap community" - foundation: Foundation - foundation_title: The OpenStreetMap Foundation make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation @@ -1673,8 +1665,6 @@ en: new: title: "Send message" send_message_to_html: "Send a new message to %{name}" - subject: "Subject" - body: "Body" back_to_inbox: "Back to inbox" create: message_sent: "Message sent" @@ -1699,14 +1689,10 @@ en: 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." show: title: "Read message" - from: "From" - subject: "Subject" - date: "Date" reply_button: "Reply" unread_button: "Mark as unread" destroy_button: "Delete" back: "Back" - to: "To" 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." sent_message_summary: destroy_button: "Delete" @@ -1778,13 +1764,8 @@ en: lost password link: "Lost your password?" login_button: "Login" register now: Register now - with username: "Already have an OpenStreetMap account? Please login with your username and password:" with external: "Alternatively, use a third party to login:" - new to osm: New to OpenStreetMap? - to make changes: To make changes to the OpenStreetMap data, you must have an account. - create account minute: Create an account. It only takes a minute. no account: Don't have an account? - account not active: "Sorry, your account is not active yet.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email." auth failure: "Sorry, could not log in with those details." openid_logo_alt: "Log in with an OpenID" auth_providers: @@ -2057,7 +2038,9 @@ en: map_image: "Map Image (shows standard layer)" embeddable_html: "Embeddable HTML" licence: "Licence" - export_details_html: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' + licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL). + odbl: Open Data Commons Open Database License + odbl_url: https://opendatacommons.org/licenses/odbl/1.0/ too_large: advice: "If the above export fails, please consider using one of the sources listed below:" body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads." @@ -2070,9 +2053,6 @@ en: geofabrik: title: "Geofabrik Downloads" description: "Regularly-updated extracts of continents, countries, and selected cities" - metro: - title: "Metro Extracts" - description: "Extracts for major world cities and their surrounding areas" other: title: "Other Sources" description: "Additional sources listed on the OpenStreetMap Wiki" @@ -2157,6 +2137,15 @@ en: removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser. desktop_html: You can still use Potlatch by downloading the desktop application for Mac and Windows. id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your preferences here. + any_questions: + title: Any questions? + paragraph_1_html: | + OpenStreetMap has several resources for learning about the project, asking and answering + questions, and collaboratively discussing and documenting mapping topics. + %{help_link}. With an organization making plans for OpenStreetMap? %{welcome_mat_link}. + get_help_here: Get help here + welcome_mat: Check out the Welcome Mat + welcome_mat_url: https://welcome.openstreetmap.org/ sidebar: search_results: Search Results close: Close @@ -2243,57 +2232,56 @@ en: toilets: "Toilets" welcome: title: Welcome! - introduction_html: | + introduction: | Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed up, you're all set to get started mapping. Here's a quick guide with the most important things you need to know. whats_on_the_map: title: What's on the Map - on_html: | - OpenStreetMap is a place for mapping things that are both real and current - + on_the_map_html: | + OpenStreetMap is a place for mapping things that are both %{real_and_current} - it includes millions of buildings, roads, and other details about places. You can map whatever real-world features are interesting to you. - off_html: | - What it doesn't include is opinionated data like ratings, historical or + real_and_current: real and current + off_the_map_html: | + What it %{doesnt} include is opinionated data like ratings, historical or hypothetical features, and data from copyrighted sources. Unless you have special permission, don't copy from online or paper maps. + doesnt: doesn't basic_terms: title: Basic Terms For Mapping - paragraph_1_html: | + paragraph_1: | OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy. - editor_html: | - An editor is a program or website you can use to edit the map. - node_html: | - A node is a point on the map, like a single restaurant or a tree. - way_html: | - A way is a line or area, like a road, stream, lake or building. - tag_html: | - A tag is a bit of data about a node or way, like a - restaurant's name or a road's speed limit. + an_editor_html: An %{editor} is a program or website you can use to edit the map. + a_node_html: A %{node} is a point on the map, like a single restaurant or a tree. + a_way_html: A %{way} is a line or area, like a road, stream, lake or building. + a_tag_html: A %{tag} is a bit of data about a node or way, like a restaurant's name or a road's speed limit. + editor: editor + node: node + way: way + tag: tag rules: title: Rules! - paragraph_1_html: | + para_1_html: | OpenStreetMap has few formal rules but we expect all participants to collaborate with, and communicate with, the community. If you are considering any activities other than editing by hand, please read and follow the guidelines on - Imports and - Automated Edits. - questions: - title: Any questions? - paragraph_1_html: | - OpenStreetMap has several resources for learning about the project, asking and answering - questions, and collaboratively discussing and documenting mapping topics. - Get help here. With an organization making plans for OpenStreetMap? Check out the Welcome Mat. + %{imports_link} and %{automated_edits_link}. + imports: Imports + imports_url: https://wiki.openstreetmap.org/wiki/Import/Guidelines + automated_edits: Automated Edits + automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct start_mapping: Start Mapping add_a_note: title: No Time To Edit? Add a Note! - paragraph_1_html: | + para_1: | If you just want something small fixed and don't have the time to sign up and learn how to edit, it's easy to add a note. - paragraph_2_html: | - Just go to the map and click the note icon: - . 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. + para_2_html: | + Just go to %{map_link} and click the note icon: %{note_icon}. + 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. + the_map: the map communities: title: Communities lede_text: | @@ -2393,7 +2381,11 @@ en: public_traces_from: "Public GPS Traces from %{user}" description: "Browse recent GPS trace uploads" tagged_with: " tagged with %{tags}" - empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." + empty_title: Nothing here yet + empty_upload_html: "%{upload_link} or learn more about GPS tracing on the %{wiki_link}." + upload_new: Upload a new trace + wiki_page: wiki page + wiki_page_url: https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2 upload_trace: "Upload a trace" all_traces: "All Traces" my_traces: "My Traces" @@ -2558,13 +2550,8 @@ en: support: support about: header: Free and editable - html: | -

Unlike other maps, OpenStreetMap is completely created by people like you, - and it's free for anyone to fix, update, download and use.

-

Sign up to get started contributing. We'll send an email to confirm your account.

- email address: "Email Address:" - confirm email address: "Confirm Email Address:" - display name: "Display Name:" + 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." external auth: "Third Party Authentication:" use external auth: "Alternatively, use a third party to login" @@ -2604,7 +2591,6 @@ en: deleted: "deleted" show: my diary: My Diary - new diary entry: new diary entry my edits: My Edits my traces: My Traces my notes: My Notes @@ -2633,8 +2619,6 @@ en: created from: "Created from:" status: "Status:" spam score: "Spam Score:" - description: Description - user location: User location role: administrator: "This user is an administrator" moderator: "This user is a moderator" @@ -2649,7 +2633,6 @@ en: comments: "Comments" create_block: "Block this User" activate_user: "Activate this User" - deactivate_user: "Deactivate this User" confirm_user: "Confirm this User" unconfirm_user: "Unconfirm this User" unsuspend_user: "Unsuspend this User" @@ -2658,8 +2641,6 @@ en: delete_user: "Delete this User" confirm: "Confirm" report: Report this User - set_home: - flash success: "Home location saved successfully" go_public: flash success: "All your edits are now public, and you are now allowed to edit." index: @@ -2679,7 +2660,6 @@ en: support: support automatically_suspended: Sorry, your account has been automatically suspended due to suspicious activity. contact_support_html: This decision will be reviewed by an administrator shortly, or you may contact %{support_link} if you wish to discuss this. - support: support auth_failure: connection_failed: Connection to authentication provider failed invalid_credentials: Invalid authentication credentials @@ -2824,6 +2804,38 @@ en: description: "Description" created_at: "Created at" last_changed: "Last changed" + show: + title: "Note: %{id}" + description: "Description" + 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}" + report: report this note + coordinates_html: "%{latitude}, %{longitude}" + anonymous_warning: This note includes comments from anonymous users which should be independently verified. + hide: Hide + resolve: Resolve + reactivate: Reactivate + comment_and_resolve: Comment & Resolve + comment: Comment + 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." + disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}." + 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." + 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: close: Close share: @@ -2901,22 +2913,6 @@ en: unsubscribe: "Unsubscribe" hide_comment: "hide" unhide_comment: "unhide" - notes: - new: - 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." - 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 - show: - anonymous_warning: This note includes comments from anonymous users which should be independently verified. - hide: Hide - resolve: Resolve - reactivate: Reactivate - comment_and_resolve: Comment & Resolve - comment: Comment - 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." - disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}." edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: ascend: "Ascend" @@ -2933,6 +2929,8 @@ en: descend: "Descend" directions: "Directions" distance: "Distance" + distance_m: "%{distance}m" + distance_km: "%{distance}km" errors: no_route: "Couldn't find a route between those two places." no_place: "Sorry - couldn't locate '%{place}'."