X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b1f523703724138f5680991ce34eadfc34d6aeb3..f778b61c0358ad2d0593be4040406a418ae46579:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index e9685ab49..bf194bc6a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -308,18 +308,19 @@ en: title_bbox: "Changesets within %{bbox}" title_user_bbox: "Changesets by %{user} within %{bbox}" title_friend: "Changesets by your friends" - + title_nearby: "Changesets by nearby users" heading: "Changesets" heading_user: "Changesets" heading_bbox: "Changesets" heading_user_bbox: "Changesets" heading_friend: "Changesets" - + heading_nearby: "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" + description_nearby: "Changesets by nearby users" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: @@ -327,6 +328,8 @@ en: title: New Diary Entry list: title: "Users' diaries" + title_friends: "Friends' diaries" + title_nearby: "Nearby Users' diaries" user_title: "%{user}'s diary" in_language_title: "Diary Entries in %{language}" new: New Diary Entry @@ -965,7 +968,7 @@ en: 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 + 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 @@ -986,7 +989,7 @@ en:

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

You are free to copy, distribute, transmit and adapt our maps @@ -1002,14 +1005,14 @@ en:

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, + contributors, CC BY-SA”. If you are using map data only, we request “Map data © OpenStreetMap contributors, - CC-BY-SA”. + 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 @@ -1040,7 +1043,7 @@ en:

Our contributors

- Our CC-BY-SA licence requires you to “give the Original + 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 @@ -1067,7 +1070,7 @@ en: on Australian Bureau of Statistics data.

  • Austria: Contains data from Stadt Wien under - CC-BY.
    • + CC BY.
  • Canada: Contains data from GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural @@ -1184,7 +1187,13 @@ en: title: "Inbox" my_inbox: "My inbox" outbox: "outbox" - you_have: "You have %{new_count} new messages and %{old_count} old messages" + messages: "You have %{new_messages} and %{old_messages}" + new_messages: + one: "%{count} new message" + other: "%{count} new messages" + old_messages: + one: "%{count} old message" + other: "%{count} old messages" from: "From" subject: "Subject" date: "Date" @@ -1217,7 +1226,9 @@ en: my_inbox: "My %{inbox_link}" inbox: "inbox" outbox: "outbox" - you_have_sent_messages: "You have %{count} sent messages" + messages: + one: "You have %{count} sent message" + other: "You have %{count} sent messages" to: "To" subject: "Subject" date: "Date" @@ -1541,8 +1552,7 @@ en: to make changes: To make changes to the OpenStreetMap data, you must have an account. create account minute: Create an account. It only takes a minute. account not active: "Sorry, your account is not active yet.
    Please use the link in the account confirmation email to activate your account, or request a new confirmation email." - account suspended: Sorry, your account has been suspended due to suspicious activity.
    Please contact the %{webmaster} if you wish to discuss this. - webmaster: webmaster + account is suspended: Sorry, your account has been suspended due to suspicious activity.
    Please contact the webmaster if you wish to discuss this. 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!" @@ -1697,6 +1707,9 @@ en: delete_user: "delete this user" confirm: "Confirm" friends_changesets: "Browse all changesets by friends" + friends_diaries: "Browse all diary entries by friends" + nearby_changesets: "Browse all changesets by nearby users" + nearby_diaries: "Browse all diary entries by nearby users" popup: your location: "Your location" nearby mapper: "Nearby mapper"