X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8e443649f374f14e522749949d6012eca1c6a973..f816482778fad28424a4b2a151e0ba8ede2dcd97:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index df4ba9d42..6d3be7da8 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -5,6 +5,7 @@ # Author: Alefar # Author: Andibing # Author: BEANS +# Author: Back ache # Author: Bjh21 # Author: Bpfhjquevaps # Author: Bruce89 @@ -16,6 +17,7 @@ # Author: EdLoach # Author: Eduard Popov # Author: Gravitystorm +# Author: Hufkratzer # Author: IknowJoseph # Author: Jagwar # Author: Jguthrie100 @@ -80,7 +82,6 @@ en-GB: message: Message node: Node node_tag: Node Tag - notifier: Notifier old_node: Old Node old_node_tag: Old Node Tag old_relation: Old Relation @@ -170,41 +171,41 @@ en-GB: datetime: distance_in_words_ago: about_x_hours: - one: about 1 hour ago + one: about %{count} hour ago other: about %{count} hours ago about_x_months: - one: about 1 month ago + one: about %{count} month ago other: about %{count} months ago about_x_years: - one: about 1 year ago + one: about %{count} year ago other: about %{count} years ago almost_x_years: - one: almost 1 year ago + one: almost %{count} year ago other: almost %{count} years ago half_a_minute: half a minute ago less_than_x_seconds: - one: less than 1 second ago + one: less than %{count} second ago other: less than %{count} seconds ago less_than_x_minutes: - one: less than a minute ago + one: less than %{count} minute ago other: less than %{count} minutes ago over_x_years: - one: over 1 year ago + one: over %{count} year ago other: over %{count} years ago x_seconds: - one: 1 second ago + one: '%{count} second ago' other: '%{count} seconds ago' x_minutes: - one: 1 minute ago + one: '%{count} minute ago' other: '%{count} minutes ago' x_days: - one: 1 day ago + one: '%{count} day ago' other: '%{count} days ago' x_months: - one: 1 month ago + one: '%{count} month ago' other: '%{count} months ago' x_years: - one: 1 year ago + one: '%{count} year ago' other: '%{count} years ago' editor: default: Default (currently %{name}) @@ -217,10 +218,8 @@ en-GB: auth: providers: none: None - openid: OpenID google: Google facebook: Facebook - windowslive: Windows Live github: GitHub wikipedia: Wikipedia api: @@ -260,15 +259,6 @@ en-GB: 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. @@ -279,7 +269,9 @@ en-GB: in the Public Domain. link text: what is this? save changes button: Save Changes - make edits public button: Make all my edits public + 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. @@ -287,12 +279,6 @@ en-GB: browse: created: Created closed: Closed - created_html: Created %{time} - closed_html: Closed %{time} - created_by_html: Created %{time} by %{user} - deleted_by_html: Deleted %{time} by %{user} - edited_by_html: Edited %{time} by %{user} - closed_by_html: Closed %{time} by %{user} version: Version in_changeset: Changeset anonymous: anonymous @@ -311,14 +297,8 @@ en-GB: way_paginated: Ways (%{x}-%{y} of %{count}) relation: Relations (%{count}) relation_paginated: Relations (%{x}-%{y} of %{count}) - comment: Comments (%{count}) - hidden_commented_by_html: Hidden comment from %{user} %{when} - commented_by_html: Comment from %{user} %{when} changesetxml: Changeset XML osmchangexml: osmChange XML - feed: - title: Changeset %{id} - title_comment: Changeset %{id} - %{comment} join_discussion: Log in to join the discussion discussion: Discussion still_open: Changeset still open - discussion will open once the changeset is @@ -419,6 +399,9 @@ en-GB: no_more_area: No more changesets in this area. no_more_user: No more changesets by this user. load_more: Load more + feed: + title: Changeset %{id} + title_comment: Changeset %{id} - %{comment} timeout: sorry: Sorry, the list of changesets you requested took too long to retrieve. changeset_comments: @@ -437,6 +420,7 @@ en-GB: contact: km away: '%{count}km away' m away: '%{count}m away' + latest_edit_html: 'Latest edit (%{ago}):' popup: your location: Your location nearby mapper: Nearby mapper @@ -488,7 +472,6 @@ en-GB: comment_link: Comment on this entry reply_link: Send a message to the author comment_count: - zero: No comments one: '%{count} comment' other: '%{count} comments' edit_link: Edit this entry @@ -522,6 +505,14 @@ en-GB: comment: Comment newer_comments: Newer Comments older_comments: Older Comments + doorkeeper: + errors: + messages: + account_selection_required: The authorisation server requires end-user account + selection + consent_required: The authorisation server requires end-user consent + interaction_required: The authorisation server requires end-user interaction + login_required: The authorisation server requires end-user authentication friendships: make_friend: heading: Add %{user} as a friend? @@ -535,13 +526,6 @@ en-GB: success: '%{name} was removed from your friends.' not_a_friend: '%{name} is not one of your friends.' geocoder: - search: - title: - latlon_html: Results from Internal - osm_nominatim_html: Results from OpenStreetMap - Nominatim - osm_nominatim_reverse_html: Results from OpenStreetMap - Nominatim search_osm_nominatim: prefix: aerialway: @@ -819,7 +803,7 @@ en-GB: fitness_station: Fitness Station garden: Garden golf_course: Golf Course - horse_riding: Horse Riding + horse_riding: Horse Riding Centre ice_rink: Ice Rink marina: Marina miniature_golf: Miniature Golf @@ -1141,10 +1125,8 @@ en-GB: home: Go to Home Location logout: Log Out log_in: Log In - log_in_tooltip: Log in with an existing account sign_up: Sign Up start_mapping: Start Mapping - sign_up_tooltip: Create an account for editing edit: Edit history: History export: Export @@ -1174,8 +1156,6 @@ en-GB: community: Community community_blogs: Community Blogs community_blogs_title: Blogs from members of the OpenStreetMap community - foundation: Foundation - foundation_title: The OpenStreetMap Foundation make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation @@ -1205,10 +1185,6 @@ en-GB: 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' @@ -1282,8 +1258,6 @@ en-GB: 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: @@ -1297,7 +1271,6 @@ en-GB: messages: inbox: title: Inbox - my_inbox: My Inbox messages: You have %{new_messages} and %{old_messages} new_messages: one: '%{count} new message' @@ -1305,12 +1278,14 @@ en-GB: old_messages: one: '%{count} old message' other: '%{count} old messages' - from: From - subject: Subject - date: Date no_messages_yet_html: You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}? people_mapping_nearby: people mapping nearby + messages_table: + from: From + to: To + subject: Subject + date: Date message_summary: unread_button: Mark as unread read_button: Mark as read @@ -1319,8 +1294,6 @@ en-GB: new: title: Send message send_message_to_html: Send a new message to %{name} - subject: Subject - body: Body back_to_inbox: Back to inbox create: message_sent: Message sent @@ -1335,9 +1308,6 @@ en-GB: messages: one: You have %{count} sent message other: You have %{count} sent messages - to: To - subject: Subject - date: Date no_sent_messages_html: You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}? people_mapping_nearby: people mapping nearby @@ -1347,47 +1317,46 @@ en-GB: to reply. show: title: Read message - from: From - subject: Subject - date: Date reply_button: Reply unread_button: Mark as unread destroy_button: Delete back: Back - to: To wrong_user: You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it. sent_message_summary: destroy_button: Delete + heading: + my_inbox: My Inbox mark: as_read: Message marked as read as_unread: Message marked as unread destroy: destroyed: Message deleted passwords: - lost_password: + new: title: Lost password heading: Forgotten Password? - email address: E-mail address + 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. + create: 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: + edit: 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? + update: + flash changed: Your password has been changed. 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 @@ -1402,24 +1371,14 @@ en-GB: new: title: Login heading: Login - email or username: 'E-mail Address or Username:' - password: 'Password:' - openid_html: '%{logo} OpenID:' + email or username: E-mail Address or Username + password: Password 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: @@ -1432,9 +1391,9 @@ en-GB: facebook: title: Login with Facebook alt: Login with a Facebook Account - windowslive: - title: Login with Windows Live - alt: Login with a Windows Live Account + microsoft: + title: Login with Microsoft + alt: Login with a Microsoft Account github: title: Login with GitHub alt: Login with a GitHub Account @@ -1454,7 +1413,6 @@ en-GB: site: about: next: Next - copyright_html: ©OpenStreetMap
contributors 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. @@ -1464,24 +1422,8 @@ en-GB: aerial imagery, GPS devices, and low-tech field maps to verify that OSM is accurate and up to date. community_driven_title: Community Driven - community_driven_html: |- - OpenStreetMap's community is diverse, passionate, and growing every day. Our contributors include enthusiast mappers, GIS professionals, engineers running the OSM servers, humanitarians mapping disaster-affected areas, and many more. - To learn more about the community, see the OpenStreetMap Blog, user diaries, community blogs, and the OSM Foundation website. open_data_title: Open Data - open_data_html: |- - OpenStreetMap is open data: you are free to use it for any purpose - as long as you credit OpenStreetMap and its contributors. If you alter or - build upon the data in certain ways, you may distribute the result only - under the same licence. See the Copyright and - Licence page for details. legal_title: Legal - legal_1_html: "This site and many other related services are formally operated - by the \nOpenStreetMap Foundation - (OSMF) \non behalf of the community. Use of all OSMF operated services is - subject \nto our Terms - of Use, \nAcceptable - Use Policies and our Privacy - Policy." partners_title: Partners copyright: foreign: @@ -1498,79 +1440,16 @@ en-GB: mapping_link: start mapping legal_babble: title_html: Copyright and Licence - intro_1_html: |- - OpenStreetMap® is open data, licensed under the Open Data - Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF). - intro_2_html: You are free to copy, distribute, transmit and adapt our data, - as long as you credit OpenStreetMap and its contributors. If you alter or - build upon our data, you may distribute the result only under the same licence. - The full legal - code explains your rights and responsibilities. - intro_3_1_html: "Our documentation is licensed under the \nCreative\nCommons - Attribution-ShareAlike 2.0 licence (CC BY-SA 2.0)." credit_title_html: How to credit OpenStreetMap - credit_4_html: |- - For a browsable electronic map, the credit should appear in the corner of the map. - For example: attribution_example: alt: Example of how to attribute OpenStreetMap on a webpage title: Attribution example more_title_html: Finding out more - more_1_html: |- - Read more about using our data, and how to credit us, at the OSMF Licence page. - more_2_html: |- - Although OpenStreetMap is open data, we cannot provide a - free-of-charge map API for third-parties. - See our API Usage Policy, - Tile Usage Policy - and Nominatim Usage Policy. contributors_title_html: Our contributors contributors_intro_html: |- Our contributors are thousands of individuals. We also include openly-licenced data from national mapping agencies and other sources, among them: - contributors_at_html: |- - Austria: Contains data from - Stadt Wien (under - CC BY), - Land Vorarlberg and - Land Tirol (under CC BY AT with amendments). - contributors_ca_html: |- - Canada: Contains data from - GeoBase®, GeoGratis (© Department of Natural - Resources Canada), CanVec (© Department of Natural - Resources Canada), and StatCan (Geography Division, - Statistics Canada). - contributors_fi_html: |- - Finland: Contains data from the - National Land Survey of Finland's Topographic Database - and other datasets, under the - NLSFI Licence. - contributors_fr_html: 'France: Contains data sourced from - Direction Générale des Impôts.' - contributors_nl_html: 'Netherlands: Contains © AND data, - 2007 (www.and.com)' - contributors_nz_html: |- - New Zealand: Contains data sourced from the - LINZ Data Service and - licensed for reuse under - CC BY 4.0. - contributors_si_html: |- - Slovenia: Contains data from the - Surveying and Mapping Authority and - Ministry of Agriculture, Forestry and Food - (public information of Slovenia). - contributors_za_html: 'South Africa: Contains data sourced - from Chief Directorate: National Geo-Spatial - Information, State copyright reserved.' - contributors_gb_html: 'United Kingdom: Contains Ordnance - Survey data © Crown copyright and database right 2010-19.' - contributors_footer_1_html: For further details of these, and other sources - that have been used to help improve OpenStreetMap, please see the Contributors - page on the OpenStreetMap Wiki. contributors_footer_2_html: Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability. @@ -1578,15 +1457,9 @@ 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. - trademarks_title_html: Trademarks - trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of - the Map are registered trademarks of the OpenStreetMap Foundation. If you - have questions about your use of the marks, please see our Trademark - Policy. 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. permalink: Permalink shortlink: Shortlink createnote: Add a note @@ -1605,15 +1478,8 @@ en-GB: for this feature. export: title: Export - area_to_export: Area to Export manually_select: Manually select a different area - format_to_export: Format to Export - osm_xml_data: OpenStreetMap XML Data - 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:' @@ -1631,23 +1497,9 @@ en-GB: title: Geofabrik Downloads description: Regularly-updated extracts of continents, countries, and selected cities - metro: - title: Metro Extracts - description: Extracts for major world cities and their surrounding areas other: title: Other Sources description: Additional sources listed on the OpenStreetMap wiki - options: Options - format: Format - scale: Scale - max: max - image_size: Image Size - zoom: Zoom - add_marker: Add a marker to the map - latitude: 'Lat:' - longitude: 'Lon:' - output: Output - paste_html: Paste HTML to embed in website export_button: Export fixthemap: title: Report a problem/Fix the map @@ -1658,17 +1510,8 @@ en-GB: explanation_html: If you have noticed a problem with our map data, for example a road is missing or your address, the best way to proceed is to join the OpenStreetMap community and add or repair the data yourself. - add_a_note: - instructions_html: Just click or the same icon - on the map display. This will add a marker to the map, which you can move - by dragging. Add your message, then click save, and other mappers will - investigate. other_concerns: title: Other concerns - explanation_html: "If you have concerns about how our data is being used or - about the contents please consult our\ncopyright page - for more legal information, or contact the appropriate \nOSMF - working group." help: title: Getting Help introduction: OpenStreetMap has several resources for learning about the project, @@ -1681,17 +1524,10 @@ en-GB: beginners_guide: title: Beginners' Guide description: Community maintained guide for beginners. - help: - title: Help Forum - description: Ask a question or look up answers on OpenStreetMap's question-and-answer - site. mailing_lists: title: Mailing Lists description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. - forums: - description: Questions and discussions for those that prefer a bulletin board - style interface. irc: title: IRC description: Interactive chat in many different languages and on many topics. @@ -1702,6 +1538,8 @@ en-GB: wiki: title: OpenStreetMap Wiki description: Browse the wiki for in-depth OpenStreetMap documentation. + any_questions: + title: Any questions? sidebar: search_results: Search Results close: Close @@ -1733,34 +1571,24 @@ en-GB: footway: Footway rail: Railway subway: Subway - tram: - - Light rail - - tram - cable: - - Cable car - - chairlift - runway: - - Airport Runway - - taxiway - apron: - - Airport apron - - terminal + cable_car: Cable car + chair_lift: Chair lift + runway: Airport Runway + taxiway: Taxiway + apron: Airport apron admin: Administrative boundary forest: Forest wood: Wood golf: Golf course park: Park + common: Common resident: Residential area - common: - - Common - - meadow retail: Retail area industrial: Industrial area commercial: Commercial area heathland: Heathland - lake: - - Lake - - reservoir + lake: Lake + reservoir: Reservoir farm: Farm brownfield: Brownfield site cemetery: Cemetery @@ -1769,14 +1597,12 @@ en-GB: centre: Sports centre reserve: Nature reserve military: Military area - school: - - School - - university + school: School + university: University building: Significant building station: Railway station - summit: - - Summit - - peak + summit: Summit + peak: Peak tunnel: Dashed casing = tunnel bridge: Black casing = bridge private: Private access @@ -1787,52 +1613,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) @@ -1882,13 +1678,12 @@ en-GB: trace_not_found: Trace not found! visibility: 'Visibility:' trace_paging_nav: - showing_page: Page %{page} older: Older Traces newer: Newer Traces trace: pending: PENDING count_points: - one: 1 point + one: '%{count} point' other: '%{count} points' more: more trace_details: View Trace Details @@ -1905,9 +1700,6 @@ 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 destroy: scheduled_for_deletion: Trace scheduled for deletion @@ -2013,12 +1805,6 @@ en-GB: account for you automatically. 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:' display name description: Your publicly displayed username. You can change this later in the preferences. external auth: 'Third Party Authentication:' @@ -2034,8 +1820,6 @@ en-GB: the Public Domain consider_pd_why: what's this? 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' decline: Decline you need to accept or decline: Please read and then either accept or decline the new Contributor Terms to continue. @@ -2055,7 +1839,6 @@ en-GB: deleted: deleted show: my diary: My Diary - new diary entry: new diary entry my edits: My Edits my traces: My Traces my notes: My Notes @@ -2076,13 +1859,10 @@ en-GB: ct status: 'Contributor terms:' ct undecided: Undecided ct declined: Declined - latest edit: 'Latest edit (%{ago}):' email address: 'Email address:' created from: 'Created from:' status: 'Status:' spam score: 'Spam Score:' - description: Description - user location: User location role: administrator: This user is an administrator moderator: This user is a moderator @@ -2097,14 +1877,11 @@ en-GB: comments: Comments create_block: Block this User activate_user: Activate this User - deactivate_user: Deactivate this User confirm_user: Confirm this user hide_user: Hide this User unhide_user: Unhide this User delete_user: Delete this User confirm: Confirm - set_home: - flash success: Home location saved successfully go_public: flash success: All your edits are now public, and you are now allowed to edit. index: @@ -2168,9 +1945,6 @@ en-GB: title: Creating block on %{name} heading_html: Creating block on %{name} period: How long, starting now, the user will be blocked from the API for. - tried_contacting: I have contacted the user and asked them to stop. - tried_waiting: I have given a reasonable amount of time for the user to respond - to those communications. back: View all blocks edit: title: Editing block on %{name} @@ -2183,10 +1957,6 @@ en-GB: block_period: The blocking period must be one of the values selectable in the drop-down list. create: - try_contacting: Please try contacting the user before blocking them and giving - them a reasonable time to respond. - try_waiting: Please try giving the user a reasonable time to respond before - blocking them. flash: Created a block on user %{name}. update: only_creator_can_edit: Only the moderator who created this block can edit it. @@ -2198,8 +1968,8 @@ en-GB: revoke: title: Revoking block on %{block_on} heading_html: Revoking block on %{block_on} by %{block_by} - time_future: This block will end in %{time}. - past: This block ended %{time} and cannot be revoked now. + time_future_html: This block will end in %{time}. + past_html: This block ended %{time} and cannot be revoked now. confirm: Are you sure you wish to revoke this block? revoke: Revoke! flash: This block has been revoked. @@ -2211,7 +1981,7 @@ en-GB: time_past_html: Ended %{time}. block_duration: hours: - one: 1 hour + one: '%{count} hour' other: '%{count} hours' blocks_on: title: Blocks on %{name} @@ -2252,7 +2022,7 @@ en-GB: index: title: Notes submitted or commented on by %{user} heading: '%{user}''s notes' - subheading_html: Notes submitted or commented on by %{user} + subheading_html: Notes %{submitted} or %{commented} by %{user} id: Id creator: Creator description: Description @@ -2264,15 +2034,6 @@ en-GB: 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 @@ -2333,8 +2094,6 @@ en-GB: gps: Public GPS Traces overlays: Enable overlays for troubleshooting the map title: Layers - copyright: © OpenStreetMap contributors - donate_link_text: site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map