X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e78061cdba5cfb3f299f57b7643d2b396ee235b..3247ffd57ce401892a9a85674cf1d4468c8fc311:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index cfe717fe2..71ebd34cf 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,6 +21,9 @@ en: client_application: create: Register update: Update + oauth2_application: + create: Register + update: Update redaction: create: Create redaction update: Save redaction @@ -35,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" @@ -72,8 +75,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,19 +98,23 @@ en: latitude: "Latitude" longitude: "Longitude" language: "Language" + doorkeeper/application: + name: Name + redirect_uri: Redirect URIs + confidential: Confidential application? + scopes: Permissions friend: user: "User" friend: "Friend" 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 @@ -138,10 +145,13 @@ en: pass_crypt: "Password" pass_crypt_confirmation: "Confirm Password" help: + doorkeeper/application: + confidential: "Application will be used where the client secret can be kept confidential (native mobile apps and single page apps are not confidential)" + redirect_uri: "Use one line per URI" trace: tagstring: comma delimited user_block: - 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 laymans terms. + 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.' @@ -228,6 +238,59 @@ 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?" + 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://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... + 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" @@ -342,6 +405,7 @@ en: wikimedia_commons_link: "The %{page} item on Wikimedia Commons" telephone_link: "Call %{phone_number}" colour_preview: "Colour %{colour_value} preview" + email_link: "Email %{email}" note: title: "Note: %{id}" new_note: "New Note" @@ -358,7 +422,7 @@ en: 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 + report: report this note coordinates_html: "%{latitude}, %{longitude}" query: title: "Query Features" @@ -383,6 +447,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." @@ -405,6 +470,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 @@ -412,10 +497,10 @@ en: location: Location use_map_link: Use Map index: - title: "Users' diaries" - title_friends: "Friends' diaries" - title_nearby: "Nearby Users' diaries" - user_title: "%{user}'s diary" + title: "Users' Diaries" + title_friends: "Friends' Diaries" + title_nearby: "Nearby Users' Diaries" + user_title: "%{user}'s Diary" in_language_title: "Diary Entries in %{language}" new: New Diary Entry new_title: Compose a new entry in my user diary @@ -428,8 +513,8 @@ en: title: Edit Diary Entry marker_text: Diary entry location show: - title: "%{user}'s diary | %{title}" - user_title: "%{user}'s diary" + title: "%{user}'s Diary | %{title}" + user_title: "%{user}'s Diary" leave_a_comment: "Leave a comment" login_to_leave_a_comment_html: "%{login_link} to leave a comment" login: "Login" @@ -473,13 +558,20 @@ 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 comment: Comment newer_comments: "Newer Comments" older_comments: "Older Comments" + doorkeeper: + flash: + applications: + create: + notice: Application Registered. friendships: make_friend: heading: "Add %{user} as a friend?" @@ -487,6 +579,7 @@ en: success: "%{name} is now your friend!" failed: "Sorry, failed to add %{name} as a friend." already_a_friend: "You are already friends with %{name}." + limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more." remove_friend: heading: "Unfriend %{user}?" button: "Unfriend" @@ -518,17 +611,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" @@ -574,7 +667,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" @@ -583,7 +676,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" @@ -680,7 +773,7 @@ en: houseboat: "Houseboat" hut: "Hut" industrial: "Industrial Building" - kindergarten: "Kindergarden Building" + kindergarten: "Kindergarten Building" manufacture: "Manufacturing Building" office: "Office Building" public: "Public Building" @@ -702,10 +795,10 @@ en: "yes": "Building" club: scout: "Scout Group Base" - sport: "Sportsclub" + sport: "Sports Club" "yes": "Club" craft: - beekeper: "Beekeeper" + beekeeper: "Beekeeper" blacksmith: "Blacksmith" brewery: "Brewery" carpenter: "Carpenter" @@ -735,7 +828,7 @@ en: ambulance_station: "Ambulance Station" assembly_point: "Assembly Point" defibrillator: "Defibrillator" - fire_xtinguisher: "Fire Extinguisher" + fire_extinguisher: "Fire Extinguisher" fire_water_pond: "Fire Water Pond" landing_site: "Emergency Landing Site" life_ring: "Emergency Life Ring" @@ -743,7 +836,6 @@ en: siren: "Emergency Siren" suction_point: "Emergency Suction Point" water_tank: "Emergency Water Tank" - "yes": "Emergency" highway: abandoned: "Abandoned Highway" bridleway: "Bridleway" @@ -751,6 +843,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" @@ -790,6 +883,7 @@ en: trailhead: "Trailhead" trunk: "Trunk Road" trunk_link: "Trunk Road" + turning_circle: "Turning Circle" turning_loop: "Turning Loop" unclassified: "Unclassified Road" "yes" : "Road" @@ -820,6 +914,7 @@ en: railway: "Historic Railway" roman_road: "Roman Road" ruins: "Ruins" + rune_stone: "Rune Stone" stone: "Stone" tomb: "Tomb" tower: "Tower" @@ -837,9 +932,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" @@ -860,7 +954,7 @@ en: reservoir: "Reservoir" reservoir_watershed: "Reservoir Watershed" residential: "Residential Area" - retail: "Retail" + retail: "Retail Area" village_green: "Village Green" vineyard: "Vineyard" "yes": "Landuse" @@ -984,6 +1078,7 @@ en: hill: "Hill" hot_spring: "Hot Spring" island: "Island" + isthmus: "Isthmus" land: "Land" marsh: "Marsh" moor: "Moor" @@ -998,10 +1093,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" @@ -1066,6 +1164,7 @@ en: "yes": "Place" railway: abandoned: "Abandoned Railway" + buffer_stop: "Buffer Stop" construction: "Railway under Construction" disused: "Disused Railway" funicular: "Funicular Railway" @@ -1079,6 +1178,7 @@ en: platform: "Railway Platform" preserved: "Preserved Railway" proposed: "Proposed Railway" + rail: "Rail" spur: "Railway Spur" station: "Railway Station" stop: "Railway Stop" @@ -1087,6 +1187,7 @@ en: switch: "Railway Points" tram: "Tramway" tram_stop: "Tram Stop" + turntable: "Turntable" yard: "Railway Yard" shop: agrarian: "Agrarian Shop" @@ -1127,7 +1228,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" @@ -1153,7 +1254,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" @@ -1213,7 +1314,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" @@ -1289,7 +1390,6 @@ en: last_updated_time_html: "%{time}" last_updated_time_user_html: "%{time} by %{user}" link_to_reports: View Reports - reported_user: Reported User reports_count: one: "1 Report" other: "%{count} Reports" @@ -1338,6 +1438,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}" @@ -1402,8 +1503,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" @@ -1413,6 +1515,7 @@ 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" @@ -1534,7 +1637,6 @@ en: unknown token: "That confirmation code has expired or does not exist." reconfirm_html: "If you need us to resend the confirmation email, click here." confirm_resend: - success_html: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.

If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests." failure: "User %{name} not found." confirm_email: heading: Confirm a change of email address @@ -1543,6 +1645,9 @@ en: success: "Confirmed your change of email address!" failure: "An email address has already been confirmed with this token." unknown_token: "That confirmation code has expired or does not exist." + resend_success_flash: + confirmation_sent: We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping. + whitelist: If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests. messages: inbox: title: "Inbox" @@ -1625,6 +1730,43 @@ en: reset: "Reset Password" flash changed: "Your password has been changed." flash token bad: "Did not find that token, check the URL maybe?" + preferences: + show: + title: My Preferences + preferred_editor: Preferred Editor + preferred_languages: Preferred Languages + edit_preferences: Edit Preferences + edit: + title: Edit Preferences + save: Update Preferences + cancel: Cancel + update: + failure: Couldn't update preferences. + update_success_flash: + message: Preferences updated. + profiles: + edit: + title: Edit Profile + save: Update Profile + cancel: Cancel + image: Image + gravatar: + gravatar: "Use Gravatar" + link: "https://wiki.openstreetmap.org/wiki/Gravatar" + what_is_gravatar: "What is Gravatar?" + disabled: "Gravatar has been disabled." + enabled: "Display of your Gravatar has been enabled." + new image: "Add an image" + keep image: "Keep the current image" + delete image: "Remove the current image" + replace image: "Replace the current image" + image size hint: "(square images at least 100x100 work best)" + 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?" + update: + success: Profile updated. + failure: Couldn't update profile. sessions: new: title: "Login" @@ -1643,7 +1785,6 @@ en: 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 the webmaster 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: @@ -1665,9 +1806,6 @@ en: wikipedia: title: Login with Wikipedia alt: Login with a Wikipedia Account - yahoo: - title: Login with Yahoo - alt: Login with a Yahoo OpenID wordpress: title: Login with Wordpress alt: Login with a Wordpress OpenID @@ -1678,6 +1816,10 @@ 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 @@ -1700,7 +1842,7 @@ en: about: next: Next copyright_html: ©OpenStreetMap
contributors - used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices" + 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. @@ -1770,26 +1912,30 @@ en: Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0). credit_title_html: How to credit OpenStreetMap credit_1_html: | - We require that you use the credit “© OpenStreetMap - contributors”. + Where you use OpenStreetMap data, you are required to do the following two things: 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 + + credit_3_1_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. + credit_4_html: | + To make clear that the data is available under the Open + Database License, you may link to this copyright page. 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. attribution_example: alt: Example of how to attribute OpenStreetMap on a webpage title: Attribution example @@ -1815,10 +1961,10 @@ en: Land Vorarlberg and Land Tirol (under CC BY AT with amendments). contributors_au_html: | - Australia: Contains data sourced from - PSMA Australia Limited + Australia: Incorporates or developed using Administrative Boundaries © + Geoscape Australia licensed by the Commonwealth of Australia under - CC BY 4.0. + Creative Commons Attribution 4.0 International licence (CC BY 4.0). contributors_ca_html: | Canada: Contains data from GeoBase®, GeoGratis (© Department of Natural @@ -1876,7 +2022,7 @@ en: infringement_2_html: | If you believe that copyrighted material has been inappropriately added to the OpenStreetMap database or this site, please refer - to our takedown + to our takedown procedure or file directly at our on-line filing page. trademarks_title_html: Trademarks @@ -1929,7 +2075,7 @@ en: 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" @@ -1985,8 +2131,12 @@ en: 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 + title: Forums (Legacy) 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 @@ -2006,7 +2156,7 @@ en: 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. + 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. sidebar: search_results: Search Results close: Close @@ -2059,6 +2209,7 @@ en: common: - Common - meadow + - garden retail: "Retail area" industrial: "Industrial area" commercial: "Commercial area" @@ -2143,6 +2294,30 @@ en: 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. + 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 + about_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 page. traces: visibility: private: "Private (only shared as anonymous, unordered points)" @@ -2164,8 +2339,8 @@ en: other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users." edit: cancel: Cancel - title: "Editing trace %{name}" - heading: "Editing trace %{name}" + title: "Editing Trace %{name}" + heading: "Editing Trace %{name}" visibility_help: "what does this mean?" visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" update: @@ -2173,8 +2348,8 @@ en: trace_optionals: tags: "Tags" show: - title: "Viewing trace %{name}" - heading: "Viewing trace %{name}" + title: "Viewing Trace %{name}" + heading: "Viewing Trace %{name}" pending: "PENDING" filename: "Filename:" download: "download" @@ -2213,15 +2388,17 @@ en: by: "by" in: "in" index: - public_traces: "Public GPS traces" - my_traces: "My GPS traces" - public_traces_from: "Public GPS traces from %{user}" + public_traces: "Public 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." upload_trace: "Upload a trace" - see_all_traces: "See all traces" - see_my_traces: "See my traces" + all_traces: "All Traces" + my_traces: "My Traces" + traces_from: "Public Traces from %{user}" + remove_tag_filter: "Remove Tag Filter" destroy: scheduled_for_deletion: "Trace scheduled for deletion" make_public: @@ -2245,9 +2422,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" @@ -2273,6 +2455,16 @@ en: flash: "You've revoked the token for %{application}" permissions: missing: "You have not permitted the application access to this facility" + scopes: + read_prefs: Read user preferences + write_prefs: Modify user preferences + write_diary: Create diary entries, comments and make friends + write_api: Modify the map + 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" @@ -2312,11 +2504,58 @@ en: flash: "Updated the client information successfully" destroy: flash: "Destroyed the client application registration" + oauth2_applications: + index: + title: "My Client Applications" + no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service." + oauth_2: "OAuth 2" + new: "Register new application" + name: "Name" + permissions: "Permissions" + application: + edit: "Edit" + delete: "Delete" + confirm_delete: "Delete this application?" + new: + title: "Register a new application" + edit: + title: "Edit your application" + show: + edit: "Edit" + delete: "Delete" + confirm_delete: "Delete this application?" + client_id: "Client ID" + client_secret: "Client Secret" + client_secret_warning: "Make sure to save this secret - it will not be accessible again" + permissions: "Permissions" + redirect_uris: "Redirect URIs" + not_found: + sorry: "Sorry, that application could not be found." + oauth2_authorizations: + new: + title: "Authorization Required" + introduction: "Authorize %{application} to access your account with the following permissions?" + authorize: "Authorize" + deny: "Deny" + error: + title: "An error has occurred" + show: + title: "Authorization code" + oauth2_authorized_applications: + index: + title: "My Authorized Applications" + application: "Application" + permissions: "Permissions" + no_applications_html: "You have not yet authorized any %{oauth2} applications." + application: + revoke: "Revoke Access" + confirm_revoke: "Revoke access for this application?" users: new: title: "Sign Up" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." - contact_webmaster_html: 'Please contact the webmaster 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: | @@ -2332,8 +2571,6 @@ en: 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!" - terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see this wiki page." - terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: "Terms" heading: "Terms" @@ -2345,7 +2582,7 @@ 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 + consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/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' continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" @@ -2356,6 +2593,10 @@ en: france: "France" italy: "Italy" rest_of_world: "Rest of the world" + terms_declined_flash: + terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}. + terms_declined_link: this wiki page + terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined no_such_user: title: "No such user" heading: "The user %{user} does not exist" @@ -2371,9 +2612,11 @@ en: my profile: My Profile my settings: My Settings my comments: My Comments - oauth settings: oauth settings + my_preferences: My Preferences + my_dashboard: My Dashboard blocks on me: Blocks on Me blocks by me: Blocks by Me + edit_profile: Edit Profile send message: Send Message diary: Diary edits: Edits @@ -2392,14 +2635,6 @@ en: spam score: "Spam Score:" description: Description user location: User location - if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users." - settings_link_text: settings - 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" @@ -2416,65 +2651,13 @@ en: 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?" - image: Image - gravatar: - gravatar: "Use Gravatar" - link: "https://wiki.openstreetmap.org/wiki/Gravatar" - what_is_gravatar: "What is Gravatar?" - disabled: "Gravatar has been disabled." - enabled: "Display of your Gravatar has been enabled." - new image: "Add an image" - keep image: "Keep the current image" - delete image: "Remove the current image" - replace image: "Replace the current image" - image size hint: "(square images at least 100x100 work best)" - 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?" - save changes button: Save Changes - make edits public button: Make all my edits public - return to profile: Return to profile - 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: @@ -2493,22 +2676,17 @@ en: suspended: title: Account Suspended heading: Account Suspended - webmaster: webmaster - 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 the %{webmaster} if you wish to discuss this. -

+ 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 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: | @@ -2601,11 +2779,11 @@ en: other: "%{count} years" blocks_on: title: "Blocks on %{name}" - heading_html: "List of blocks on %{name}" + heading_html: "List of Blocks on %{name}" empty: "%{name} has not been blocked yet." blocks_by: title: "Blocks by %{name}" - heading_html: "List of blocks by %{name}" + heading_html: "List of Blocks by %{name}" empty: "%{name} has not made any blocks yet." show: title: "%{block_on} blocked by %{block_by}" @@ -2638,7 +2816,7 @@ en: notes: index: title: "Notes submitted or commented on by %{user}" - heading: "%{user}'s notes" + heading: "%{user}'s Notes" subheading_html: "Notes submitted or commented on by %{user}" no_notes: No notes id: "Id" @@ -2735,6 +2913,10 @@ en: 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" @@ -2745,6 +2927,9 @@ 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" @@ -2834,19 +3019,19 @@ en: centre_map: Centre map here redactions: edit: - heading: "Edit redaction" - title: "Edit redaction" + heading: "Edit Redaction" + title: "Edit Redaction" index: empty: "No redactions to show." - heading: "List of redactions" - title: "List of redactions" + heading: "List of Redactions" + title: "List of Redactions" new: - heading: "Enter information for new redaction" - title: "Creating new redaction" + heading: "Enter Information for New Redaction" + title: "Creating New Redaction" show: description: "Description:" - heading: "Showing redaction \"%{title}\"" - title: "Showing redaction" + heading: "Showing Redaction \"%{title}\"" + title: "Showing Redaction" user: "Creator:" edit: "Edit this redaction" destroy: "Remove this redaction"