X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8b4d4549a49e580d5c26ac2b3225ccb0c9078e4d..e756dbae7f3715561de5688e6503b60fdfe0327d:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index c460a05a5..58965def1 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}" @@ -121,6 +121,8 @@ en: next_relation_tooltip: "Next relation" prev_changeset_tooltip: "Previous changeset" next_changeset_tooltip: "Next changeset" + prev_note_tooltip: "Previous note" + next_note_tooltip: "Next note" changeset_details: created_at: "Created at:" closed_at: "Closed at:" @@ -157,6 +159,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:" @@ -277,11 +284,20 @@ en: download_xml: "Download XML" view_history: "view history" edit: "edit" + note: + open_title: "Unresolved issue: %{note_name}" + closed_title: "Resolved issue: %{note_name}" + opened: "Opened:" + last_modified: "Last modified:" + closed: "Closed:" + at_by: "%{when} ago by %{user}" + description: "Description:" + comments: "Comments:" 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 +318,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: @@ -933,7 +952,7 @@ en: 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 %{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" + 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" @@ -950,7 +969,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 @@ -1171,6 +1190,13 @@ en: greeting: "Hi," hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account." click_the_link: "If this is you, please click the link below to reset your password." + note_plain: + subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes" + subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in" + greeting: "Hi," + your_note: "%{commenter} has left a comment on one of your map notes near %{place}." + commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}." + details: "More details about the note can be found at %{URL}." message: inbox: title: "Inbox" @@ -1373,11 +1399,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" @@ -1411,8 +1437,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" @@ -1451,7 +1477,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." @@ -1475,7 +1501,7 @@ en: url: "Request Token URL:" access_url: "Access Token URL:" authorize_url: "Authorise URL:" - support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in ssl mode." + support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode." edit: "Edit Details" requests: "Requesting the following permissions from the user:" allow_read_prefs: "read their user preferences." @@ -1537,6 +1563,7 @@ 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)" + notice_terms: "OpenStreetMap is moving to a new licence on 1st April 2012. It's just as open as our current one, but the legal bits are much better suited to our map database. We'd love to keep your contributions in OpenStreetMap, but we can only do so if you agree to let us distribute them under the new licence. Otherwise, we'll have to remove them from the database.

Please log in, then take a few seconds to review and accept the new terms. Thank you!" 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" @@ -1605,7 +1632,7 @@ en: using your username and password and then associate the account with your OpenID in your user settings. - + 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!" @@ -1637,6 +1664,7 @@ en: new diary entry: new diary entry my edits: my edits my traces: my traces + my notes: my map notes my settings: my settings oauth settings: oauth settings blocks on me: blocks on me @@ -1645,10 +1673,15 @@ en: diary: diary edits: edits traces: traces + notes: map notes remove as friend: remove as friend 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:" @@ -1683,6 +1716,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" @@ -1896,13 +1930,33 @@ en: back: "View all blocks" revoker: "Revoker:" needs_view: "The user needs to log in before this block will be cleared." + note: + description: + opened_at_by: "Created %{when} ago by %{user}" + commented_at_by: "Updated %{when} ago by %{user}" + closed_at_by: "Resolved %{when} ago by %{user}" + reopened_at_by: "Reactivated %{when} ago by %{user}" + rss: + title: "OpenStreetMap Notes" + description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]" + description_item: "An rss feed for note %{id}" + closed: "closed note (near %{place})" + new: "new note (near %{place})" + comment: "new comment (near %{place})" + mine: + title: "Notes submitted or commented on by %{user}" + heading: "%{user}'s notes" + description: "Notes submitted or commented on by %{user}" + id: "Id" + last_changed: "Last changed" javascripts: map: base: mapnik: Mapnik osmarender: Osmarender cycle_map: Cycle Map - noname: NoName + transport_map: Transport Map + mapquest: MapQuest Open overlays: maplint: Maplint site: @@ -1912,3 +1966,23 @@ en: history_tooltip: View edits for this area history_disabled_tooltip: Zoom in to view edits for this area history_zoom_alert: You must zoom in to view edits for this area + note: + closed: Closed Note + open: Open Note + details: Details + permalink: Permalink + description: Description + comment: Comment + render_warning: This error has been fixed already. However, it might take a couple of days before the map image is updated. + update: Update + nickname: Nickname + login: Login + add_comment: Add Comment + close: Close + cancel: Cancel + create: Create Note + create_title: Report a problem with the map + create_help1: Please drag the marker to the location of the problem + create_help2: and descripe it as accurate as possible + report: Report Problem + edityourself: You can also edit the map directly your self