X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2fba34eb8570d9a099e46cb7693fd495130cabf0..73b2a01aced9035d663e6b21d30b6968985092f1:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 4dc7888d2..cef8431cc 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: @@ -168,16 +167,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 +205,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 +217,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" @@ -235,16 +230,16 @@ en: manually_select: "Manually select a different area" hide_areas: "Hide areas" show_areas: "Show areas" - loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than [[max_features]] features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." + loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." load_data: "Load Data" - unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than %{max_bbox_size})" + unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})" loading: "Loading..." show_history: "Show History" wait: "Wait..." - history_for_feature: "History for [[feature]]" + history_for_feature: "History for %{feature}" details: "Details" private_user: "private user" - edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]" + edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}" object_list: heading: "Object list" back: "Display object list" @@ -256,13 +251,13 @@ en: details: "Details" selected: type: - node: "Node [[id]]" - way: "Way [[id]]" + node: "Node %{id}" + way: "Way %{id}" # There is no 'relation' type because it is not represented in OpenLayers history: type: - node: "Node [[id]]" - way: "Way [[id]]" + node: "Node %{id}" + way: "Way %{id}" # There is no 'relation' type because it is not represented in OpenLayers tag_details: tags: "Tags:" @@ -279,16 +274,14 @@ 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" changeset: changeset_paging_nav: showing_page: "Showing page %{page}" @@ -328,6 +321,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: @@ -412,7 +407,7 @@ en: map_image: "Map Image (shows standard layer)" embeddable_html: "Embeddable HTML" licence: "Licence" - export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.' + export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' too_large: heading: "Area Too Large" body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area." @@ -953,7 +948,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,10 +1003,6 @@ 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!' - license: - alt: CC BY-SA 2.0 - title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation @@ -1026,130 +1017,103 @@ 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: | -
- OpenStreetMap is open data, licensed under the Creative - Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). -
-- 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 + legal_babble: + title_html: Copyright and License + intro_1_html: | + OpenStreetMap is open data, licensed under the Open Data + Commons Open Database License (ODbL). + intro_2_html: | + You are free to copy, distribute, transmit and adapt our data, + as long as you credit OpenStreetMap and its + contributors. If you alter or build upon our data, you may distribute the result only under the same licence. The - full legal + full legal code explains your rights and responsibilities. -
- -- 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”. -
-- Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ - and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. If - you are using a medium where links are not possible (e.g. a - printed work), we suggest you direct your readers to - www.openstreetmap.org (perhaps by expanding - ‘OpenStreetMap’ to this full address) and to - www.creativecommons.org. -
- -- Read more about using our data at the Creative + Commons Attribution-ShareAlike 2.0 license (CC-BY-SA). + credit_title_html: How to credit OpenStreetMap + credit_1_html: | + We require that you use the credit “© OpenStreetMap + contributors”. + credit_2_html: | + You must also make it clear that the data is available under the Open + Database License, and if using our map tiles, that the cartography is + licensed as CC-BY-SA. You may do this by linking to + this copyright page. + Alternatively, and as a requirement if you are distributing OSM in a + data form, you can name and link directly to the license(s). In media + where links are not possible (e.g. printed works), we suggest you + direct your readers to openstreetmap.org (perhaps by expanding + 'OpenStreetMap' to this full address), to opendatacommons.org, and + if relevant, to creativecommons.org. + more_title_html: Finding out more + more_1_html: | + Read more about using our data, and how to credit us, at the Legal FAQ. -
-- 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_2_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 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 - credit over and above that to “OpenStreetMap - contributors”, but where data from a national mapping - 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_title_html: Our contributors + contributors_intro_html: | + Our contributors are thousands of individuals. We also include + openly-licensed data from national mapping agencies + and other sources, among them: + 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_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-12. + 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. -
+ infringement_title_html: Copyright infringement + infringement_1_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. + infringement_2_html: | + If you believe that copyrighted material has been inappropriately + added to the OpenStreetMap database or this site, please refer + to our takedown + procedure or file directly at our + on-line filing page. notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on your diary entry" @@ -1316,10 +1280,8 @@ en: permalink: Permalink shortlink: Shortlink license: - notice: "Licensed under the %{license_name} license by the %{project_name} and its contributors." - license_name: "Creative Commons Attribution-Share Alike 2.0" - license_url: "http://creativecommons.org/licenses/by-sa/2.0/" - project_name: "OpenStreetMap project" + copyright: "Copyright OpenStreetMap and contributors, under an open license" + license_url: "http://openstreetmap.org/copyright" project_url: "http://openstreetmap.org" remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled" edit: @@ -1495,8 +1457,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" @@ -1518,6 +1480,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: @@ -1624,8 +1587,6 @@ en: account not active: "Sorry, your account is not active yet.