X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2038cd52c65158a9b31299c62e4beb72c61a18b7..6fb857020092c909043c4521b91a040f3bb16937:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e3d8803ed..8e091a22c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -262,6 +262,17 @@ en:
download_xml: "Download XML"
view_history: "view history"
edit: "edit"
+ bug:
+ open_title: "Unresolved issue: {{bug_name}}"
+ closed_title: "Resolved issue: {{bug_name}}"
+ created_at: "Created at:"
+ edited_at: "Edited at:"
+ closed_at: "Closed at:"
+ opened_by: "Opened by:"
+ description: "Description:"
+ comment_by: "Comment by: "
+ comment: "Comment:"
+ date: "Date:"
changeset:
changeset_paging_nav:
showing_page: "Showing page {{page}}"
@@ -933,7 +944,6 @@ en:
shop: Shop
shop_tooltip: Shop with branded OpenStreetMap merchandise
shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
- 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
@@ -1352,7 +1362,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."
@@ -1498,6 +1509,7 @@ en:
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)"
logout:
title: "Logout"
heading: "Logout from OpenStreetMap"
@@ -1534,12 +1546,14 @@ en:
confirm password: "Confirm Password:"
continue: Continue
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."
+ terms accepted: "Thanks for accepting the new contributor terms!"
terms:
+ title: "Contributor terms"
heading: "Contributor terms"
- press accept button: "Please read the agreement below and press the agree button to create your account."
+ read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
consider_pd_why: "what's this?"
- consider_pd_why_url: http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain
+ consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
agree: Agree
declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
decline: "Decline"
@@ -1622,6 +1636,14 @@ en:
public editing note:
heading: "Public editing"
text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why).