X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/26698d6d267ab410d082a9b774b3ad5f9dc86b05..0e00857d51f2890071698b8ac9e699ce444aa3a3:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 1b411a229..8025b617f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -10,7 +10,7 @@ en: prompt: Choose file submit: diary_comment: - create: Save + create: Comment diary_entry: create: "Publish" update: "Update" @@ -21,7 +21,7 @@ en: client_application: create: Register update: Update - doorkeeper_application: + oauth2_application: create: Register update: Update redaction: @@ -38,7 +38,7 @@ en: messages: invalid_email_address: does not appear to be a valid e-mail address email_address_not_routable: is not routable - # Translates all the model names, which is used in error handling on the web site + # Translates all the model names, which is used in error handling on the website models: acl: "Access Control List" changeset: "Changeset" @@ -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" @@ -75,8 +74,8 @@ en: way: "Way" way_node: "Way Node" way_tag: "Way Tag" - # Translates all the model attributes, which is used in error handling on the web site - # Only the ones that are used on the web site are translated at the moment + # Translates all the model attributes, which is used in error handling on the website + # Only the ones that are used on the website are translated at the moment attributes: client_application: name: Name (Required) @@ -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 @@ -109,13 +109,12 @@ en: trace: user: "User" visible: "Visible" - name: "Name" + name: Filename size: "Size" latitude: "Latitude" longitude: "Longitude" public: "Public" description: "Description" - name: Filename gpx_file: Upload GPX File visibility: Visibility tagstring: Tags @@ -155,46 +154,45 @@ 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: about_x_hours: - one: about 1 hour ago + one: about %{count} hour ago other: about %{count} hours ago about_x_months: - one: about 1 month ago + one: about %{count} month ago other: about %{count} months ago about_x_years: - one: about 1 year ago + one: about %{count} year ago other: about %{count} years ago almost_x_years: - one: almost 1 year ago + one: almost %{count} year ago other: almost %{count} years ago half_a_minute: half a minute ago less_than_x_seconds: - one: less than 1 second ago + one: less than %{count} second ago other: less than %{count} seconds ago less_than_x_minutes: - one: less than a minute ago + one: less than %{count} minute ago other: less than %{count} minutes ago over_x_years: - one: over 1 year ago + one: over %{count} year ago other: over %{count} years ago x_seconds: - one: 1 second ago + one: "%{count} second ago" other: "%{count} seconds ago" x_minutes: - one: 1 minute ago + one: "%{count} minute ago" other: "%{count} minutes ago" x_days: - one: 1 day ago + one: "%{count} day ago" other: "%{count} days ago" x_months: - one: 1 month ago + one: "%{count} month ago" other: "%{count} months ago" x_years: - one: 1 year ago + one: "%{count} year ago" other: "%{count} years ago" printable_name: with_id: "%{id}" @@ -214,7 +212,7 @@ en: openid: OpenID google: Google facebook: Facebook - windowslive: Windows Live + windowslive: Microsoft github: GitHub wikipedia: Wikipedia api: @@ -239,25 +237,84 @@ en: entry: comment: Comment full: Full note + account: + deletions: + show: + title: Delete My Account + warning: Warning! The account deletion process is final, and cannot be reversed. + delete_account: Delete Account + delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:" + delete_profile: Your profile information, including your avatar, description and home location will be removed. + delete_display_name: Your display name will be removed, and can be reused by other accounts. + retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:" + retain_edits: Your edits to the map database, if any, will be retained. + retain_traces: Your uploaded traces, if any, will be retained. + retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view. + 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. + confirm_delete: Are you sure? + cancel: Cancel + accounts: + edit: + title: "Edit account" + my settings: My Settings + current email address: "Current Email Address" + external auth: "External Authentication" + openid: + link: "https://wiki.openstreetmap.org/wiki/OpenID" + link text: "what is this?" + public editing: + heading: "Public editing" + enabled: "Enabled. Not anonymous and can edit data." + enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits" + 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?" + contributor terms: + heading: "Contributor Terms" + agreed: "You have agreed to the new Contributor Terms." + not yet agreed: "You have not yet agreed to the new Contributor Terms." + review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms." + agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain." + link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms" + link text: "what is this?" + save changes button: Save Changes + 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." + 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}" + 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}" + deleted_ago_by_html: "Deleted %{time_ago} by %{user}" + edited_ago_by_html: "Edited %{time_ago} by %{user}" version: "Version" in_changeset: "Changeset" anonymous: "anonymous" no_comment: "(no comment)" part_of: "Part of" part_of_relations: - one: 1 relation + one: "%{count} relation" other: "%{count} relations" part_of_ways: - one: 1 way + one: "%{count} way" other: "%{count} ways" download_xml: "Download XML" view_history: "View History" @@ -275,8 +332,8 @@ en: 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}" + hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}" + comment_by_html: "Comment from %{user} %{time_ago}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: @@ -302,7 +359,7 @@ en: history_title_html: "Relation History: %{name}" members: "Members" members_count: - one: 1 member + one: "%{count} member" other: "%{count} members" relation_member: entry_html: "%{type} %{name}" @@ -353,24 +410,7 @@ en: wikimedia_commons_link: "The %{page} item on Wikimedia Commons" telephone_link: "Call %{phone_number}" colour_preview: "Colour %{colour_value} preview" - 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}" + email_link: "Email %{email}" query: title: "Query Features" introduction: "Click on the map to find nearby features." @@ -394,6 +434,7 @@ en: index: title: "Changesets" title_user: "Changesets by %{user}" + title_user_link_html: "Changesets by %{user_link}" title_friend: "Changesets by my friends" title_nearby: "Changesets by nearby users" empty: "No changesets found." @@ -416,6 +457,26 @@ en: title_particular: "OpenStreetMap changeset #%{changeset_id} discussion" timeout: sorry: "Sorry, the list of changeset comments you requested took too long to retrieve." + dashboards: + contact: + km away: "%{count}km away" + m away: "%{count}m away" + popup: + your location: "Your location" + nearby mapper: "Nearby mapper" + friend: "Friend" + show: + title: My Dashboard + no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users." + edit_your_profile: Edit your profile + my friends: My friends + no friends: You have not added any friends yet. + nearby users: "Other nearby users" + no nearby users: "There are no other users who admit to mapping nearby yet." + friends_changesets: "friends' changesets" + friends_diaries: "friends' diary entries" + nearby_changesets: "nearby user changesets" + nearby_diaries: "nearby user diary entries" diary_entries: new: title: New Diary Entry @@ -484,7 +545,9 @@ en: title: "OpenStreetMap diary entries" description: "Recent diary entries from users of OpenStreetMap" comments: - has_commented_on: "%{display_name} has commented on the following diary entries" + title: "Diary Comments added by %{user}" + heading: "%{user}'s Diary Comments" + subheading_html: "Diary Comments added by %{user}" no_comments: "No diary comments" post: Post when: When @@ -496,6 +559,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?" @@ -512,12 +590,13 @@ en: geocoder: 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' + 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: @@ -535,17 +614,17 @@ en: aeroway: aerodrome: "Aerodrome" airstrip: "Airstrip" - apron: "Apron" - gate: "Gate" + apron: "Airport Apron" + gate: "Airport Gate" hangar: "Hangar" helipad: "Helipad" holding_position: "Holding Position" - navigationaid: "Aviation Navigation aid" + navigationaid: "Aviation Navigation Aid" parking_position: "Parking Position" runway: "Runway" taxilane: "Taxilane" taxiway: "Taxiway" - terminal: "Terminal" + terminal: "Airport Terminal" windsock: "Windsock" amenity: animal_boarding: "Animal Boarding" @@ -591,7 +670,7 @@ en: fire_station: "Fire Station" food_court: "Food Court" fountain: "Fountain" - fuel: "Fuel" + fuel: "Filling Station" gambling: "Gambling" grave_yard: "Grave Yard" grit_bin: "Grit Bin" @@ -600,7 +679,7 @@ en: ice_cream: "Ice Cream" internet_cafe: "Internet Cafe" kindergarten: "Kindergarten" - language_school: "Language school" + language_school: "Language School" library: "Library" loading_dock: "Loading Dock" love_hotel: "Love Hotel" @@ -719,7 +798,7 @@ en: "yes": "Building" club: scout: "Scout Group Base" - sport: "Sportsclub" + sport: "Sports Club" "yes": "Club" craft: beekeeper: "Beekeeper" @@ -760,7 +839,6 @@ en: siren: "Emergency Siren" suction_point: "Emergency Suction Point" water_tank: "Emergency Water Tank" - "yes": "Emergency" highway: abandoned: "Abandoned Highway" bridleway: "Bridleway" @@ -768,6 +846,7 @@ en: bus_stop: "Bus Stop" construction: "Highway under Construction" corridor: "Corridor" + crossing: "Crossing" cycleway: "Cycle Path" elevator: "Elevator" emergency_access_point: "Emergency Access Point" @@ -807,6 +886,7 @@ en: trailhead: "Trailhead" trunk: "Trunk Road" trunk_link: "Trunk Road" + turning_circle: "Turning Circle" turning_loop: "Turning Loop" unclassified: "Unclassified Road" "yes" : "Road" @@ -855,9 +935,8 @@ en: brownfield: "Brownfield Land" cemetery: "Cemetery" commercial: "Commercial Area" - conservation: "Conservation" - construction: "Construction" - farm: "Farm" + conservation: "Conservation Area" + construction: "Construction Area" farmland: "Farmland" farmyard: "Farmyard" forest: "Forest" @@ -878,7 +957,7 @@ en: reservoir: "Reservoir" reservoir_watershed: "Reservoir Watershed" residential: "Residential Area" - retail: "Retail" + retail: "Retail Area" village_green: "Village Green" vineyard: "Vineyard" "yes": "Landuse" @@ -899,7 +978,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" @@ -1002,6 +1081,7 @@ en: hill: "Hill" hot_spring: "Hot Spring" island: "Island" + isthmus: "Isthmus" land: "Land" marsh: "Marsh" moor: "Moor" @@ -1016,10 +1096,13 @@ en: sand: "Sand" scree: "Scree" scrub: "Scrub" + shingle: "Shingle" spring: "Spring" stone: "Stone" strait: "Strait" tree: "Tree" + tree_row: "Tree Row" + tundra: "Tundra" valley: "Valley" volcano: "Volcano" water: "Water" @@ -1084,6 +1167,7 @@ en: "yes": "Place" railway: abandoned: "Abandoned Railway" + buffer_stop: "Buffer Stop" construction: "Railway under Construction" disused: "Disused Railway" funicular: "Funicular Railway" @@ -1097,6 +1181,7 @@ en: platform: "Railway Platform" preserved: "Preserved Railway" proposed: "Proposed Railway" + rail: "Rail" spur: "Railway Spur" station: "Railway Station" stop: "Railway Stop" @@ -1105,6 +1190,7 @@ en: switch: "Railway Points" tram: "Tramway" tram_stop: "Tram Stop" + turntable: "Turntable" yard: "Railway Yard" shop: agrarian: "Agrarian Shop" @@ -1145,7 +1231,7 @@ en: deli: "Deli" department_store: "Department Store" discount: "Discount Items Shop" - doityourself: "Do-It-Yourself" + doityourself: "Do-It-Yourself Shop" dry_cleaning: "Dry Cleaning" e-cigarette: "E-Cigarette Shop" electronics: "Electronics Shop" @@ -1171,7 +1257,7 @@ en: health_food: "Health Food Store" hearing_aids: "Hearing Aids" herbalist: "Herbalist" - hifi: "Hi-Fi" + hifi: "Hi-Fi Shop" houseware: "Houseware Shop" ice_cream: "Ice Cream Shop" interior_decoration: "Interior Decoration" @@ -1231,7 +1317,7 @@ en: artwork: "Artwork" attraction: "Attraction" bed_and_breakfast: "Bed and Breakfast" - cabin: "Cabin" + cabin: "Tourist Cabin" camp_pitch: "Camp Pitch" camp_site: "Camp Site" caravan_site: "Caravan Site" @@ -1304,27 +1390,21 @@ 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 - reported_user: Reported User reports_count: - one: "1 Report" + one: "%{count} Report" other: "%{count} Reports" reported_item: Reported Item states: 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: zero: No reports - one: 1 report + one: "%{count} report" other: "%{count} reports" report_created_at: "First reported at %{datetime}" last_resolved_at: "Last resolved at %{datetime}" @@ -1356,6 +1436,7 @@ en: issue_comments: create: comment_created: Your comment was successfully created + issue_reassigned: Your comment was created and the issue was reassigned reports: new: title_html: "Report %{link}" @@ -1401,10 +1482,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 @@ -1420,8 +1499,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}, %{bytemark}, and other %{partners}." + hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}." partners_ucl: "UCL" + partners_fastly: "Fastly" partners_bytemark: "Bytemark Hosting" partners_partners: "partners" tou: "Terms of Use" @@ -1431,11 +1511,10 @@ en: help: Help about: About copyright: Copyright + communities: Communities 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 @@ -1475,9 +1554,9 @@ en: subject: "[OpenStreetMap] GPX Import failure" gpx_success: hi: "Hi %{to_user}," - loaded_successfully: - one: loaded successfully with %{trace_points} out of a possible 1 point. - other: loaded successfully with %{trace_points} out of a possible %{possible_points} points. + 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." subject: "[OpenStreetMap] GPX Import success" signup_confirm: subject: "[OpenStreetMap] Welcome to OpenStreetMap" @@ -1550,7 +1629,8 @@ en: success: "Confirmed your account, thanks for signing up!" already active: "This account has already been confirmed." unknown token: "That confirmation code has expired or does not exist." - reconfirm_html: "If you need us to resend the confirmation email, click here." + resend_html: "If you need us to resend the confirmation email, %{reconfirm_link}." + click_here: click here confirm_resend: failure: "User %{name} not found." confirm_email: @@ -1588,8 +1668,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" @@ -1614,14 +1692,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" @@ -1693,14 +1767,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." - account is suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact support if you wish to discuss this. auth failure: "Sorry, could not log in with those details." openid_logo_alt: "Log in with an OpenID" auth_providers: @@ -1714,8 +1782,8 @@ en: title: Login with Facebook alt: Login with a Facebook Account windowslive: - title: Login with Windows Live - alt: Login with a Windows Live Account + title: Login with Microsoft + alt: Login with a Microsoft Account github: title: Login with GitHub alt: Login with a GitHub Account @@ -1732,9 +1800,15 @@ en: title: "Logout" heading: "Logout from OpenStreetMap" logout_button: "Logout" + suspended_flash: + suspended: Sorry, your account has been suspended due to suspicious activity. + contact_support_html: Please contact %{support_link} if you wish to discuss this. + support: support shared: markdown_help: - title_html: Parsed with kramdown + heading_html: Parsed with %{kramdown_link} + kramdown_url: https://kramdown.gettalong.org/quickref.html + kramdown: kramdown headings: Headings heading: Heading subheading: Subheading @@ -1753,8 +1827,9 @@ en: site: about: next: Next - copyright_html: ©OpenStreetMap
contributors - used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices" + heading_html: "%{copyright}OpenStreetMap %{br} contributors" + copyright_symbol_html: "©" + used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices" lede_text: | OpenStreetMap is built by a community of mappers that contribute and maintain data about roads, trails, cafés, railway stations, and much more, all over the world. @@ -1764,35 +1839,52 @@ en: aerial imagery, GPS devices, and low-tech field maps to verify that OSM is accurate and up to date. community_driven_title: Community Driven - community_driven_html: | + community_driven_1_html: | OpenStreetMap's community is diverse, passionate, and growing every day. Our contributors include enthusiast mappers, GIS professionals, engineers running the OSM servers, humanitarians mapping disaster-affected areas, and many more. - To learn more about the community, see the - OpenStreetMap Blog, - user diaries, - community blogs, and - the OSM Foundation website. + To learn more about the community, see the %{osm_blog_link}, + %{user_diaries_link}, %{community_blogs_link}, and the + %{osm_foundation_link} website. + community_driven_osm_blog: OpenStreetMap Blog + community_driven_osm_blog_url: https://blog.openstreetmap.org + community_driven_user_diaries: user diaries + community_driven_community_blogs: community blogs + community_driven_community_blogs_url: https://blogs.openstreetmap.org/ + community_driven_osm_foundation: OSM Foundation + community_driven_osm_foundation_url: https://www.osmfoundation.org/ open_data_title: Open Data - open_data_html: | - OpenStreetMap is open data: you are free to use it for any purpose + open_data_1_html: | + OpenStreetMap is %{open_data}: you are free to use it for any purpose as long as you credit OpenStreetMap and its contributors. If you alter or build upon the data in certain ways, you may distribute the result only - under the same licence. See the Copyright and - License page for details. + under the same licence. See the %{copyright_license_link} for details. + open_data_open_data: open data + open_data_copyright_license: Copyright and License page legal_title: Legal - legal_1_html: | + legal_1_1_html: | This site and many other related services are formally operated by the - OpenStreetMap Foundation (OSMF) + %{openstreetmap_foundation_link} (OSMF) on behalf of the community. Use of all OSMF operated services is subject - to our Terms of Use, - Acceptable Use Policies and our Privacy Policy. - legal_2_html: | - Please contact the OSMF + to our %{terms_of_use_link}, %{aup_link} and our %{privacy_policy_link}. + legal_1_1_openstreetmap_foundation: OpenStreetMap Foundation + legal_1_1_openstreetmap_foundation_url: https://osmfoundation.org/ + legal_1_1_terms_of_use: Terms of Use + legal_1_1_terms_of_use_url: https://wiki.osmfoundation.org/wiki/Terms_of_Use + legal_1_1_aup: Acceptable Use Policies + legal_1_1_aup_url: https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy + legal_1_1_privacy_policy: Privacy Policy + legal_1_1_privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy + legal_2_1_html: | + Please %{contact_the_osmf_link} if you have licensing, copyright or other legal questions. -
- OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. + legal_2_1_contact_the_osmf: contact the OSMF + legal_2_1_contact_the_osmf_url: https://osmfoundation.org/Contact + legal_2_2_html: | + OpenStreetMap, the magnifying glass logo and State of the Map are %{registered_trademarks_link}. + legal_2_2_registered_trademarks: registered trademarks of the OSMF + legal_2_2_registered_trademarks_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy partners_title: Partners copyright: foreign: @@ -1806,118 +1898,166 @@ en: mapping_link: start mapping legal_babble: title_html: Copyright and License - intro_1_html: | - OpenStreetMap® is open data, licensed under the Open Data - Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF). - intro_2_html: | + introduction_1_html: | + OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the + %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF). + introduction_1_registered_trademark_html: "®" + introduction_1_open_data: open data + introduction_1_odc_odbl: Open Data Commons Open Database License + introduction_1_odc_odbl_url: https://opendatacommons.org/licenses/odbl/ + introduction_1_osm_foundation: OpenStreetMap Foundation + introduction_1_osm_foundation_url: https://osmfoundation.org/ + introduction_2_html: | You are free to copy, distribute, transmit and adapt our data, as long as you credit OpenStreetMap and its contributors. If you alter or build upon our data, you may distribute the result only under the same licence. The - full legal - code explains your rights and responsibilities. - intro_3_1_html: | - Our documentation is licensed under the - Creative - Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0). + full %{legal_code_link} explains your rights and responsibilities. + introduction_2_legal_code: legal code + introduction_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1.0/ + introduction_3_html: | + Our documentation is licensed under the %{creative_commons_link} license (CC BY-SA 2.0). + introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0 + introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/ credit_title_html: How to credit OpenStreetMap credit_1_html: | - We require that you use the credit “© OpenStreetMap - contributors”. - credit_2_1_html: | - You must also make it clear that the data is available under the Open - Database License. You may do this by linking to - this copyright page. + Where you use OpenStreetMap data, you are required to do the following two things: + credit_2_1: Provide credit to OpenStreetMap by displaying our copyright notice. + credit_2_2: Make clear that the data is available under the Open Database License. + credit_3_html: | + For the copyright notice, we have different requirements on how this should be + displayed, depending on how you are using our data. For example, different + rules apply on how to show the copyright notice depending on whether you have + created a browsable map, a printed map or a static image. Full details on the + requirements can be found in the %{attribution_guidelines_link}. + credit_3_attribution_guidelines: Attribution Guidelines + credit_3_attribution_guidelines_url: https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines + credit_4_1_html: | + To make clear that the data is available under the Open + Database License, you may link to %{this_copyright_page_link}. Alternatively, and as a requirement if you are distributing OSM in a data form, you can name and link directly to the license(s). In media where links are not possible (e.g. printed works), we suggest you direct your readers to openstreetmap.org (perhaps by expanding 'OpenStreetMap' to this full address) and to opendatacommons.org. - credit_3_1_html: | - The map tiles in the “standard style” at www.openstreetmap.org are a - Produced Work by the OpenStreetMap Foundation using OpenStreetMap data - under the Open Database License. If you are using these tiles please use - the following attribution: - “Base map and data from OpenStreetMap and OpenStreetMap Foundation”. - credit_4_html: | - For a browsable electronic map, the credit should appear in the corner of the map. - For example: + In this example, the credit appears in the corner of the map. + credit_4_1_this_copyright_page: this copyright page attribution_example: alt: Example of how to attribute OpenStreetMap on a webpage title: Attribution example more_title_html: Finding out more - more_1_html: | - Read more about using our data, and how to credit us, at the OSMF Licence page. - more_2_html: | + more_1_1_html: Read more about using our data, and how to credit us, at the %{osmf_licence_page_link}. + more_1_1_osmf_licence_page: OSMF Licence page + more_1_1_osmf_licence_page_url: https://osmfoundation.org/Licence + more_2_1_html: | Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-parties. - See our API Usage Policy, - Tile Usage Policy - and Nominatim Usage Policy. + See our %{api_usage_policy_link}, %{tile_usage_policy_link} and %{nominatim_usage_policy_link}. + more_2_1_api_usage_policy: API Usage Policy + more_2_1_api_usage_policy_url: https://operations.osmfoundation.org/policies/api/ + more_2_1_tile_usage_policy: Tile Usage Policy + more_2_1_tile_usage_policy_url: https://operations.osmfoundation.org/policies/tiles/ + more_2_1_nominatim_usage_policy: Nominatim Usage Policy + more_2_1_nominatim_usage_policy_url: https://operations.osmfoundation.org/policies/nominatim/ contributors_title_html: Our contributors contributors_intro_html: | Our contributors are thousands of individuals. We also include openly-licensed data from national mapping agencies and other sources, among them: - contributors_at_html: | - Austria: Contains data from - Stadt Wien (under - CC BY), - Land Vorarlberg and - Land Tirol (under CC BY AT with amendments). - contributors_au_html: | - Australia: Contains data sourced from - PSMA Australia Limited - licensed by the Commonwealth of Australia under - CC BY 4.0. - contributors_ca_html: | - Canada: Contains data from + contributors_at_credit_html: | + %{austria}: Contains data from %{stadt_wien_link} (under %{cc_by_link}), %{land_vorarlberg_link} + and Land Tirol (under %{cc_by_at_with_amendments_link}). + contributors_at_austria: Austria + contributors_at_stadt_wien: Stadt Wien + contributors_at_stadt_wien_url: https://data.wien.gv.at/ + contributors_at_cc_by: CC BY + contributors_at_cc_by_url: https://creativecommons.org/licenses/by/3.0/at/deed.de + contributors_at_land_vorarlberg: Land Vorarlberg + contributors_at_land_vorarlberg_url: https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm + contributors_at_cc_by_at_with_amendments: CC BY AT with amendments + contributors_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/ + contributors_au_credit_html: | + %{australia}: Incorporates or developed using Administrative Boundaries © %{geoscape_australia_link} + licensed by the Commonwealth of Australia under %{cc_licence_link}. + contributors_au_australia: Australia + contributors_au_geoscape_australia: Geoscape Australia + contributors_au_geoscape_australia_url: https://geoscape.com.au/legal/data-copyright-and-disclaimer/ + contributors_au_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0) + contributors_au_cc_licence_url: https://creativecommons.org/licenses/by/4.0/ + contributors_ca_credit_html: | + %{canada}: Contains data from GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada). - contributors_fi_html: | - Finland: Contains data from the + contributors_ca_canada: Canada + contributors_fi_credit_html: | + %{finland}: Contains data from the National Land Survey of Finland's Topographic Database - and other datasets, under the - NLSFI License. - contributors_fr_html: | - France: Contains data sourced from + and other datasets, under the %{nlsfi_license_link}. + contributors_fi_finland: Finland + contributors_fi_nlsfi_license: NLSFI License + contributors_fi_nlsfi_license_url: https://www.maanmittauslaitos.fi/en/opendata-licence-version1 + contributors_fr_credit_html: | + %{france}: Contains data sourced from Direction Générale des Impôts. - contributors_nl_html: | - Netherlands: Contains © AND data, 2007 - (www.and.com) - contributors_nz_html: | - New Zealand: Contains data sourced from the - LINZ Data Service and - licensed for reuse under - CC BY 4.0. - contributors_si_html: | - Slovenia: Contains data from the - Surveying and Mapping Authority and - Ministry of Agriculture, Forestry and Food + contributors_fr_france: France + contributors_nl_credit_html: | + %{netherlands}: Contains © AND data, 2007 (%{and_link}) + contributors_nl_netherlands: Netherlands + contributors_nl_and: www.and.com + contributors_nl_and_url: https://www.and.com + contributors_nz_credit_html: | + %{new_zealand}: Contains data sourced from the %{linz_data_service_link} + and licensed for reuse under %{cc_by_link}. + contributors_nz_new_zealand: New Zealand + contributors_nz_linz_data_service: LINZ Data Service + 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_es_html: | - Spain: Contains data sourced from the - Spanish National Geographic Institute (IGN) and - National Cartographic System (SCNE) - licensed for reuse under CC BY 4.0. - contributors_za_html: | - South Africa: Contains data sourced from - Chief Directorate: - National Geo-Spatial Information, State copyright reserved. - contributors_gb_html: | - United Kingdom: Contains Ordnance + contributors_si_slovenia: Slovenia + contributors_si_gu: Surveying and Mapping Authority + 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: 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 + National Cartographic System (%{scne_link}) + licensed for reuse under %{cc_by_link}. + contributors_es_spain: Spain + contributors_es_ign: IGN + contributors_es_ign_url: https://www.ign.es/ + contributors_es_scne: SCNE + 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: https://ngi.dalrrd.gov.za/ + contributors_gb_credit_html: | + %{united_kingdom}: Contains Ordnance Survey data © Crown copyright and database right - 2010-19. - contributors_footer_1_html: | + 2010-2023. + contributors_gb_united_kingdom: United Kingdom + contributors_2_html: | For further details of these, and other sources that have been used - to help improve OpenStreetMap, please see the Contributors - page on the OpenStreetMap Wiki. + to help improve OpenStreetMap, please see the %{contributors_page_link} on the OpenStreetMap Wiki. + contributors_2_contributors_page: Contributors page + contributors_2_contributors_page_url: https://wiki.openstreetmap.org/wiki/Contributors contributors_footer_2_html: | Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or @@ -1927,15 +2067,22 @@ en: OSM contributors are reminded never to add data from any copyrighted sources (e.g. Google Maps or printed maps) without explicit permission from the copyright holders. - infringement_2_html: | + infringement_2_1_html: | If you believe that copyrighted material has been inappropriately added to the OpenStreetMap database or this site, please refer - to our takedown - procedure or file directly at our - on-line filing page. - trademarks_title_html: Trademarks - trademarks_1_html: | - OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our Trademark Policy. + to our %{takedown_procedure_link} or file directly at our + %{online_filing_page_link}. + infringement_2_1_takedown_procedure: takedown procedure + infringement_2_1_takedown_procedure_url: https://wiki.osmfoundation.org/wiki/Takedown_procedure + infringement_2_1_online_filing_page: on-line filing page + infringement_2_1_online_filing_page_url: https://dmca.openstreetmap.org/ + trademarks_title: Trademarks + trademarks_1_1_html: | + OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the + OpenStreetMap Foundation. If you have questions about your use of the marks, please see our + %{trademark_policy_link}. + trademarks_1_1_trademark_policy: Trademark Policy + trademarks_1_1_trademark_policy_url: https://wiki.osmfoundation.org/wiki/Trademark_Policy 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." @@ -1965,7 +2112,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." @@ -1978,12 +2127,9 @@ 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" + description: "Additional sources listed on the OpenStreetMap Wiki" options: "Options" format: "Format" scale: "Scale" @@ -2006,16 +2152,18 @@ 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: title: Other concerns - explanation_html: | + concerns_html: | If you have concerns about how our data is being used or about the contents please consult our - copyright page for more legal information, or contact the appropriate - OSMF working group. + %{copyright_link} for more legal information, or contact the appropriate %{working_group_link}. + copyright: copyright page + working_group: OSMF working group + working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups help: title: Getting Help introduction: | @@ -2037,10 +2185,10 @@ en: 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. - forums: - url: https://forum.openstreetmap.org/ - title: Forums - description: Questions and discussions for those that prefer a bulletin board style interface. + 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 @@ -2059,8 +2207,20 @@ en: description: Browse the wiki for in-depth OpenStreetMap documentation. potlatch: 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 user settings here. + desktop_application_html: You can still use Potlatch by %{download_link}. + download: downloading the desktop application for Mac and Windows + download_url: https://www.systemed.net/potlatch/ + id_editor_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. %{change_preferences_link}. + change_preferences: 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 @@ -2113,6 +2273,7 @@ en: common: - Common - meadow + - garden retail: "Retail area" industrial: "Industrial area" commercial: "Commercial area" @@ -2146,57 +2307,81 @@ 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: | + People from all over the world contribute to or use OpenStreetMap. + While many participate as individuals, others have formed communities. + These groups come in a range of sizes and represent geographies from small towns to large multi-country regions. + They can also be formal or informal. + local_chapters: + title: Local Chapters + about_text: | + Local Chapters are country-level or region-level groups that have taken the formal step of + establishing not-for-profit legal entities. They represent the area's map and mappers when + dealing with local government, business, and media. They have also formed an affiliation + with the OpenStreetMap Foundation (OSMF), giving them a link to the legal and copyright + governing body. + list_text: | + The following communities are formally established as Local Chapters: + other_groups: + title: Other Groups + other_groups_html: | + There is no need to formally establish a group to the same extent as the Local Chapters. + Indeed many groups exist very sucessfully as an informal gathering of people or as a + community group. Anyone can set up or join these. Read more on the %{communities_wiki_link}. + communities_wiki: Communities wiki page + communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group traces: visibility: private: "Private (only shared as anonymous, unordered points)" @@ -2254,7 +2439,7 @@ en: trace: pending: "PENDING" count_points: - one: "1 point" + one: "%{count} point" other: "%{count} points" more: "more" trace_details: "View Trace Details" @@ -2268,11 +2453,15 @@ en: in: "in" index: public_traces: "Public GPS Traces" - my_traces: "My GPS Traces" + my_gps_traces: "My GPS Traces" 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" @@ -2301,9 +2490,14 @@ en: require_admin: not_an_admin: You need to be an admin to perform that action. setup_user_auth: - blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits." + blocked_zero_hour: "You have an urgent message on the OpenStreetMap website. You need to read the message before you will be able to save your edits." blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." + settings_menu: + account_settings: Account Settings + oauth1_settings: OAuth 1 settings + oauth2_applications: OAuth 2 applications + oauth2_authorizations: OAuth 2 authorizations oauth: authorize: title: "Authorize access to your account" @@ -2337,6 +2531,8 @@ en: read_gpx: Read private GPS traces write_gpx: Upload GPS traces write_notes: Modify notes + read_email: Read user email address + skip_authorization: Auto approve application oauth_clients: new: title: "Register a new application" @@ -2426,22 +2622,22 @@ en: new: title: "Sign Up" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." - contact_support_html: 'Please contact support to arrange for an account to be created - we will try and deal with the request as quickly as possible.' + 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 - 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" 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" @@ -2453,8 +2649,10 @@ en: read_tou: "I have read and agree to the Terms of Use" 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://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain - guidance_html: 'Information to help understand these terms: a human readable summary and some informal translations' + consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain + guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}" + readable_summary: human readable summary + informal_translations: informal translations continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" @@ -2475,7 +2673,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 @@ -2484,6 +2681,7 @@ en: my settings: My Settings my comments: My Comments my_preferences: My Preferences + my_dashboard: My Dashboard blocks on me: Blocks on Me blocks by me: Blocks by Me edit_profile: Edit Profile @@ -2503,15 +2701,6 @@ en: created from: "Created from:" status: "Status:" spam score: "Spam Score:" - description: Description - user location: User location - set_location_html: "Edit your profile and set your home location to see nearby users." - my friends: My friends - no friends: You have not added any friends yet. - km away: "%{count}km away" - m away: "%{count}m away" - nearby users: "Other nearby users" - no nearby users: "There are no other users who admit to mapping nearby yet." role: administrator: "This user is an administrator" moderator: "This user is a moderator" @@ -2526,57 +2715,14 @@ 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" hide_user: "Hide this User" unhide_user: "Unhide this User" delete_user: "Delete this User" confirm: "Confirm" - friends_changesets: "friends' changesets" - friends_diaries: "friends' diary entries" - nearby_changesets: "nearby user changesets" - nearby_diaries: "nearby user diary entries" report: Report this User - popup: - your location: "Your location" - nearby mapper: "Nearby mapper" - friend: "Friend" - account: - title: "Edit account" - my settings: My Settings - current email address: "Current Email Address" - external auth: "External Authentication" - openid: - link: "https://wiki.openstreetmap.org/wiki/OpenID" - link text: "what is this?" - public editing: - heading: "Public editing" - enabled: "Enabled. Not anonymous and can edit data." - enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits" - 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." - not yet agreed: "You have not yet agreed to the new Contributor Terms." - review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms." - agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain." - link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms" - link text: "what is this?" - save changes button: Save Changes - make edits public button: Make all my edits public - return to profile: Return to profile - oauth1 settings: OAuth 1 settings - oauth2 applications: OAuth 2 applications - oauth2 authorizations: OAuth 2 authorizations - flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address." - flash update success: "User information updated successfully." - 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: @@ -2594,21 +2740,15 @@ en: title: Account Suspended heading: Account Suspended support: support - body_html: | -

- Sorry, your account has been automatically suspended due to - suspicious activity. -

-

- This decision will be reviewed by an administrator shortly, or - you may contact %{webmaster} if you wish to discuss this. -

+ 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. auth_failure: connection_failed: Connection to authentication provider failed invalid_credentials: Invalid authentication credentials no_authorization_code: No authorization code unknown_signature_algorithm: Unknown signature algorithm invalid_scope: Invalid scope + unknown_error: Authentication failed auth_association: heading: Your ID is not associated with a OpenStreetMap account yet. option_1: | @@ -2647,8 +2787,6 @@ en: title: "Creating block on %{name}" heading_html: "Creating block on %{name}" period: "How long, starting now, the user will be blocked from the API for." - tried_contacting: "I have contacted the user and asked them to stop." - tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications." back: "View all blocks" edit: title: "Editing block on %{name}" @@ -2660,8 +2798,6 @@ en: block_expired: "The block has already expired and cannot be edited." block_period: "The blocking period must be one of the values selectable in the drop-down list." create: - try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond." - try_waiting: "Please try giving the user a reasonable time to respond before blocking them." flash: "Created a block on user %{name}." update: only_creator_can_edit: "Only the moderator who created this block can edit it." @@ -2685,19 +2821,19 @@ en: time_past_html: "Ended %{time}." block_duration: hours: - one: "1 hour" + one: "%{count} hour" other: "%{count} hours" days: - one: "1 day" + one: "%{count} day" other: "%{count} days" weeks: - one: "1 week" + one: "%{count} week" other: "%{count} weeks" months: - one: "1 month" + one: "%{count} month" other: "%{count} months" years: - one: "1 year" + one: "%{count} year" other: "%{count} years" blocks_on: title: "Blocks on %{name}" @@ -2746,6 +2882,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}" + 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. + 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: @@ -2781,10 +2949,10 @@ en: locate: title: Show My Location metersPopup: - one: You are within one meter of this point + one: You are within %{count} meter of this point other: You are within %{count} meters of this point feetPopup: - one: You are within one foot of this point + one: You are within %{count} foot of this point other: You are within %{count} feet of this point base: standard: Standard @@ -2800,13 +2968,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 + opnvkarte_credit: "Tiles courtesy of %{memomaps_link}" + memomaps: MeMoMaps + 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 @@ -2823,18 +2997,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 edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: ascend: "Ascend" @@ -2845,9 +3007,14 @@ en: graphhopper_bicycle: "Bicycle (GraphHopper)" graphhopper_car: "Car (GraphHopper)" graphhopper_foot: "Foot (GraphHopper)" + fossgis_valhalla_bicycle: "Bicycle (Valhalla)" + fossgis_valhalla_car: "Car (Valhalla)" + fossgis_valhalla_foot: "Foot (Valhalla)" 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}'."