X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f699368335694f663755c7f714a1ac358bc679cb..7fe2f07e47aa1083733e417de613d57738876ea9:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 8053e710e..6bc1b6ac1 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" @@ -941,30 +941,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 pag 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).

-

You are free to copy, distribute, transmit and adapt our maps and data, as long as you credit OpenStreetMap and its @@ -974,9 +964,8 @@ en: href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal code explains your rights and responsibilities.

- +

How to credit OpenStreetMap

-

If you are using OpenStreetMap map images, we request that your credit reads at least “© OpenStreetMap @@ -984,7 +973,6 @@ en: we request “Map data © OpenStreetMap contributors, CC-BY-SA”.

-

Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ @@ -996,32 +984,28 @@ en: ‘OpenStreetMap’ to this full address) and to www.creativecommons.org.

- +

Finding out more

-

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 contributors

-

Our CC-BY-SA licence requires you to “give the Original Author credit reasonable to the medium or means You are @@ -1032,41 +1016,34 @@ 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 +1146,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 +1169,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 +1469,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" @@ -1512,7 +1489,6 @@ en: openid description: "Use your OpenID to login" username_heading: "Login with username and password:" openid_heading: "Login with an OpenID:" - or: "Or" remember: "Remember me:" lost password link: "Lost your password?" login_button: "Login" @@ -1520,10 +1496,30 @@ en: 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_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?" @@ -1554,8 +1550,20 @@ en: display name description: "Your publicly displayed username. You can change this later in the preferences." password: "Password:" confirm password: "Confirm Password:" + openID associate: "Associate an OpenID with your account" openID: "OpenID:" openID description: '(Optional) If you have an OpenID you can associate it with this account to login' + openID nopassword: "With OpenID, you don't need to specify a password during signup, but some extra OpenStreetMap services or tools may still need one" + openID association: | + Your OpenID is not associated with a OpenStreetMap account yet. +

signup: Signup flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)

Please note that you will not be able to login until you've received and confirmed your email address.

If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests." no_such_user: