X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2145480a00739c3add27eb4569fb03ac8b8cd6f1..86b84cff3bd9b9b07ecf1d4e0e4cdebc03fbf3fc:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 4cec17f77..25b929c68 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 @@ -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: @@ -280,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 @@ -304,9 +297,6 @@ 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: @@ -430,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 @@ -481,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 @@ -515,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? @@ -528,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: @@ -1280,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' @@ -1288,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 @@ -1316,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 @@ -1337,34 +1326,37 @@ en-GB: 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 @@ -1379,9 +1371,8 @@ 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 @@ -1400,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 @@ -1422,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. @@ -1432,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: @@ -1504,12 +1478,7 @@ 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 too_large: advice: 'If the above export fails, please consider using one of the sources @@ -1531,17 +1500,6 @@ en-GB: 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 @@ -1552,11 +1510,6 @@ 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 help: @@ -1571,10 +1524,6 @@ 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 @@ -1622,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 @@ -1658,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 @@ -1741,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 @@ -1923,7 +1859,6 @@ 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:' @@ -2033,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. @@ -2046,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} @@ -2087,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 @@ -2099,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 @@ -2168,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