X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4347d9d3b00a8fffe78daa93eac5b490905f9ac8..18b642bfa9d2afdc3da747be25cf6a8ba91ab6b4:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 8016960c4..2751c6e66 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Abijeet Patro +# Author: Alefar # Author: Andibing # Author: BEANS # Author: Bjh21 @@ -10,6 +11,7 @@ # Author: Caliburn # Author: Captaindogfish # Author: Chase me ladies, I'm the Cavalry +# Author: Danieldegroot2 # Author: E THP # Author: EdLoach # Author: Eduard Popov @@ -20,6 +22,7 @@ # Author: Jlrb+ # Author: Kosovastar # Author: Macofe +# Author: Maro21 # Author: Meno25 # Author: Michel Bakni # Author: Mvolz @@ -29,15 +32,13 @@ # Author: Smsm1 # Author: Tlubenov # Author: TomH +# Author: Wehwei # Author: ديفيد --- en-GB: - html: - dir: ltr time: formats: friendly: '%e %B %Y at %H:%M' - blog: '%e %B %Y' helpers: file: prompt: Choose file @@ -106,11 +107,17 @@ en-GB: way_tag: Way Tag attributes: client_application: - callback_url: Callback URL + name: Name (Required) + url: Main Application URL (Required) + callback_url: 'Callback URL:' support_url: Support URL + allow_read_prefs: read their user preferences + allow_write_prefs: modify their user preferences + allow_write_diary: create diary entries, comments and make friends allow_write_api: modify the map allow_read_gpx: read their private GPS traces allow_write_gpx: upload GPS traces + allow_write_notes: modify notes diary_comment: body: Body diary_entry: @@ -139,16 +146,29 @@ en-GB: title: Subject body: Body recipient: Recipient + redaction: + description: Description + report: + category: 'Select a reason for your report:' + details: Please provide some more details about the problem (required). user: email: E-mail + new_email: New Email Address active: Active display_name: Display Name - description: Description - languages: Languages + description: Profile Description + home_lat: Latitude + home_lon: Longitude + languages: Preferred Languages pass_crypt: Password + pass_crypt_confirmation: Confirm Password help: trace: tagstring: comma delimited + user_block: + needs_view: Does the user need to log in before this block will be cleared? + user: + new_email: (never displayed publicly) datetime: distance_in_words_ago: about_x_hours: @@ -188,25 +208,17 @@ en-GB: x_years: one: 1 year ago other: '%{count} years ago' - printable_name: - with_version: '%{id}, v%{version}' - with_name_html: '%{name} (%{id})' editor: default: Default (currently %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (in-browser editor) id: name: iD description: iD (in-browser editor) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (in-browser editor) remote: name: Remote Control - description: Remote Control (JOSM or Merkaartor) + description: Remote Control (JOSM, Potlatch, Merkaartor) auth: providers: + none: None openid: OpenID google: Google facebook: Facebook @@ -236,6 +248,44 @@ en-GB: entry: comment: Comment full: Full note + accounts: + edit: + title: Edit account + my settings: My settings + current email address: Current Email Address + external auth: External Authentication + openid: + link text: what is this? + public editing: + heading: Public editing + enabled: Enabled. Not anonymous and can edit data. + 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 text: what is this? + save changes button: Save Changes + 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. browse: created: Created closed: Closed @@ -254,8 +304,6 @@ en-GB: view_history: View History view_details: View Details location: 'Location:' - common_details: - coordinates_html: '%{latitude}, %{longitude}' changeset: title: 'Changeset: %{id}' belongs_to: Author @@ -292,7 +340,6 @@ en-GB: history_title_html: 'Relation History: %{name}' members: Members relation_member: - entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} as %{role}' type: node: Node @@ -302,6 +349,7 @@ en-GB: entry_html: Relation %{relation_name} entry_role_html: Relation %{relation_name} (as %{relation_role}) not_found: + title: Not Found sorry: 'Sorry, %{type} #%{id} could not be found.' type: node: node @@ -310,6 +358,7 @@ en-GB: changeset: changeset note: note timeout: + title: Timeout Error sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve. type: node: node @@ -356,8 +405,6 @@ en-GB: reopened_by_html: Reactivated by %{user} %{when} reopened_by_anonymous_html: Reactivated by anonymous %{when} hidden_by_html: Hidden by %{user} %{when} - report: Report this note - coordinates_html: '%{latitude}, %{longitude}' query: title: Query Features introduction: Click on the map to find nearby features. @@ -404,17 +451,28 @@ en-GB: 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: + 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 form: - subject: 'Subject:' - body: 'Body:' - language: 'Language:' - location: 'Location:' - latitude: 'Latitude:' - longitude: 'Longitude:' - use_map_link: use map + location: Location + use_map_link: Use map index: title: Users' diaries title_friends: Friends' diaries @@ -423,6 +481,7 @@ en-GB: in_language_title: Diary Entries in %{language} new: New Diary Entry new_title: Compose a new entry in my user diary + my_diary: My Diary no_entries: No diary entries recent_entries: Recent diary entries older_entries: Older Entries @@ -442,7 +501,8 @@ en-GB: body: Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong. diary_entry: - posted_by_html: Posted by %{link_user} on %{created} in %{language_link} + posted_by_html: Posted by %{link_user} on %{created} in %{language_link}. + updated_at_html: Last updated on %{updated}. comment_link: Comment on this entry reply_link: Send a message to the author comment_count: @@ -475,7 +535,6 @@ en-GB: 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' post: Post when: When comment: Comment @@ -505,13 +564,13 @@ en-GB: Nominatim geonames_reverse_html: Results from GeoNames search_osm_nominatim: - prefix_format: '%{name}' prefix: aerialway: cable_car: Cable Car chair_lift: Chairlift drag_lift: Drag Lift gondola: Gondola Lift + magic_carpet: Magic Carpet Lift platter: Platter Lift pylon: Pylon station: Aerialway Station @@ -519,15 +578,12 @@ en-GB: aeroway: aerodrome: Aerodrome airstrip: Airstrip - apron: Apron - gate: Gate hangar: Hangar helipad: Helipad holding_position: Holding Position parking_position: Parking Position runway: Runway taxiway: Taxiway - terminal: Terminal amenity: animal_shelter: Animal Shelter arts_centre: Arts Centre @@ -538,7 +594,9 @@ en-GB: bench: Bench bicycle_parking: Cycle Parking bicycle_rental: Cycle Rental + bicycle_repair_station: Bicycle Repair Station biergarten: Beer Garden + blood_bank: Blood Bank boat_rental: Boat Rental brothel: Brothel bureau_de_change: Bureau de Change @@ -555,6 +613,7 @@ en-GB: clock: Clock college: College community_centre: Community Centre + conference_centre: Conference Centre courthouse: Court crematorium: Crematorium dentist: Dentist @@ -562,12 +621,12 @@ en-GB: drinking_water: Drinking Water driving_school: Driving School embassy: Embassy + events_venue: Events Venue fast_food: Fast Food ferry_terminal: Ferry Terminal fire_station: Fire Station food_court: Food Court fountain: Fountain - fuel: Fuel gambling: Gambling grave_yard: Graveyard grit_bin: Grit Bin @@ -576,10 +635,12 @@ en-GB: ice_cream: Ice Cream internet_cafe: Internet Cafe kindergarten: Nursery School - language_school: Language school library: Library + loading_dock: Loading Dock + love_hotel: Love Hotel marketplace: Marketplace monastery: Monastery + money_transfer: Money Transfer motorcycle_parking: Motorcycle Parking music_school: Music School nightclub: Night Club @@ -594,6 +655,7 @@ en-GB: post_office: Post Office prison: Prison pub: Pub + public_bath: Public Bath public_building: Public Building recycling: Recycling Point restaurant: Restaurant @@ -632,12 +694,17 @@ en-GB: building: apartment: Apartment apartments: Apartments + bungalow: Bungalow cabin: Cabin + chapel: Chapel + church: Church college: College Building commercial: Commercial Building construction: Building under Construction garage: Garage garages: Garages + hospital: Hospital + hotel: Hotel house: House industrial: Industrial Building roof: Roof @@ -660,7 +727,6 @@ en-GB: landing_site: Emergency Landing Site phone: Emergency Phone water_tank: Emergency Water Tank - "yes": Emergency highway: abandoned: Abandoned Highway bridleway: Bridleway @@ -742,9 +808,6 @@ en-GB: brownfield: Brownfield Land cemetery: Cemetery commercial: Commercial Area - conservation: Conservation - construction: Construction - farm: Farm farmland: Farmland farmyard: Farmyard forest: Forest @@ -763,7 +826,6 @@ en-GB: reservoir: Reservoir reservoir_watershed: Reservoir Watershed residential: Residential Area - retail: Retail village_green: Village Green vineyard: Vineyard "yes": Landuse @@ -784,6 +846,7 @@ en-GB: miniature_golf: Miniature Golf nature_reserve: Nature Reserve park: Park + picnic_table: Picnic Table pitch: Sports Pitch playground: Playground recreation_ground: Recreation Ground @@ -798,13 +861,21 @@ en-GB: "yes": Leisure man_made: adit: Adit + advertising: Advertising + antenna: Antenna/Antennae + avalanche_protection: Avalanche Protection beacon: Beacon + beam: Beam beehive: Bee Hive breakwater: Breakwater bridge: Bridge bunker_silo: Bunker + cairn: Cairn chimney: Chimney + clearcut: Clearcut + communications_tower: Communications Tower crane: Crane + cross: Cross dolphin: Mooring Post dyke: Dyke embankment: Embankment @@ -813,6 +884,7 @@ en-GB: groyne: Groyne kiln: Kiln lighthouse: Lighthouse + manhole: Manhole mast: Mast mine: Mine mineshaft: Mine Shaft @@ -973,7 +1045,7 @@ en-GB: deli: Delicatessen department_store: Department Store discount: Discount Items Shop - doityourself: DIY store + doityourself: DIY Shop dry_cleaning: Dry Cleaning electronics: Electronics Shop estate_agent: Estate Agent @@ -990,7 +1062,6 @@ en-GB: grocery: Grocery Shop hairdresser: Hairdresser hardware: Hardware Store - hifi: Hi-Fi houseware: Houseware Shop interior_decoration: Interior Decoration jewelry: Jewellers @@ -1031,7 +1102,6 @@ en-GB: artwork: Artwork attraction: Attraction bed_and_breakfast: Bed and Breakfast - cabin: Cabin camp_site: Camp Site caravan_site: Caravan Site chalet: Chalet @@ -1087,9 +1157,6 @@ en-GB: index: reports: Reports layouts: - project_name: - title: OpenStreetMap - h1: OpenStreetMap logo: alt_text: OpenStreetMap logo home: Go to Home Location @@ -1144,7 +1211,6 @@ en-GB: footer: You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: Hi %{to_user}, header: '%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:' @@ -1156,24 +1222,15 @@ en-GB: had_added_you: '%{user} has added you as a friend on OpenStreetMap.' see_their_profile: You can see their profile at %{userurl}. befriend_them: You can also add them as a friend at %{befriendurl}. - gpx_notification: - greeting: Hi, - your_gpx_file: It looks like your GPX file - with_description: with the description - and_the_tags: 'and the following tags:' - and_no_tags: and no tags. - failure: - subject: '[OpenStreetMap] GPX Import failure' - failed_to_import: 'failed to import. Here is the error:' - more_info_1: More information about GPX import failures and how to avoid - more_info_2: 'them can be found at:' - import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures - success: - subject: '[OpenStreetMap] GPX Import success' - 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. + gpx_failure: + failed_to_import: 'failed to import. Here is the error:' + subject: '[OpenStreetMap] GPX Import failure' + gpx_success: + 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. + subject: '[OpenStreetMap] GPX Import success' signup_confirm: subject: '[OpenStreetMap] Welcome to OpenStreetMap' greeting: Hi there! @@ -1184,28 +1241,16 @@ en-GB: information to get you started. email_confirm: subject: '[OpenStreetMap] Confirm your e-mail address' - email_confirm_plain: - greeting: Hi, - hopefully_you: Someone (hopefully you) would like to change their email address - over at %{server_url} to %{new_address}. - click_the_link: If this is you, please click the link below to confirm the change. - email_confirm_html: greeting: Hi, hopefully_you: Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}. click_the_link: If this is you, please click the link below to confirm the change. lost_password: subject: '[OpenStreetMap] Password reset request' - lost_password_plain: greeting: Hi, hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account. click_the_link: If this is you, please click the link below to reset your password. - lost_password_html: - greeting: Hi, - hopefully_you: Someone (possibly you) has asked for the password to be reset - on this e-mail address's openstreetmap.org account. - click_the_link: If this is you, please click the link below to reset your password. note_comment_notification: anonymous: An anonymous user greeting: Hi, @@ -1247,11 +1292,33 @@ en-GB: details: More details about the changeset can be found at %{url}. unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe". + confirmations: + confirm: + heading: Check your email! + introduction_1: We sent you a confirmation email. + introduction_2: Confirm your account by clicking on the link in the email and + you'll be able to start mapping. + press confirm button: Press the confirm button below to activate your account. + button: Confirm + 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. + confirm_resend: + failure: User %{name} not found. + confirm_email: + heading: Confirm a change of e-mail address + press confirm button: Press the confirm button below to confirm your new e-mail + address. + button: Confirm + success: Confirmed your change of email address! + failure: An e-mail address has already been confirmed with this token. + unknown_token: That confirmation code has expired or does not exist. messages: inbox: title: Inbox my_inbox: My Inbox - outbox: outbox messages: You have %{new_messages} and %{old_messages} new_messages: one: '%{count} new message' @@ -1286,9 +1353,6 @@ en-GB: body: Sorry, there is no message with that id. outbox: title: Outbox - my_inbox_html: My %{inbox_link} - inbox: inbox - outbox: outbox messages: one: You have %{count} sent message other: You have %{count} sent messages @@ -1322,12 +1386,96 @@ en-GB: as_unread: Message marked as unread destroy: destroyed: Message deleted + passwords: + lost_password: + title: Lost password + heading: Forgotten Password? + email address: E-mail address + new password button: Reset password + help_text: Enter the e-mail address you used to sign up, we will send a link + to it that you can use to reset your password. + notice email on way: Sorry you lost it :-( but an email is on its way so you + can reset it soon. + notice email cannot find: Could not find that email address, sorry. + reset_password: + title: Reset password + heading: Reset Password for %{user} + reset: Reset Password + flash changed: Your password has been changed. + flash token bad: Did not find that token, check the URL maybe? + profiles: + edit: + image: Image + gravatar: + gravatar: Use Gravatar + link: https://wiki.openstreetmap.org/wiki/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? + sessions: + new: + title: Login + heading: Login + email or username: 'E-mail Address or Username:' + password: 'Password:' + openid_html: '%{logo} OpenID:' + remember: Remember me + lost password link: Lost your password? + login_button: Login + register now: Register now + with username: 'Already have an OpenStreetMap account? Please login with your + username and password:' + with external: 'Alternatively, use a third party to login:' + new to osm: New to OpenStreetMap? + to make changes: To make changes to the OpenStreetMap data, you must have an + account. + create account minute: Create an account. It only takes a minute. + no account: Don't have an account? + account not active: Sorry, your account is not active yet.
Please use the + link in the account confirmation email to activate your account, or request + a new confirmation email. + auth failure: Sorry, could not log in with those details. + openid_logo_alt: Log in with an OpenID + auth_providers: + openid: + title: Login with OpenID + alt: Login with an OpenID URL + google: + title: Login with Google + alt: Login with a Google OpenID + facebook: + title: Login with Facebook + alt: Login with a Facebook Account + windowslive: + title: Login with Windows Live + alt: Login with a Windows Live Account + github: + title: Login with GitHub + alt: Login with a GitHub Account + wikipedia: + title: Login with Wikipedia + alt: Login with a Wikipedia Account + wordpress: + title: Login with Wordpress + alt: Login with a Wordpress OpenID + aol: + title: Login with AOL + alt: Login with an AOL OpenID + destroy: + title: Logout + heading: Logout of OpenStreetMap + logout_button: Logout 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' 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. @@ -1384,20 +1532,6 @@ en-GB: intro_3_1_html: "Our documentation is licensed under the \nCreative\nCommons Attribution-ShareAlike 2.0 licence (CC 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 Licence, and if using our map tiles, that the cartography is - licensed as CC BY-SA. You may do this by linking 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 licence(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), to opendatacommons.org, and - if relevant, to creativecommons.org. credit_4_html: |- For a browsable electronic map, the credit should appear in the corner of the map. For example: @@ -1465,11 +1599,6 @@ en-GB: infringement_1_html: 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: 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 @@ -1491,19 +1620,7 @@ en-GB: not_public_description_html: You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}. user_page_link: user page - anon_edits_html: (%{link}) anon_edits_link_text: Find out why this is the case. - flash_player_required_html: You need a Flash player to use Potlatch, the OpenStreetMap - Flash editor. You can download - Flash Player from Adobe.com. Several - other options are also available for editing OpenStreetMap. - potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you - should deselect the current way or point, if editing in live mode, or click - save if you have a save button.) - potlatch2_not_configured: Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - for more information - potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2, - you should click save.) id_not_configured: iD has not been configured no_iframe_support: Your browser doesn't support HTML iframes, which are necessary for this feature. @@ -1583,11 +1700,9 @@ en-GB: title: Welcome to OpenStreetMap description: Start with this quick guide covering the OpenStreetMap basics. beginners_guide: - url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide title: Beginners' Guide description: Community maintained guide for beginners. help: - url: https://help.openstreetmap.org/ title: Help Forum description: Ask a question or look up answers on OpenStreetMap's question-and-answer site. @@ -1596,7 +1711,6 @@ en-GB: description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. forums: - title: Forums description: Questions and discussions for those that prefer a bulletin board style interface. irc: @@ -1607,7 +1721,6 @@ en-GB: description: Help for companies and organisations switching to OpenStreetMap based maps and other services. wiki: - url: https://wiki.openstreetmap.org/ title: OpenStreetMap Wiki description: Browse the wiki for in-depth OpenStreetMap documentation. sidebar: @@ -1693,23 +1806,6 @@ en-GB: bicycle_shop: Bicycle shop bicycle_parking: Bicycle parking toilets: Toilets - richtext_area: - edit: Edit - preview: Preview - markdown_help: - title_html: Parsed with kramdown - headings: Headings - heading: Heading - subheading: Subheading - unordered: Unordered list - ordered: Ordered list - first: First item - second: Second item - link: Link - text: Text - image: Image - alt: Alt text - url: URL welcome: title: Welcome! introduction_html: Welcome to OpenStreetMap, the free and editable map of the @@ -1767,7 +1863,6 @@ en-GB: points with timestamps) new: visibility_help: what does this mean? - visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces help: Help help_url: https://wiki.openstreetmap.org/wiki/Upload create: @@ -1786,7 +1881,6 @@ en-GB: title: Editing trace %{name} heading: Editing trace %{name} visibility_help: what does this mean? - visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces trace_optionals: tags: Tags show: @@ -1820,7 +1914,6 @@ en-GB: more: more trace_details: View Trace Details view_map: View Map - edit: edit edit_map: Edit Map public: PUBLIC identifiable: IDENTIFIABLE @@ -1828,7 +1921,6 @@ en-GB: trackable: TRACKABLE by: by in: in - map: map index: public_traces: Public GPS traces public_traces_from: Public GPS traces from %{user} @@ -1838,7 +1930,6 @@ en-GB: or learn more about GPS tracing on the wiki page. upload_trace: Upload a trace - see_all_traces: See all traces destroy: scheduled_for_deletion: Trace scheduled for deletion make_public: @@ -1860,8 +1951,6 @@ en-GB: cookies_needed: You appear to have cookies disabled - please enable cookies in your browser before continuing. 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: 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 @@ -1935,88 +2024,14 @@ en-GB: flash: Updated the client information successfully destroy: flash: Destroyed the client application registration + oauth2_applications: + new: + title: Register a new application users: - login: - title: Login - heading: Login - email or username: 'E-mail Address or Username:' - password: 'Password:' - openid_html: '%{logo} OpenID:' - remember: Remember me - 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 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: - openid: - title: Login with OpenID - alt: Login with an OpenID URL - google: - title: Login with Google - alt: Login with a Google OpenID - facebook: - title: Login with Facebook - alt: Login with a Facebook Account - windowslive: - title: Login with Windows Live - alt: Login with a Windows Live Account - github: - title: Login with GitHub - alt: Login with a GitHub Account - 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 - aol: - title: Login with AOL - alt: Login with an AOL OpenID - logout: - title: Logout - heading: Logout of OpenStreetMap - logout_button: Logout - lost_password: - title: Lost password - heading: Forgotten Password? - email address: E-mail address - new password button: Reset password - help_text: Enter the e-mail address you used to sign up, we will send a link - to it that you can use to reset your password. - notice email on way: Sorry you lost it :-( but an email is on its way so you - can reset it soon. - notice email cannot find: Could not find that email address, sorry. - reset_password: - title: Reset password - heading: Reset Password for %{user} - reset: Reset Password - flash changed: Your password has been changed. - flash token bad: Did not find that token, check the URL maybe? 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. about: header: Free and editable html: |- @@ -2024,23 +2039,15 @@ en-GB:

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:' - not_displayed_publicly_html: Your address is not displayed publicly, see our - privacy policy for more information display name: 'Display Name:' display name description: Your publicly displayed username. You can change this later in the preferences. external auth: 'Third Party Authentication:' - password: 'Password:' - confirm password: 'Confirm Password:' 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! - 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 @@ -2050,7 +2057,6 @@ en-GB: consider_pd_why_url: http://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' - declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined decline: Decline you need to accept or decline: Please read and then either accept or decline the new Contributor Terms to continue. @@ -2059,6 +2065,9 @@ en-GB: 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}. no_such_user: title: No such user heading: The user %{user} does not exist @@ -2075,7 +2084,6 @@ en-GB: my profile: My Profile my settings: My Settings my comments: My Comments - oauth settings: oauth settings blocks on me: Blocks on Me blocks by me: Blocks by Me send message: Send Message @@ -2096,14 +2104,6 @@ en-GB: 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 - 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 @@ -2124,103 +2124,6 @@ en-GB: 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 - 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:' - new email address: 'New Email Address:' - email never displayed publicly: (never displayed publicly) - 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: http://www.osmfoundation.org/wiki/License/Contributor_Terms - link text: what is this? - profile description: 'Profile Description:' - preferred languages: 'Preferred Languages:' - preferred editor: 'Preferred Editor:' - image: 'Image:' - gravatar: - gravatar: Use Gravatar - link: https://wiki.openstreetmap.org/wiki/Gravatar - link text: what is this? - 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. - latitude: 'Latitude:' - longitude: 'Longitude:' - 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. - confirm: - heading: Check your email! - introduction_1: We sent you a confirmation email. - introduction_2: Confirm your account by clicking on the link in the email and - you'll be able to start mapping. - press confirm button: Press the confirm button below to activate your account. - button: Confirm - 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. - 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 e-mail address - press confirm button: Press the confirm button below to confirm your new e-mail - address. - button: Confirm - success: Confirmed your change of email address! - failure: An e-mail address has already been confirmed with this token. - unknown_token: That confirmation code has expired or does not exist. set_home: flash success: Home location saved successfully go_public: @@ -2239,14 +2142,6 @@ en-GB: 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. -

auth_failure: connection_failed: Connection to authentication provider failed invalid_credentials: Invalid authentication credentials @@ -2293,27 +2188,17 @@ en-GB: new: title: Creating block on %{name} heading_html: Creating block on %{name} - reason: The reason why %{name} 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. 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. - needs_view: User needs to log in before this block will be cleared back: View all blocks edit: title: Editing block on %{name} heading_html: Editing block on %{name} - reason: The reason why %{name} is being blocked. Please be as calm and as reasonable - as possible, giving as much detail as you can about the situation. Bear in - mind that not all users understand the community jargon, so please try to - use laymans terms. period: How long, starting now, the user will be blocked from the API for. show: View this block back: View all blocks - needs_view: Does the user need to log in before this block will be cleared? filter: 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 @@ -2360,8 +2245,8 @@ en-GB: show: title: '%{block_on} blocked by %{block_by}' heading_html: '%{block_on} blocked by %{block_by}' - created: Created - status: Status + created: 'Created:' + status: 'Status:' show: Show edit: Edit revoke: Revoke! @@ -2408,7 +2293,6 @@ en-GB: custom_dimensions: Set custom dimensions format: 'Format:' scale: 'Scale:' - image_size: Image will show standard layer at download: Download short_url: Short URL include_marker: Include marker @@ -2564,7 +2448,6 @@ en-GB: centre_map: Centre map here redactions: edit: - description: Description heading: Edit redaction title: Edit redaction index: @@ -2572,7 +2455,6 @@ en-GB: heading: List of redactions title: List of redactions new: - description: Description heading: Enter information for new redaction title: Creating new redaction show: