X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f699368335694f663755c7f714a1ac358bc679cb..6a3cadb52d010b333a4acea8942bc4c13394e236:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 8053e710e..832610d60 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,7 +3,7 @@ en: dir: ltr time: formats: - friendly: "%e %B %Y at %H:%M" + friendly: "%e %B %Y at %H:%M" activerecord: # Translates all the model names, which is used in error handling on the web site models: @@ -127,7 +127,7 @@ en: has_relations: one: "Has the following {{count}} relation:" other: "Has the following {{count}} relations:" - common_details: + common_details: edited_at: "Edited at:" edited_by: "Edited by:" version: "Version:" @@ -263,7 +263,7 @@ en: view_history: "view history" edit: "edit" changeset: - changeset_paging_nav: + changeset_paging_nav: showing_page: "Showing page {{page}}" next: "Next »" previous: "« Previous" @@ -297,6 +297,8 @@ en: description_user: "Changesets by {{user}}" description_bbox: "Changesets within {{bbox}}" description_user_bbox: "Changesets by {{user}} within {{bbox}}" + timeout: + sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: new: title: New Diary Entry @@ -414,6 +416,7 @@ en: suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})" suffix_suburb: "{{suffix}}, {{parentname}}" search_osm_nominatim: + prefix_format: "{{name}}" prefix: amenity: airport: "Airport" @@ -930,7 +933,7 @@ en: shop: Shop shop_tooltip: Shop with branded OpenStreetMap merchandise shop_url: http://wiki.openstreetmap.org/wiki/Merchandise - sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!' + sotm2010: 'Come to the 2010 OpenStreetMap Conference, The State of the Map, July 9-11 in Girona!' license: alt: CC by-sa 2.0 title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License @@ -941,30 +944,20 @@ en: license_page: foreign: title: About this translation - text: | - In the event of a conflict between this translated page and - {{english_original_link}}, the English page shall take - precedence + text: In the event of a conflict between this translated page and {{english_original_link}}, the English page shall take precedence english_link: the English original native: title: About this page - 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}}. - + 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 @@ -974,9 +967,8 @@ en: href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal code explains your rights and responsibilities.
- +If you are using OpenStreetMap map images, we request that your credit reads at least “© OpenStreetMap @@ -984,7 +976,6 @@ en: we request “Map data © OpenStreetMap contributors, CC-BY-SA”.
-Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ @@ -996,32 +987,28 @@ en: ‘OpenStreetMap’ to this full address) and to www.creativecommons.org.
- +Read more about using our data 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.
-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 @@ -1032,41 +1019,37 @@ en: OpenStreetMap, it may be reasonable to credit them by directly reproducing their credit or by linking to it on this page.
- + - +
Inclusion of data in OpenStreetMap does not imply that the original
data provider endorses OpenStreetMap, provides any warranty, or
@@ -1169,7 +1152,7 @@ en:
subject: "Subject"
date: "Date"
no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
- people_mapping_nearby: "people mapping nearby"
+ people_mapping_nearby: "people mapping nearby"
message_summary:
unread_button: "Mark as unread"
read_button: "Mark as read"
@@ -1192,7 +1175,7 @@ en:
title: "No such message"
heading: "No such message"
body: "Sorry there is no message with that id."
- outbox:
+ outbox:
title: "Outbox"
my_inbox: "My {{inbox_link}}"
inbox: "inbox"
@@ -1492,7 +1475,7 @@ en:
allow_write_api: "modify the map."
allow_read_gpx: "read their private GPS traces."
allow_write_gpx: "upload GPS traces."
- not_found:
+ not_found:
sorry: "Sorry, that {{type}} could not be found."
create:
flash: "Registered the information successfully"
@@ -1508,22 +1491,42 @@ en:
create_account: "create an account"
email or username: "Email Address or Username:"
password: "Password:"
- openid: "OpenID:"
- openid description: "Use your OpenID to login"
+ openid: "{{logo}} OpenID:"
username_heading: "Login with username and password:"
- openid_heading: "Login with an OpenID:"
- or: "Or"
+ openid_heading: "Login with OpenID:"
remember: "Remember me:"
lost password link: "Lost your password?"
login_button: "Login"
account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account."
+ account suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the {{webmaster}} if you wish to discuss this.
+ webmaster: webmaster
auth failure: "Sorry, could not log in with those details."
openid missing provider: "Sorry, could not contact your OpenID provider"
- openid invalid: "Sorry, your OpenID seems misformed"
+ openid invalid: "Sorry, your OpenID seems to be malformed"
+ openid_logo_alt: "Log in with an OpenID"
+ openid_providers:
+ openid:
+ title: Login with an OpenID URL
+ alt: Login with an OpenID URL
+ yahoo:
+ title: Login with a Yahoo! OpenID
+ alt: Login with a Yahoo! OpenID
+ google:
+ title: Login with a Google OpenID
+ alt: Login with a Google OpenID
+ myopenid:
+ title: Login with a myOpenID OpenID
+ alt: Login with a myOpenID OpenID
+ wordpress:
+ title: Login with a Wordpress.com OpenID
+ alt: Login with a Wordpress.com OpenID
+ myspace:
+ title: Login with a MySpace OpenID
+ alt: Login with a MySpace OpenID
logout:
title: "Logout"
heading: "Logout from OpenStreetMap"
- logout_button: "Logout"
+ logout_button: "Logout"
lost_password:
title: "Lost password"
heading: "Forgotten Password?"
@@ -1546,18 +1549,43 @@ en:
no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
fill_form: "Fill in the form and we will send you a quick email to activate your account."
- license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).'
+ license_agreement: 'When you confirm your account you will need to agree to the contributor terms.'
email address: "Email Address:"
confirm email address: "Confirm Email Address:"
not displayed publicly: 'Not displayed publicly (see privacy policy)'
display name: "Display Name:"
display name description: "Your publicly displayed username. You can change this later in the preferences."
+ openid: "{{logo}} OpenID:"
password: "Password:"
confirm password: "Confirm Password:"
- openID: "OpenID:"
- openID description: '(Optional) If you have an OpenID you can associate it with this account to login'
- signup: Signup
+ use openid: "Alternatively, use {{logo}} OpenID to login"
+ openid no password: "With OpenID a password is not required, but some extra tools or server may still need one."
+ openid association: |
+
Your OpenID is not associated with a OpenStreetMap account yet.
++ Sorry, your account has been automatically suspended due to + suspicious activity. +
++ This decision will be reviewed by an administrator shortly, or + you may contact the {{webmaster}} if you wish to discuss this. +
user_role: filter: not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."