X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d5d67d7bbe630e02b1ca15067291710a4fe13af9..927335b5c4410934d032f8e11c9659852171edd7:/config/locales/en-GB.yml?ds=inline diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 3fbb69c26..715689012 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,7 +218,6 @@ en-GB: auth: providers: none: None - openid: OpenID google: Google facebook: Facebook github: GitHub @@ -277,8 +277,6 @@ en-GB: for a note to confirm your new email address. success: User information updated successfully. browse: - created: Created - closed: Closed version: Version in_changeset: Changeset anonymous: anonymous @@ -288,25 +286,6 @@ en-GB: view_history: View History view_details: View Details location: 'Location:' - changeset: - title: 'Changeset: %{id}' - belongs_to: Author - node: Nodes (%{count}) - node_paginated: Nodes (%{x}-%{y} of %{count}) - way: Ways (%{count}) - way_paginated: Ways (%{x}-%{y} of %{count}) - relation: Relations (%{count}) - relation_paginated: Relations (%{x}-%{y} of %{count}) - comment: Comments (%{count}) - 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 - closed. node: title_html: 'Node: %{name}' history_title_html: 'Node History: %{name}' @@ -403,6 +382,27 @@ 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} + created: Created + closed: Closed + belongs_to: Author + show: + title: 'Changeset: %{id}' + discussion: Discussion + join_discussion: Log in to join the discussion + still_open: Changeset still open - discussion will open once the changeset is + closed. + changesetxml: Changeset XML + osmchangexml: osmChange XML + paging_nav: + nodes: Nodes (%{count}) + nodes_paginated: Nodes (%{x}-%{y} of %{count}) + ways: Ways (%{count}) + ways_paginated: Ways (%{x}-%{y} of %{count}) + relations: Relations (%{count}) + relations_paginated: Relations (%{x}-%{y} of %{count}) timeout: sorry: Sorry, the list of changesets you requested took too long to retrieve. changeset_comments: @@ -421,6 +421,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 @@ -472,7 +473,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 @@ -506,6 +506,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? @@ -1135,8 +1143,6 @@ 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_ucl: UCL - partners_bytemark: Bytemark Hosting partners_partners: partners osm_offline: The OpenStreetMap database is currently offline while essential database maintenance work is carried out. @@ -1264,7 +1270,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' @@ -1272,12 +1277,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 @@ -1300,9 +1307,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 @@ -1321,28 +1325,28 @@ 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. - 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 @@ -1362,9 +1366,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 @@ -1384,8 +1387,8 @@ en-GB: title: Login with Facebook alt: Login with a Facebook Account microsoft: - title: Login with Windows Live - alt: Login with a Windows Live Account + title: Login with Microsoft + alt: Login with a Microsoft Account github: title: Login with GitHub alt: Login with a GitHub Account @@ -1470,12 +1473,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 @@ -1497,17 +1495,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 @@ -1532,10 +1519,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 @@ -1583,34 +1566,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 @@ -1619,14 +1592,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 @@ -1707,7 +1678,7 @@ en-GB: trace: pending: PENDING count_points: - one: 1 point + one: '%{count} point' other: '%{count} points' more: more trace_details: View Trace Details @@ -1717,8 +1688,6 @@ en-GB: identifiable: IDENTIFIABLE private: PRIVATE trackable: TRACKABLE - by: by - in: in index: public_traces: Public GPS traces public_traces_from: Public GPS traces from %{user} @@ -1883,7 +1852,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:' @@ -1912,9 +1880,6 @@ en-GB: index: title: Users heading: Users - showing: - one: Page %{page} (%{first_item} of %{items}) - other: Page %{page} (%{first_item}-%{last_item} of %{items}) summary_html: '%{name} created from %{ip_address} on %{date}' summary_no_ip_html: '%{name} created on %{date}' confirm: Confirm Selected Users @@ -1993,8 +1958,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. @@ -2006,7 +1971,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} @@ -2040,14 +2005,11 @@ en-GB: reason: Reason for block status: Status revoker_name: Revoked by - showing_page: Page %{page} - next: Next » - previous: « Previous notes: 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