X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/460b8c1de243b518ee2ef9481292ec690213e623..280917c7569c226578f7787f4a8baed1de114e45:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index e07c9aaab..213127d45 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -171,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}) @@ -218,7 +218,6 @@ en-GB: auth: providers: none: None - openid: OpenID google: Google facebook: Facebook github: GitHub @@ -278,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 @@ -289,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}' @@ -404,6 +382,32 @@ 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. + subscribe: Subscribe + unsubscribe: Unsubscribe + hide_comment: hide + unhide_comment: unhide + comment: Comment + 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: @@ -474,7 +478,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 @@ -502,7 +505,8 @@ en-GB: all: title: OpenStreetMap diary entries description: Recent diary entries from users of OpenStreetMap - comments: + diary_comments: + index: post: Post when: When comment: Comment @@ -1145,8 +1149,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. @@ -1340,14 +1342,10 @@ en-GB: 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. edit: title: Reset password heading: Reset Password for %{user} @@ -1373,43 +1371,15 @@ en-GB: sessions: new: title: Login - heading: Login - email or username: 'E-mail Address or Username:' - password: 'Password:' - openid_html: '%{logo} OpenID:' + tab_title: Login + 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 external: 'Alternatively, use a third party to login:' - no account: Don't have an account? auth failure: Sorry, could not log in with those details. - openid_logo_alt: Log in with an OpenID - auth_providers: - openid: - title: Login with OpenID - alt: Login with an OpenID URL - google: - title: Login with Google - alt: Login with a Google OpenID - facebook: - title: Login with Facebook - alt: Login with a Facebook Account - microsoft: - title: Login with Windows Live - alt: Login with a Windows Live Account - github: - title: Login with GitHub - alt: Login with a GitHub Account - wikipedia: - title: Login with Wikipedia - alt: Login with a Wikipedia Account - wordpress: - title: Login with Wordpress - alt: Login with a Wordpress OpenID - aol: - title: Login with AOL - alt: Login with an AOL OpenID destroy: title: Logout heading: Logout of OpenStreetMap @@ -1464,9 +1434,6 @@ en-GB: index: js_1: You are either using a browser that does not support JavaScript, or you have disabled JavaScript. - permalink: Permalink - shortlink: Shortlink - createnote: Add a note license: copyright: Copyright OpenStreetMap and contributors, under an open licence remote_failed: Editing failed - make sure JOSM or Merkaartor is loaded and that @@ -1482,12 +1449,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 @@ -1509,17 +1471,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 @@ -1544,10 +1495,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 @@ -1596,23 +1543,23 @@ en-GB: rail: Railway subway: Subway cable_car: Cable car - chair_lift: chairlift - runway_only: Airport Runway - taxiway: taxiway - apron_only: Airport apron + chair_lift: Chair lift + runway: Airport Runway + taxiway: Taxiway + apron: Airport apron admin: Administrative boundary - forest_only: Forest + forest: Forest wood: Wood golf: Golf course park: Park - common_only: Common + common: Common resident: Residential area retail: Retail area industrial: Industrial area commercial: Commercial area heathland: Heathland - lake_only: Lake - reservoir: reservoir + lake: Lake + reservoir: Reservoir farm: Farm brownfield: Brownfield site cemetery: Cemetery @@ -1621,12 +1568,12 @@ en-GB: centre: Sports centre reserve: Nature reserve military: Military area - school_only: School - university: university + school: School + university: University building: Significant building station: Railway station - summit_only: Summit - peak: peak + summit: Summit + peak: Peak tunnel: Dashed casing = tunnel bridge: Black casing = bridge private: Private access @@ -1707,7 +1654,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 +1664,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} @@ -1751,6 +1696,32 @@ en-GB: need_to_see_terms: Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them. + auth_providers: + openid_logo_alt: Log in with an OpenID + openid: + title: Login with OpenID + alt: Login with an OpenID URL + google: + title: Login with Google + alt: Login with a Google OpenID + facebook: + title: Login with Facebook + alt: Login with a Facebook Account + microsoft: + title: Login with Microsoft + alt: Login with a Microsoft Account + github: + title: Login with GitHub + alt: Login with a GitHub Account + wikipedia: + title: Login with Wikipedia + alt: Login with a Wikipedia Account + wordpress: + title: Login with Wordpress + alt: Login with a Wordpress OpenID + aol: + title: Login with AOL + alt: Login with an AOL OpenID oauth: authorize: title: Authorise access to your account @@ -1832,11 +1803,9 @@ en-GB: display name description: Your publicly displayed username. You can change this later in the preferences. external auth: 'Third Party Authentication:' - use external auth: Alternatively, use a third party to login - auth no password: With third party authentication a password is not required, - but some extra tools or server may still need one. continue: Sign Up terms accepted: Thanks for accepting the new contributor terms! + use external auth: Alternatively, use a third party to login terms: title: Terms heading: Terms @@ -1911,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 @@ -2005,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} @@ -2025,7 +1991,6 @@ en-GB: revoke: Revoke! confirm: Are you sure? reason: 'Reason for block:' - back: View all blocks revoker: 'Revoker:' needs_view: The user needs to log in before this block will be cleared. block: @@ -2039,14 +2004,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 @@ -2127,13 +2089,6 @@ en-GB: map_data_zoom_in_tooltip: Zoom in to see map data queryfeature_tooltip: Query features queryfeature_disabled_tooltip: Zoom in to query features - changesets: - show: - comment: Comment - subscribe: Subscribe - unsubscribe: Unsubscribe - hide_comment: hide - unhide_comment: unhide edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: