X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..f26ad95ade169f019d31412d02df2768a06d19f8:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 3fb161eb7..0acbd5082 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -11,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 @@ -31,21 +32,17 @@ # 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 submit: - diary_comment: - create: Save diary_entry: create: Publish update: Update @@ -126,7 +123,7 @@ en-GB: title: Subject latitude: Latitude longitude: Longitude - language: Language + language_code: Language friend: user: User friend: Friend @@ -209,9 +206,6 @@ 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}) id: @@ -252,6 +246,37 @@ 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? + 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 + go_public: + heading: Public editing + 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 @@ -270,8 +295,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 @@ -308,7 +331,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 @@ -358,24 +380,6 @@ en-GB: 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}' query: title: Query Features introduction: Click on the map to find nearby features. @@ -422,6 +426,22 @@ 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 @@ -490,7 +510,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 @@ -512,15 +531,11 @@ en-GB: search: title: latlon_html: Results from Internal - ca_postcode_html: Results from Geocoder.CA osm_nominatim_html: Results from OpenStreetMap Nominatim - geonames_html: Results from GeoNames osm_nominatim_reverse_html: Results from OpenStreetMap Nominatim - geonames_reverse_html: Results from GeoNames search_osm_nominatim: - prefix_format: '%{name}' prefix: aerialway: cable_car: Cable Car @@ -535,15 +550,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 @@ -587,7 +599,6 @@ en-GB: fire_station: Fire Station food_court: Food Court fountain: Fountain - fuel: Fuel gambling: Gambling grave_yard: Graveyard grit_bin: Grit Bin @@ -596,7 +607,6 @@ 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 @@ -689,7 +699,6 @@ en-GB: landing_site: Emergency Landing Site phone: Emergency Phone water_tank: Emergency Water Tank - "yes": Emergency highway: abandoned: Abandoned Highway bridleway: Bridleway @@ -771,9 +780,6 @@ en-GB: brownfield: Brownfield Land cemetery: Cemetery commercial: Commercial Area - conservation: Conservation - construction: Construction - farm: Farm farmland: Farmland farmyard: Farmyard forest: Forest @@ -792,7 +798,6 @@ en-GB: reservoir: Reservoir reservoir_watershed: Reservoir Watershed residential: Residential Area - retail: Retail village_green: Village Green vineyard: Vineyard "yes": Landuse @@ -1012,7 +1017,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 @@ -1029,7 +1034,6 @@ en-GB: grocery: Grocery Shop hairdresser: Hairdresser hardware: Hardware Store - hifi: Hi-Fi houseware: Houseware Shop interior_decoration: Interior Decoration jewelry: Jewellers @@ -1070,7 +1074,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 @@ -1126,9 +1129,6 @@ en-GB: index: reports: Reports layouts: - project_name: - title: OpenStreetMap - h1: OpenStreetMap logo: alt_text: OpenStreetMap logo home: Go to Home Location @@ -1196,7 +1196,6 @@ en-GB: befriend_them: You can also add them as a friend at %{befriendurl}. gpx_failure: failed_to_import: 'failed to import. Here is the error:' - import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[OpenStreetMap] GPX Import failure' gpx_success: loaded_successfully: @@ -1265,6 +1264,29 @@ 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 @@ -1336,6 +1358,39 @@ 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 @@ -1358,9 +1413,6 @@ en-GB: 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: @@ -1382,9 +1434,6 @@ en-GB: 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 @@ -1399,8 +1448,6 @@ en-GB: 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. @@ -1457,23 +1504,16 @@ 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 + 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 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: + 'OpenStreetMap' to this full address) and to opendatacommons.org. + 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 @@ -1538,11 +1578,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 @@ -1551,7 +1586,7 @@ en-GB: 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 slippery map. + js_2: OpenStreetMap uses JavaScript for its slippy map. permalink: Permalink shortlink: Shortlink createnote: Add a note @@ -1564,7 +1599,6 @@ 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. id_not_configured: iD has not been configured no_iframe_support: Your browser doesn't support HTML iframes, which are necessary @@ -1578,8 +1612,6 @@ en-GB: map_image: Map Image (shows standard layer) embeddable_html: Embeddable HTML licence: Licence - export_details_html: OpenStreetMap data is licenced under the Open - Data Commons Open Database Licence (ODbL). too_large: advice: 'If the above export fails, please consider using one of the sources listed below:' @@ -1645,11 +1677,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. @@ -1658,7 +1688,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: @@ -1669,9 +1698,10 @@ 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. + any_questions: + title: Any questions? sidebar: search_results: Search Results close: Close @@ -1757,52 +1787,22 @@ en-GB: toilets: Toilets welcome: title: Welcome! - introduction_html: 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. + 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 - 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 hypothetical features, and data from copyrighted sources. - Unless you have special permission, don't copy from online or paper maps. basic_terms: title: Basic Terms For Mapping - paragraph_1_html: 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. + paragraph_1: OpenStreetMap has some of its own lingo. Here are a few key words + that'll come in handy. rules: title: Rules! - paragraph_1_html: "OpenStreetMap has few formal rules but we expect all participants - to collaborate\nwith, and communicate with, the community. If you are considering\nany - activities other than editing by hand, please read and follow the guidelines - on \nImports - and \nAutomated - 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. start_mapping: Start Mapping add_a_note: title: No Time To Edit? Add a Note! - paragraph_1_html: 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_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. traces: visibility: private: Private (only shared as anonymous, unordered points) @@ -1812,7 +1812,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: @@ -1831,7 +1830,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: @@ -1877,11 +1875,7 @@ en-GB: public_traces_from: Public GPS traces from %{user} description: Browse recent GPS track 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 destroy: scheduled_for_deletion: Trace scheduled for deletion make_public: @@ -1903,8 +1897,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 @@ -1978,35 +1970,16 @@ en-GB: flash: Updated the client information successfully destroy: flash: Destroyed the client application registration + oauth2_applications: + new: + title: Register a new application users: - 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: |- -

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:' @@ -2018,9 +1991,6 @@ en-GB: 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 @@ -2030,7 +2000,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. @@ -2039,6 +2008,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 @@ -2055,7 +2027,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 @@ -2076,14 +2047,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 @@ -2104,95 +2067,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 - 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? - 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? - 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: @@ -2211,14 +2085,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 @@ -2322,8 +2188,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! @@ -2356,6 +2222,36 @@ en-GB: description: Description created_at: Created at last_changed: Last changed + show: + title: 'Note: %{id}' + description: Description + open_title: 'Unresolved note #%{note_name}' + closed_title: 'Resolved note #%{note_name}' + hidden_title: 'Hidden note #%{note_name}' + opened_by_html: Created by %{user} %{when} + opened_by_anonymous_html: Created by anonymous %{when} + commented_by_html: Comment from %{user} %{when} + commented_by_anonymous_html: Comment from anonymous %{when} + closed_by_html: Resolved by %{user} %{when} + closed_by_anonymous_html: Resolved by anonymous %{when} + reopened_by_html: Reactivated by %{user} %{when} + reopened_by_anonymous_html: Reactivated by anonymous %{when} + hidden_by_html: Hidden by %{user} %{when} + 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 + 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: @@ -2419,22 +2315,6 @@ en-GB: 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: