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 +970,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 +979,6 @@ en: we request “Map data © OpenStreetMap contributors, CC-BY-SA”.
-Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ @@ -996,32 +990,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 +1022,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
@@ -1079,7 +1065,7 @@ en:
header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
message_notification:
- subject: "[OpenStreetMap] {{user}} sent you a new message"
+ subject_header: "[OpenStreetMap] {{subject}}"
hi: "Hi {{to_user}},"
header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
footer1: "You can also read the message at {{readurl}}"
@@ -1118,6 +1104,7 @@ en:
the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:"
+ ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"
wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
# next four translations are in pairs : please word wrap appropriately
@@ -1134,6 +1121,7 @@ en:
more_videos: "There are {{more_videos_link}}."
more_videos_here: "more videos here"
get_reading: Get reading about OpenStreetMap on the wiki, catch up with the latest news via the OpenStreetMap blog or Twitter, or browse through OpenStreetMap founder Steve Coast's OpenGeoData blog for the potted history of the project, which has podcasts to listen to also!
+ ask_questions: You can ask any questions you may have about OpenStreetMap at our question and answer site.
wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.'
user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].'
current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.'
@@ -1169,7 +1157,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 +1180,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"
@@ -1369,7 +1357,8 @@ en:
help: "Help"
help_url: "http://wiki.openstreetmap.org/wiki/Upload"
trace_header:
- see_just_your_traces: "See just your traces, or upload a trace"
+ your_traces: "See just your traces"
+ upload_trace: "Upload a trace"
see_all_traces: "See all traces"
see_your_traces: "See all your traces"
traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
@@ -1492,7 +1481,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,17 +1497,19 @@ 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:"
+ 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 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
auth failure: "Sorry, could not log in with those details."
+ notice: "Find out more about OpenStreetMap's upcoming license change (translations) (discussion)"
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:
@@ -1542,7 +1533,7 @@ en:
logout:
title: "Logout"
heading: "Logout from OpenStreetMap"
- logout_button: "Logout"
+ logout_button: "Logout"
lost_password:
title: "Lost password"
heading: "Forgotten Password?"
@@ -1565,18 +1556,45 @@ 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
- 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."
+ 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."