X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/76d51a2a365414148f508709b46b6fb64dceec76..3ece776664381794b5e342e82ed2be3f47f120b5:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2ec5e27dd..2954b2154 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1,6 +1,7 @@ # Messages for British English (British English) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Abijeet Patro # Author: Andibing # Author: Bpfhjquevaps # Author: Bruce89 @@ -10,15 +11,18 @@ # Author: E THP # Author: EdLoach # Author: Eduard Popov +# Author: Gravitystorm # Author: IknowJoseph # Author: Jagwar # Author: Jguthrie100 # Author: Kosovastar # Author: Macofe # Author: Meno25 +# Author: Mvolz # Author: Sampablokuper # Author: Shirayuki # Author: Smsm1 +# Author: TomH # Author: ديفيد --- en-GB: @@ -28,6 +32,26 @@ en-GB: formats: friendly: '%e %B %Y at %H:%M' blog: '%e %B %Y' + helpers: + submit: + diary_comment: + create: Save + diary_entry: + create: Publish + message: + create: Send + client_application: + create: Register + update: Edit + redaction: + create: Create redaction + update: Save redaction + trace: + create: Upload + update: Save Changes + user_block: + create: Create block + update: Update block activerecord: models: acl: Access Control List @@ -113,15 +137,38 @@ en-GB: remote: name: Remote Control description: Remote Control (JOSM or Merkaartor) + api: + notes: + comment: + opened_at_html: Created %{when} + opened_at_by_html: Created %{when} by %{user} + commented_at_html: Updated %{when} + commented_at_by_html: Updated %{when} by %{user} + closed_at_html: Resolved %{when} + closed_at_by_html: Resolved %{when} by %{user} + reopened_at_html: Reactivated %{when} + reopened_at_by_html: Reactivated %{when} by %{user} + rss: + title: OpenStreetMap Notes + description_area: A list of notes, reported, commented on or closed in your + area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: An rss feed for note %{id} + opened: new note (near %{place}) + commented: new comment (near %{place}) + closed: closed note (near %{place}) + reopened: reactivated note (near %{place}) + entry: + comment: Comment + full: Full note browse: created: Created closed: Closed - created_html: Created %{time} ago - closed_html: Closed %{time} ago - created_by_html: Created %{time} ago by %{user} - deleted_by_html: Deleted %{time} ago by %{user} - edited_by_html: Edited %{time} ago by %{user} - closed_by_html: Closed %{time} ago by %{user} + 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 @@ -141,9 +188,8 @@ en-GB: relation: Relations (%{count}) relation_paginated: Relations (%{x}-%{y} of %{count}) comment: Comments (%{count}) - hidden_commented_by: Hidden comment from %{user} %{when} - ago - commented_by: Comment from %{user} %{when} ago + hidden_commented_by: Hidden comment from %{user} %{when} + commented_by: Comment from %{user} %{when} changesetxml: Changeset XML osmchangexml: osmChange XML feed: @@ -219,25 +265,22 @@ en-GB: open_title: 'Unresolved note #%{note_name}' closed_title: 'Resolved note #%{note_name}' hidden_title: 'Hidden note #%{note_name}' - open_by: Created by %{user} %{when} ago - open_by_anonymous: Created by anonymous %{when} - ago - commented_by: Comment from %{user} %{when} ago - commented_by_anonymous: Comment from anonymous %{when} - ago - closed_by: Resolved by %{user} %{when} ago - closed_by_anonymous: Resolved by anonymous %{when} - ago - reopened_by: Reactivated by %{user} %{when} ago - reopened_by_anonymous: Reactivated by anonymous %{when} - ago - hidden_by: Hidden by %{user} %{when} ago + open_by: Created by %{user} %{when} + open_by_anonymous: Created by anonymous %{when} + commented_by: Comment from %{user} %{when} + commented_by_anonymous: Comment from anonymous %{when} + closed_by: Resolved by %{user} %{when} + closed_by_anonymous: Resolved by anonymous %{when} + reopened_by: Reactivated by %{user} %{when} + reopened_by_anonymous: Reactivated by anonymous %{when} + hidden_by: Hidden by %{user} %{when} + report: Report this note query: title: Query Features introduction: Click on the map to find nearby features. nearby: Nearby features enclosing: Enclosing features - changeset: + changesets: changeset_paging_nav: showing_page: Page %{page} next: Next » @@ -252,10 +295,10 @@ en-GB: user: User comment: Comment area: Area - list: + index: title: Changesets title_user: Changesets by %{user} - title_friend: Changesets by your friends + title_friend: Changesets by my friends title_nearby: Changesets by nearby users empty: No changesets found. empty_area: No changesets in this area. @@ -266,47 +309,45 @@ en-GB: load_more: Load more timeout: sorry: Sorry, the list of changesets you requested took too long to retrieve. - rss: + changeset_comments: + comment: + comment: 'New comment on changeset #%{changeset_id} by %{author}' + commented_at_by_html: Updated %{when} by %{user} + index: title_all: OpenStreetMap changeset discussion title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion' - comment: 'New comment on changeset #%{changeset_id} by %{author}' - commented_at_html: Updated %{when} ago - commented_at_by_html: Updated %{when} ago by %{user} - full: Full discussion - diary_entry: + diary_entries: new: title: New Diary Entry - publish_button: Publish - list: + form: + subject: 'Subject:' + body: 'Body:' + language: 'Language:' + location: 'Location:' + latitude: 'Latitude:' + longitude: 'Longitude:' + use_map_link: use map + index: title: Users' diaries title_friends: Friends' diaries title_nearby: Nearby Users' diaries user_title: '%{user}''s diary' in_language_title: Diary Entries in %{language} new: New Diary Entry - new_title: Compose a new entry in your user diary + new_title: Compose a new entry in my user diary no_entries: No diary entries recent_entries: Recent diary entries older_entries: Older Entries newer_entries: Newer Entries edit: title: Edit diary entry - subject: 'Subject:' - body: 'Body:' - language: 'Language:' - location: 'Location:' - latitude: 'Latitude:' - longitude: 'Longitude:' - use_map_link: use map - save_button: Save marker_text: Diary entry location - view: + show: title: '%{user}''s diary | %{title}' user_title: '%{user}''s diary' leave_a_comment: Leave a comment login_to_leave_a_comment: '%{login_link} to leave a comment' login: Login - save_button: Save no_such_entry: title: No such diary entry heading: 'No entry with the id: %{id}' @@ -346,18 +387,17 @@ en-GB: post: Post when: When comment: Comment - ago: '%{ago} ago' newer_comments: Newer Comments older_comments: Older Comments geocoder: search: title: - latlon: Results from Internal - ca_postcode: Results from Geocoder.CA - osm_nominatim: Results from OpenStreetMap + latlon: Results from Internal + ca_postcode: Results from Geocoder.CA + osm_nominatim: Results from OpenStreetMap Nominatim geonames: Results from GeoNames - osm_nominatim_reverse: Results from OpenStreetMap + osm_nominatim_reverse: Results from OpenStreetMap Nominatim geonames_reverse: Results from GeoNames search_osm_nominatim: @@ -814,7 +854,7 @@ en-GB: "yes": Shop tourism: alpine_hut: Alpine Hut - apartment: Apartment + apartment: Holiday Flat artwork: Artwork attraction: Attraction bed_and_breakfast: Bed and Breakfast @@ -865,7 +905,7 @@ en-GB: level10: Suburb Boundary description: title: - osm_nominatim: Location from OpenStreetMap + osm_nominatim: Location from OpenStreetMap Nominatim geonames: Location from GeoNames types: @@ -903,10 +943,7 @@ en-GB: intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open licence. intro_2_create_account: Create a user account - partners_html: Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other - %{partners}. partners_ucl: UCL - partners_ic: Imperial College London partners_bytemark: Bytemark Hosting partners_partners: partners osm_offline: The OpenStreetMap database is currently offline while essential database @@ -1038,7 +1075,7 @@ 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". - message: + messages: inbox: title: Inbox my_inbox: My Inbox @@ -1060,14 +1097,14 @@ en-GB: unread_button: Mark as unread read_button: Mark as read reply_button: Reply - delete_button: Delete + destroy_button: Delete new: title: Send message send_message_to: Send a new message to %{name} subject: Subject body: Body - send_button: Send back_to_inbox: Back to inbox + create: message_sent: Message sent limit_exceeded: You have sent a lot of messages recently. Please wait a while before trying to send any more. @@ -1093,26 +1130,26 @@ en-GB: wrong_user: You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply. - read: + show: title: Read message from: From subject: Subject date: Date reply_button: Reply unread_button: Mark as unread - delete_button: Delete + 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: - delete_button: Delete + destroy_button: Delete mark: as_read: Message marked as read as_unread: Message marked as unread - delete: - deleted: Message deleted + destroy: + destroyed: Message deleted site: about: next: Next @@ -1130,7 +1167,7 @@ en-GB: 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 user diaries, community blogs, and the OSM Foundation website. + 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 @@ -1140,13 +1177,15 @@ en-GB: Licence page for details. legal_title: Legal legal_html: "This site and many other related services are formally operated - by the \nOpenStreetMap Foundation + by the \nOpenStreetMap Foundation (OSMF) \non behalf of the community. Use of all OSMF operated services is - subject \nto our \nAcceptable - Use Policies and our Privacy - Policy\n
\nPlease contact - the OSMF \nif you have licensing, copyright or other legal questions and - issues." + subject \nto our Terms + of Use, \nAcceptable + Use Policies and our Privacy + Policy\n
\nPlease contact + the OSMF \nif you have licensing, copyright or other legal questions.\n
\nOpenStreetMap, + the magnifying glass logo and State of the Map are registered + trademarks of the OSMF." partners_title: Partners copyright: foreign: @@ -1165,17 +1204,17 @@ en-GB: title_html: Copyright and Licence intro_1_html: |- OpenStreetMap® is open data, licensed under the Open Data + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF). + href="https://osmfoundation.org/">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. + The full legal + code explains your rights and responsibilities. intro_3_html: |- The cartography in our map tiles, and our documentation, are - licenced under the Creative + licenced under the Creative Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). credit_title_html: How to credit OpenStreetMap credit_1_html: |- @@ -1185,7 +1224,7 @@ en-GB: 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 licenced as CC BY-SA. You may do this by linking to - this copyright page. + 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 @@ -1201,9 +1240,7 @@ en-GB: 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 and the community Legal - FAQ. + href="https://osmfoundation.org/Licence">OSMF Licence page. more_2_html: |- Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-parties. @@ -1236,8 +1273,11 @@ en-GB: 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 Land Information New Zealand. Crown Copyright reserved.' + 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 @@ -1247,9 +1287,9 @@ en-GB: 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-12.' + 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 + 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, @@ -1260,8 +1300,8 @@ en-GB: 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 + href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">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 @@ -1288,13 +1328,13 @@ en-GB: anon_edits: (%{link}) anon_edits_link_text: Find out why this is the case. flash_player_required: You need a Flash player to use Potlatch, the OpenStreetMap - Flash editor. You can download - Flash Player from Adobe.com. Several + 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 http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 + 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.) @@ -1374,7 +1414,7 @@ en-GB: mapping topics. welcome: url: /welcome - title: Welcome to OSM + title: Welcome to OpenStreetMap description: Start with this quick guide covering the OpenStreetMap basics. beginners_guide: url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide @@ -1382,8 +1422,8 @@ en-GB: description: Community maintained guide for beginners. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org - description: Ask a question or look up answers on OSM's question-and-answer + title: Help Forum + description: Ask a question or look up answers on OpenStreetMap's question-and-answer site. mailing_lists: title: Mailing Lists @@ -1402,8 +1442,8 @@ en-GB: based maps and other services. wiki: url: http://wiki.openstreetmap.org/ - title: wiki.openstreetmap.org - description: Browse the wiki for in-depth OSM documentation. + title: OpenStreetMap Wiki + description: Browse the wiki for in-depth OpenStreetMap documentation. sidebar: search_results: Search Results close: Close @@ -1413,7 +1453,7 @@ en-GB: get_directions_title: Find directions between two points from: From to: To - where_am_i: Where am I? + where_am_i: Where is this? where_am_i_title: Describe the current location using the search engine submit_text: Go reverse_directions_text: Reverse Directions @@ -1491,7 +1531,7 @@ en-GB: edit: Edit preview: Preview markdown_help: - title_html: Parsed with Markdown + title_html: Parsed with kramdown headings: Headings heading: Heading subheading: Subheading @@ -1542,7 +1582,7 @@ en-GB: 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. + 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! @@ -1552,18 +1592,35 @@ en-GB: 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.' - trace: + traces: visibility: private: Private (only shared as anonymous, unordered points) public: Public (shown in trace list and as anonymous, unordered points) trackable: Trackable (only shared as anonymous, ordered points with timestamps) identifiable: Identifiable (shown in trace list and as identifiable, ordered points with timestamps) + new: + upload_gpx: 'Upload GPX File:' + description: 'Description:' + tags: 'Tags:' + tags_help: comma delimited + visibility: 'Visibility:' + visibility_help: what does this mean? + visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces + help: Help + help_url: http://wiki.openstreetmap.org/wiki/Upload create: upload_trace: Upload GPS Trace trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion. + traces_waiting: + one: You have %{count} trace waiting for upload. Please consider waiting for + these to finish before uploading any more, so as not to block the queue + for other users. + other: You have %{count} traces waiting for upload. Please consider waiting + for these to finish before uploading any more, so as not to block the queue + for other users. edit: title: Editing trace %{name} heading: Editing trace %{name} @@ -1578,34 +1635,12 @@ en-GB: description: 'Description:' tags: 'Tags:' tags_help: comma delimited - save_button: Save Changes visibility: 'Visibility:' visibility_help: what does this mean? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces - trace_form: - upload_gpx: 'Upload GPX File:' - description: 'Description:' - tags: 'Tags:' - tags_help: comma delimited - visibility: 'Visibility:' - visibility_help: what does this mean? - visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces - upload_button: Upload - help: Help - help_url: http://wiki.openstreetmap.org/wiki/Upload - trace_header: - upload_trace: Upload a trace - see_all_traces: See all traces - traces_waiting: - one: You have %{count} trace waiting for upload. Please consider waiting for - these to finish before uploading any more, so as not to block the queue - for other users. - other: You have %{count} traces waiting for upload. Please consider waiting - for these to finish before uploading any more, so as not to block the queue - for other users. trace_optionals: tags: Tags - view: + show: title: Viewing trace %{name} heading: Viewing trace %{name} pending: PENDING @@ -1620,8 +1655,8 @@ en-GB: description: 'Description:' tags: 'Tags:' none: None - edit_track: Edit this trace - delete_track: Delete this trace + edit_trace: Edit this trace + delete_trace: Delete this trace trace_not_found: Trace not found! visibility: 'Visibility:' trace_paging_nav: @@ -1630,8 +1665,9 @@ en-GB: newer: Newer Traces trace: pending: PENDING - count_points: '%{count} points' - ago: '%{time_in_words_ago} ago' + count_points: + one: 1 point + other: '%{count} points' more: more trace_details: View Trace Details view_map: View Map @@ -1644,7 +1680,7 @@ en-GB: by: by in: in map: map - list: + index: public_traces: Public GPS traces public_traces_from: Public GPS traces from %{user} description: Browse recent GPS track uploads @@ -1652,6 +1688,8 @@ en-GB: 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 delete: scheduled_for_deletion: Trace scheduled for deletion make_public: @@ -1672,8 +1710,6 @@ en-GB: require_cookies: cookies_needed: You appear to have cookies disabled - please enable cookies in your browser before continuing. - require_moderator: - not_a_moderator: You need to be a moderator to perform that action. setup_user_auth: blocked_zero_hour: You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits. @@ -1712,10 +1748,8 @@ en-GB: oauth_clients: new: title: Register a new application - submit: Register edit: title: Edit your application - submit: Edit show: title: OAuth details for %{app_name} key: 'Consumer Key:' @@ -1771,7 +1805,7 @@ en-GB: flash: Updated the client information successfully destroy: flash: Destroyed the client application registration - user: + users: login: title: Login heading: Login @@ -1883,17 +1917,14 @@ en-GB: Terms. For more information, please see this wiki page. terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: - title: Contributor terms - heading: Contributor terms - read and accept: Please read the agreement and press the agree button to confirm - that you accept the terms of this agreement for your existing and future contributions. - consider_pd: In addition to the above agreement, I consider my contributions - to be in the Public Domain + title: Terms + heading: Terms + consider_pd: In addition to the above, I consider my contributions to be in + the Public Domain consider_pd_why: what's this? consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain guidance: 'Information to help understand these terms: a human readable summary and some informal translations' - agree: Agree declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined decline: Decline you need to accept or decline: Please read and then either accept or decline @@ -1909,7 +1940,7 @@ en-GB: body: Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong. deleted: deleted - view: + show: my diary: My Diary new diary entry: new diary entry my edits: My Edits @@ -1930,12 +1961,10 @@ en-GB: remove as friend: Unfriend add as friend: Add Friend mapper since: 'Mapper since:' - ago: (%{time_in_words_ago} ago) ct status: 'Contributor terms:' ct undecided: Undecided ct declined: Declined - ct accepted: Accepted %{ago} ago - latest edit: 'Latest edit %{ago}:' + latest edit: 'Latest edit (%{ago}):' email address: 'Email address:' created from: 'Created from:' status: 'Status:' @@ -2081,9 +2110,7 @@ en-GB: button: Unfriend success: '%{name} was removed from your friends.' not_a_friend: '%{name} is not one of your friends.' - filter: - not_an_administrator: You need to be an administrator to perform that action. - list: + index: title: Users heading: Users showing: @@ -2122,8 +2149,6 @@ en-GB: with your ID in your user settings. user_role: filter: - not_an_administrator: Only administrators can perform user role management, - and you are not an administrator. not_a_role: The string `%{role}' is not a valid role. already_has_role: The user already has role %{role}. doesnt_have_role: The user does not have role %{role}. @@ -2158,7 +2183,6 @@ en-GB: 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. - submit: Create block 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. @@ -2172,7 +2196,6 @@ en-GB: 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. - submit: Update block show: View this block back: View all blocks needs_view: Does the user need to log in before this block will be cleared? @@ -2197,18 +2220,19 @@ en-GB: title: Revoking block on %{block_on} heading: Revoking block on %{block_on} by %{block_by} time_future: This block will end in %{time}. - past: This block ended %{time} ago and cannot be revoked now. + past: 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. - period: - one: 1 hour - other: '%{count} hours' helper: time_future: Ends in %{time}. until_login: Active until the user logs in. time_future_and_until_login: Ends in %{time} and after the user has logged in. - time_past: Ended %{time} ago. + time_past: Ended %{time}. + block_duration: + hours: + one: 1 hour + other: '%{count} hours' blocks_on: title: Blocks on %{name} heading: List of blocks on %{name} @@ -2220,10 +2244,7 @@ en-GB: show: title: '%{block_on} blocked by %{block_by}' heading: '%{block_on} blocked by %{block_by}' - time_future: Ends in %{time} - time_past: Ended %{time} ago created: Created - ago: '%{time} ago' status: Status show: Show edit: Edit @@ -2248,37 +2269,15 @@ en-GB: next: Next » previous: « Previous notes: - comment: - opened_at_html: Created %{when} ago - opened_at_by_html: Created %{when} ago by %{user} - commented_at_html: Updated %{when} ago - commented_at_by_html: Updated %{when} ago by %{user} - closed_at_html: Resolved %{when} ago - closed_at_by_html: Resolved %{when} ago by %{user} - reopened_at_html: Reactivated %{when} ago - reopened_at_by_html: Reactivated %{when} ago by %{user} - rss: - title: OpenStreetMap Notes - description_area: A list of notes, reported, commented on or closed in your - area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] - description_item: An rss feed for note %{id} - opened: new note (near %{place}) - commented: new comment (near %{place}) - closed: closed note (near %{place}) - reopened: reactivated note (near %{place}) - entry: - comment: Comment - full: Full note mine: title: Notes submitted or commented on by %{user} heading: '%{user}''s notes' - subheading: Notes submitted or commented on by %{user} + subheading_html: Notes submitted or commented on by %{user} id: Id creator: Creator description: Description created_at: Created at last_changed: Last changed - ago_html: '%{when} ago' javascripts: close: Close share: @@ -2348,8 +2347,7 @@ en-GB: 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. (Please don't enter personal information or information from - copyrighted maps or directory listings.) + 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 @@ -2366,19 +2364,16 @@ en-GB: directions: ascend: Ascend engines: + fossgis_osrm_car: Car (OSRM) graphhopper_bicycle: Bicycle (GraphHopper) graphhopper_car: Car (GraphHopper) graphhopper_foot: Foot (GraphHopper) - mapquest_bicycle: Bicycle (MapQuest) - mapquest_car: Car (MapQuest) - mapquest_foot: Foot (MapQuest) - osrm_car: Car (OSRM) descend: Descend directions: Directions distance: Distance errors: no_route: Couldn't find a route between those two places. - no_place: Sorry - couldn't find that place. + no_place: Sorry - couldn't locate '%{place}'. instructions: continue_without_exit: Continue on %{name} slight_right_without_exit: Slight right onto %{name} @@ -2416,7 +2411,7 @@ en-GB: slight_left_without_exit: Slight left onto %{name} via_point_without_exit: (via point) follow_without_exit: Follow %{name} - roundabout_without_exit: At roundabout take %{name} + roundabout_without_exit: At roundabout take exit onto %{name} leave_roundabout_without_exit: Leave roundabout - %{name} stay_roundabout_without_exit: Stay on roundabout - %{name} start_without_exit: Start on %{name} @@ -2424,11 +2419,6 @@ en-GB: against_oneway_without_exit: Go against one-way on %{name} end_oneway_without_exit: End of one-way on %{name} roundabout_with_exit: At roundabout take exit %{exit} onto %{name} - turn_left_with_exit: At roundabout turn left onto %{name} - slight_left_with_exit: At roundabout slight left onto %{name} - turn_right_with_exit: At roundabout turn right onto %{name} - slight_right_with_exit: At roundabout slight right onto %{name} - continue_with_exit: At roundabout continue straight onto %{name} unnamed: unnamed road courtesy: Directions courtesy of %{link} time: Time @@ -2450,7 +2440,6 @@ en-GB: edit: description: Description heading: Edit redaction - submit: Save redaction title: Edit redaction index: empty: No redactions to show. @@ -2459,7 +2448,6 @@ en-GB: new: description: Description heading: Enter information for new redaction - submit: Create redaction title: Creating new redaction show: description: 'Description:'