X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8fb45ef0fddee05d8fa3829303f61226764bd91a..87422e56f96b6fd6c000663d809795d6695f2aa1:/config/locales/en-GB.yml?ds=sidebyside diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 67dce974e..c4e0b6199 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -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,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: @@ -500,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 @@ -1143,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. @@ -1342,10 +1346,6 @@ en-GB: 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} @@ -1371,7 +1371,7 @@ en-GB: sessions: new: title: Login - heading: Login + tab_title: Login email or username: E-mail Address or Username password: Password remember: Remember me @@ -1379,34 +1379,7 @@ en-GB: 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 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 destroy: title: Logout heading: Logout of OpenStreetMap @@ -1427,6 +1400,7 @@ en-GB: legal_title: Legal partners_title: Partners copyright: + title: Copyright and Licence foreign: title: About this translation html: In the event of a conflict between this translated page and %{english_original_link}, @@ -1440,7 +1414,6 @@ en-GB: native_link: British English version mapping_link: start mapping legal_babble: - title_html: Copyright and Licence credit_title_html: How to credit OpenStreetMap attribution_example: alt: Example of how to attribute OpenStreetMap on a webpage @@ -1461,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 @@ -1694,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} @@ -1728,6 +1696,26 @@ 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 oauth: authorize: title: Authorise access to your account @@ -1809,11 +1797,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 @@ -1888,9 +1874,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 @@ -2002,7 +1985,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: @@ -2016,9 +1998,6 @@ 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} @@ -2104,13 +2083,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: