X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8027dc85b13af383ce03044d46ef6d7a471859ec..6206ab7fe75362155c8b9565a1bd512a9f7ce443:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index ce40b3d8d..8bc0992bb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -94,7 +94,6 @@ en: changeset: title: "Changeset" changeset: "Changeset: %{id}" - download: "Download %{changeset_xml_link} or %{osmchange_xml_link}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: @@ -121,6 +120,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:" @@ -168,16 +169,14 @@ en: node_history: node_history: "Node History" node_history_title: "Node History: %{node_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" node: node: "Node" node_title: "Node: %{node_name}" - download: "%{download_xml_link}, %{view_history_link} or %{edit_link}" download_xml: "Download XML" - view_history: "view history" - edit: "edit" + view_history: "View history" + edit: "Edit node" not_found: sorry: "Sorry, the %{type} with the id %{id}, could not be found." type: @@ -208,9 +207,8 @@ en: relation_history: relation_history: "Relation History" relation_history_title: "Relation History: %{relation_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} as %{role}" @@ -221,9 +219,8 @@ en: relation: relation: "Relation" relation_title: "Relation: %{relation_name}" - download: "%{download_xml_link} or %{view_history_link}" download_xml: "Download XML" - view_history: "view history" + view_history: "View history" start: view_data: "View data for current map view" manually_select: "Manually select a different area" @@ -279,16 +276,23 @@ en: way_history: way_history: "Way History" way_history_title: "Way History: %{way_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" way: way: "Way" way_title: "Way: %{way_name}" - download: "%{download_xml_link}, %{view_history_link} or %{edit_link}" download_xml: "Download XML" - view_history: "view history" - edit: "edit" + view_history: "View history" + edit: "Edit way" + 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}" @@ -328,6 +332,8 @@ en: description_user_bbox: "Changesets by %{user} within %{bbox}" description_friend: "Changesets by your friends" description_nearby: "Changesets by nearby users" + empty_user_html: "It looks you haven't made any edits yet. To get started, check out the Beginners Guide." + empty_anon_html: "No edits made yet" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: @@ -953,7 +959,7 @@ en: welcome_user_link_tooltip: Your user page home: home home_tooltip: Go to home location - inbox: "inbox (%{count})" + inbox_html: "inbox %{count}" inbox_tooltip: zero: Your inbox contains no unread messages one: Your inbox contains 1 unread message @@ -1008,7 +1014,7 @@ en: community_blogs_title: "Blogs from members of the OpenStreetMap community" foundation: Foundation foundation_title: The OpenStreetMap Foundation - sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!' + sotm2012: 'Come to the 2012 OpenStreetMap Conference, The State of the Map, September 6-8th in Tokyo!' license: alt: CC BY-SA 2.0 title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License @@ -1026,14 +1032,13 @@ en: text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}. native_link: THIS_LANGUAGE_NAME_HERE version mapping_link: start mapping - legal_babble: | -

Copyright and License

-

- OpenStreetMap is open data, licensed under the Creative - Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). -

-

+ legal_babble: + title_html: Copyright and License + intro_1_html: | + OpenStreetMap is open data, licensed under the Creative + Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). + intro_2_html: | You are free to copy, distribute, transmit and adapt our maps and data, as long as you credit OpenStreetMap and its contributors. If you alter or build upon our maps or data, you @@ -1041,17 +1046,14 @@ en: full legal code explains your rights and responsibilities. -

- -

How to credit OpenStreetMap

-

+ credit_title_html: How to credit OpenStreetMap + credit_1_html: | If you are using OpenStreetMap map images, we request that your credit reads at least “© OpenStreetMap contributors, CC BY-SA”. If you are using map data only, we request “Map data © OpenStreetMap contributors, CC BY-SA”. -

-

+ credit_2_html: | Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ and CC BY-SA to - -

Finding out more

-

+ more_title_html: Finding out more + more_1_html: | Read more about using our data at the Legal FAQ. -

-

+ more_2_html: | OSM contributors are reminded never to add data from any copyrighted sources (e.g. Google Maps or printed maps) without explicit permission from the copyright holders. -

-

+ more_3_html: | Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. - See our API Usage Policy, Tile Usage Policy and Nominatim Usage Policy. -

- -

Our contributors

-

+ contributors_title_html: Our contributors + contributors_intro_html: | Our CC BY-SA licence requires you to “give the Original Author credit reasonable to the medium or means You are utilising”. Individual OSM mappers do not request a @@ -1093,57 +1088,53 @@ en: agency or other major source has been included in OpenStreetMap, it may be reasonable to credit them by directly reproducing their credit or by linking to it on this page. -

- - - - - -

+ contributors_au_html: | + Australia: Contains suburb data based + on Australian Bureau of Statistics data. + contributors_at_html: | + Austria: Contains data from + Stadt Wien (under + CC BY), + Land Vorarlberg and + Land Tirol (under CC-BY AT with amendments). + contributors_ca_html: | + Canada: Contains data from + GeoBase®, GeoGratis (© Department of Natural + Resources Canada), CanVec (© Department of Natural + Resources Canada), and StatCan (Geography Division, + Statistics Canada). + contributors_fr_html: | + France: Contains data sourced from + Direction Générale des Impôts. + contributors_nl_html: | + Netherlands: Contains © AND data, 2007 + (www.and.com) + contributors_nz_html: | + New Zealand: Contains data sourced from + Land Information New Zealand. Crown Copyright reserved. + contributors_pl_html: | + Poland: Contains data from UMP-pcPL maps. Copyright + UMP-pcPL contributors. + + More about OSM's use of UMP data + contributors_za_html: | + South Africa: Contains data sourced from + Chief Directorate: + National Geo-Spatial Information, State copyright reserved. + contributors_gb_html: | + United Kingdom: Contains Ordnance + Survey data © Crown copyright and database right + 2010. + contributors_footer_1_html: | + For further details of these, and other sources that have been used + to help improve OpenStreetMap, please see the Contributors + page on the OpenStreetMap Wiki. + contributors_footer_2_html: | Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability. -

notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on your diary entry" @@ -1233,6 +1224,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" @@ -1489,8 +1487,8 @@ en: visibility: "Visibility:" trace_paging_nav: showing_page: "Showing page %{page}" - next: "Next »" - previous: "« Previous" + older: "Older Traces" + newer: "Newer Traces" trace: pending: "PENDING" count_points: "%{count} points" @@ -1512,6 +1510,7 @@ en: your_traces: "Your GPS traces" public_traces_from: "Public GPS traces from %{user}" tagged_with: " tagged with %{tags}" + empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." delete: scheduled_for_deletion: "Trace scheduled for deletion" make_public: @@ -1720,6 +1719,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 my comments: my comments oauth settings: oauth settings @@ -1729,6 +1729,7 @@ 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:" @@ -1761,8 +1762,8 @@ en: revoke: administrator: "Revoke administrator access" moderator: "Revoke moderator access" - block_history: "view blocks received" - moderator_history: "view blocks given" + block_history: "blocks received" + moderator_history: "blocks given" comments: "comments" create_block: "block this user" activate_user: "activate this user" @@ -1850,10 +1851,14 @@ en: go_public: flash success: "All your edits are now public, and you are now allowed to edit." make_friend: + heading: "Add %{user} as a friend?" + button: "Add as friend" success: "%{name} is now your friend." failed: "Sorry, failed to add %{name} as a friend." already_a_friend: "You are already friends with %{name}." remove_friend: + heading: "Remove %{user} as a friend?" + button: "Remove as friend" success: "%{name} was removed from your friends." not_a_friend: "%{name} is not one of your friends." filter: @@ -1962,6 +1967,9 @@ en: status: "Status" revoker_name: "Revoked by" not_revoked: "(not revoked)" + showing_page: "Showing page %{page}" + next: "Next »" + previous: "« Previous" helper: time_future: "Ends in %{time}." until_login: "Active until the user logs in." @@ -1988,6 +1996,25 @@ 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: @@ -2004,6 +2031,26 @@ 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 redaction: edit: description: "Description"