X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4d64b178b8968421ff30e188a2105e7560efc7f0..9d94d41376105ace0d434f9f4bfbb31070427cf8:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 48eb9ce12..955f4a97c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -103,11 +103,11 @@ en: navigation: paging: user: - prev: "« %{id}" - next: "%{id} »" + prev: "« %{id}" + next: "%{id} »" all: - prev: "« %{id}" - next: "%{id} »" + prev: "« %{id}" + next: "%{id} »" user: name_changeset_tooltip: "View edits by %{user}" prev_changeset_tooltip: "Previous edit by %{user}" @@ -157,6 +157,11 @@ en: node: "View node on larger map" way: "View way on larger map" relation: "View relation on larger map" + edit: + area: "Edit area" + node: "Edit node" + way: "Edit way" + relation: "Edit relation" node_details: coordinates: "Coordinates:" part_of: "Part of:" @@ -280,8 +285,8 @@ en: changeset: changeset_paging_nav: showing_page: "Showing page %{page}" - next: "Next »" - previous: "« Previous" + next: "Next »" + previous: "« Previous" changeset: id: "#%{id}" still_editing: "(still editing)" @@ -302,16 +307,19 @@ en: title_user: "Changesets by %{user}" title_bbox: "Changesets within %{bbox}" title_user_bbox: "Changesets by %{user} within %{bbox}" + title_friend: "Changesets by your friends" heading: "Changesets" heading_user: "Changesets" heading_bbox: "Changesets" heading_user_bbox: "Changesets" + heading_friend: "Changesets" description: "Recent changes" description_user: "Changesets by %{user}" description_bbox: "Changesets within %{bbox}" description_user_bbox: "Changesets by %{user} within %{bbox}" + description_friend: "Changesets by your friends" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: @@ -931,9 +939,10 @@ en: tag_line: The Free Wiki World Map intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you." intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth." - intro_3: "OpenStreetMap's hosting is kindly supported by the %{ucl} and %{bytemark}. Other supporters of the project are listed in the %{partners}." - intro_3_ucl: "UCL VR Centre" - intro_3_bytemark: "bytemark" + intro_3: "OpenStreetMap's hosting is kindly supported by %{ucl}, %{ic} and %{bytemark}. Other supporters of the project are listed in the %{partners}." + intro_3_ucl: "the UCL VR Centre" + intro_3_ic: "Imperial College London" + intro_3_bytemark: "Bytemark Hosting" intro_3_partners: "wiki" intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners" osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." @@ -949,7 +958,7 @@ en: wiki_title: Wiki site for the project documentation: Documentation documentation_title: Documentation for the project - copyright: "Copyright & License" + copyright: "Copyright & License" community_blogs: "Community Blogs" community_blogs_title: "Blogs from members of the OpenStreetMap community" foundation: Foundation @@ -1372,11 +1381,11 @@ en: heading: "The user %{user} does not exist" body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong." trace_form: - upload_gpx: "Upload GPX File" - description: "Description" - tags: "Tags" + upload_gpx: "Upload GPX File:" + description: "Description:" + tags: "Tags:" tags_help: "comma delimited" - visibility: "Visibility" + visibility: "Visibility:" visibility_help: "what does this mean?" visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" upload_button: "Upload" @@ -1410,8 +1419,8 @@ en: visibility: "Visibility:" trace_paging_nav: showing_page: "Showing page %{page}" - next: "Next »" - previous: "« Previous" + next: "Next »" + previous: "« Previous" trace: pending: "PENDING" count_points: "%{count} points" @@ -1450,7 +1459,7 @@ en: 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." oauth: oauthorize: - request_access: "The application %{app_name} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." + request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." allow_to: "Allow the client application to:" allow_read_prefs: "read your user preferences." allow_write_prefs: "modify your user preferences." @@ -1519,15 +1528,15 @@ en: login: title: "Login" heading: "Login" - please login: "Please login or %{create_user_link}." - create_account: "create an account" email or username: "Email Address or Username:" password: "Password:" + openid: "%{logo} OpenID:" remember: "Remember me:" lost password link: "Lost your password?" login_button: "Login" register now: Register now - already have: Already have an OpenStreetMap account? Please login. + with username: "Already have an OpenStreetMap account? Please login with your username and password:" + with openid: "Alternatively please use your OpenID to login:" new to osm: New to OpenStreetMap? to make changes: To make changes to the OpenStreetMap data, you must have an account. create account minute: Create an account. It only takes a minute. @@ -1536,6 +1545,28 @@ en: webmaster: webmaster auth failure: "Sorry, could not log in with those details." notice: "Find out more about OpenStreetMap's upcoming license change (translations) (discussion)" + openid missing provider: "Sorry, could not contact your OpenID provider" + openid invalid: "Sorry, your OpenID seems to be malformed" + openid_logo_alt: "Log in with an OpenID" + openid_providers: + openid: + title: Login with OpenID + alt: Login with an OpenID URL + google: + title: Login with Google + alt: Login with a Google OpenID + yahoo: + title: Login with Yahoo + alt: Login with a Yahoo OpenID + myopenid: + title: Login with myOpenID + alt: Login with a myOpenID OpenID + wordpress: + title: Login with Wordpress + alt: Login with a Wordpress OpenID + aol: + title: Login with AOL + alt: Login with an AOL OpenID logout: title: "Logout" heading: "Logout from OpenStreetMap" @@ -1568,8 +1599,21 @@ en: not displayed publicly: 'Not displayed publicly (see privacy policy)' display name: "Display Name:" display name description: "Your publicly displayed username. You can change this later in the preferences." + openid: "%{logo} OpenID:" password: "Password:" confirm password: "Confirm Password:" + use openid: "Alternatively, use %{logo} OpenID to login" + openid no password: "With OpenID a password is not required, but some extra tools or server may still need one." + openid association: | +

Your OpenID is not associated with a OpenStreetMap account yet.

+ continue: Continue flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.

If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests." terms accepted: "Thanks for accepting the new contributor terms!" @@ -1613,6 +1657,10 @@ en: add as friend: add as 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}:" email address: "Email address:" created from: "Created from:" @@ -1647,6 +1695,7 @@ en: unhide_user: "unhide this user" delete_user: "delete this user" confirm: "Confirm" + friends_changesets: "Browse all changesets by friends" popup: your location: "Your location" nearby mapper: "Nearby mapper" @@ -1657,6 +1706,10 @@ en: current email address: "Current Email Address:" new email address: "New Email Address:" email never displayed publicly: "(never displayed publicly)" + openid: + openid: "OpenID:" + link: "http://wiki.openstreetmap.org/wiki/OpenID" + link text: "what is this?" public editing: heading: "Public editing:" enabled: "Enabled. Not anonymous and can edit data." @@ -1862,7 +1915,8 @@ en: mapnik: Mapnik osmarender: Osmarender cycle_map: Cycle Map - noname: NoName + transport_map: Transport Map + mapquest: MapQuest Open overlays: maplint: Maplint site: