X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/671fe0bb911bf73747752b74bd151ee531ff0279..5564bcabbfc5db4b790a340e49155b864ec9c8cd:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 5ed8267ec..c431de33e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -307,16 +307,20 @@ en: title_user: "Changesets by %{user}" 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: @@ -324,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 @@ -386,14 +392,21 @@ en: all: title: "OpenStreetMap diary entries" description: "Recent diary entries from users of OpenStreetMap" + comments: + has_commented_on: "%{display_name} has commented on the following diary entries" + post: Post + when: When + comment: Comment + ago: %{ago} ago + newer_comments: "Newer Comments" + older_comments: "Older Comments" export: start: area_to_export: "Area to Export" manually_select: "Manually select a different area" format_to_export: "Format to Export" osm_xml_data: "OpenStreetMap XML Data" - mapnik_image: "Mapnik Image" - osmarender_image: "Osmarender Image" + 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.' @@ -962,7 +975,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 @@ -983,7 +996,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 @@ -999,14 +1012,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 @@ -1037,7 +1050,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 @@ -1064,7 +1077,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 @@ -1076,7 +1089,12 @@ en: Land Information New Zealand. Crown Copyright reserved.
  • Poland: Contains data from UMP-pcPL maps. Copyright - UMP-pcPL contributors.
    • + UMP-pcPL contributors. + + More about OSM's use of UMP data +
  • South Africa: Contains data sourced from + Chief Directorate: + National Geo-Spatial Information, State copyright reserved.
  • United Kingdom: Contains Ordnance Survey data © Crown copyright and database right 2010.
    • @@ -1181,7 +1199,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" @@ -1214,7 +1238,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" @@ -1480,7 +1506,7 @@ en: url: "Request Token URL:" access_url: "Access Token URL:" authorize_url: "Authorise URL:" - support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in ssl mode." + support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode." edit: "Edit Details" requests: "Requesting the following permissions from the user:" allow_read_prefs: "read their user preferences." @@ -1528,7 +1554,7 @@ en: email or username: "Email Address or Username:" password: "Password:" openid: "%{logo} OpenID:" - remember: "Remember me:" + remember: "Remember me" lost password link: "Lost your password?" login_button: "Login" register now: Register now @@ -1537,11 +1563,12 @@ en: new to osm: New to OpenStreetMap? 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. + no account: Don't have an account? 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!" openid missing provider: "Sorry, could not contact your OpenID provider" openid invalid: "Sorry, your OpenID seems to be malformed" openid_logo_alt: "Log in with an OpenID" @@ -1643,6 +1670,7 @@ en: my edits: my edits my traces: my traces my settings: my settings + my comments: my comments oauth settings: oauth settings blocks on me: blocks on me blocks by me: blocks by me @@ -1654,6 +1682,10 @@ en: add as friend: add as friend mapper since: "Mapper since:" ago: "(%{time_in_words_ago} ago)" + ct status: "Contributor terms:" + ct undecided: Undecided + ct declined: Declined + ct accepted: Accepted %{ago} ago latest edit: "Latest edit %{ago}:" email address: "Email address:" created from: "Created from:" @@ -1680,6 +1712,7 @@ en: moderator: "Revoke moderator access" block_history: "view blocks received" moderator_history: "view blocks given" + comments: "comments" create_block: "block this user" activate_user: "activate this user" deactivate_user: "deactivate this user" @@ -1688,6 +1721,10 @@ en: unhide_user: "unhide this user" 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" @@ -1904,8 +1941,7 @@ en: javascripts: map: base: - mapnik: Mapnik - osmarender: Osmarender + standard: Standard cycle_map: Cycle Map transport_map: Transport Map mapquest: MapQuest Open