X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d2db785a2ac74eed0392694fa659cce7337c68d1..573991e5a9997d5ea14e430ae58a40ef0eaecd34:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 354fcb04c..34104a7d1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -948,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 @@ -1003,7 +1003,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 @@ -1021,14 +1021,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 @@ -1036,17 +1035,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 @@ -1088,63 +1077,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" @@ -1513,8 +1492,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_link} Or learn more about GPS tracing on the wiki page." - upload_new: "Upload a new trace" + 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: @@ -1764,8 +1742,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" @@ -1853,10 +1831,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: