X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7f661ec55e3cf054a1f6ef99df090617e7d71b89..03a8467a8201060dd5841db6c31684289b3502ba:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a48093cf8..631917a37 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -230,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"
@@ -251,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:"
@@ -407,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."
@@ -1003,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
@@ -1025,43 +1021,40 @@ en:
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).
+ href="http://opendatacommons.org/licenses/odbl/">Open Data
+ Commons Open Database License (ODbL).
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
+ 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.
+ intro_3_html: |
+ The cartography in our map tiles, and our documentation, are
+ licensed under the Creative
+ Commons Attribution-ShareAlike 2.0 license (CC-BY-SA).
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”.
+ We require that you use the credit “© OpenStreetMap
+ contributors”.
credit_2_html: |
- 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.
+ 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 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,
@@ -1069,17 +1062,9 @@ en:
and Nominatim Usage Policy.
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
- 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_au_html: |
- Australia: Contains suburb data based
- on Australian Bureau of Statistics data.
+ 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
@@ -1101,12 +1086,6 @@ en:
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:
@@ -1114,7 +1093,7 @@ en:
contributors_gb_html: |
United Kingdom: Contains Ordnance
Survey data © Crown copyright and database right
- 2010.
+ 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 takedown
+ procedure or file directly at our
+ on-line filing page.
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -1291,8 +1281,8 @@ en:
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/"
+ license_name: "Open Data Commons Open Database License (ODbL)"
+ license_url: "http://opendatacommons.org/licenses/odbl/1.0/"
project_name: "OpenStreetMap project"
project_url: "http://openstreetmap.org"
remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
@@ -1742,8 +1732,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"
@@ -1831,10 +1821,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: