X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2a2818d055d3c9970d0f022ab38d9f051f3175a9..52395b3cdf4d3cfae95730158edeeccf3d062a8e:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6b2db6ba1..6828e56c3 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}}"
@@ -297,6 +308,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 +427,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 +944,6 @@ 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!'
license:
alt: CC by-sa 2.0
title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
@@ -945,7 +958,7 @@ en:
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 pag 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: |
@@ -1039,6 +1052,9 @@ en:
Statistics Canada).
New Zealand: Contains data sourced from
Land Information New Zealand. Crown Copyright reserved.
+ Poland: Contains data from UMP-pcPL maps. Copyright
+ UMP-pcPL contributors.
United Kingdom: Contains Ordnance
Survey data © Crown copyright and database right
2010.
@@ -1056,7 +1072,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}}"
@@ -1346,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."
@@ -1489,7 +1506,8 @@ en:
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.
+ 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."
logout:
title: "Logout"
@@ -1530,7 +1548,7 @@ en:
terms:
heading: "Contributor terms"
press accept button: "Please read the agreement below and press the agree button to create your account."
- consider_pd: "I consider my contributions to be in the Public Domain"
+ 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
agree: Agree
@@ -1789,6 +1807,20 @@ en:
back: "View all blocks"
revoker: "Revoker:"
needs_view: "The user needs to log in before this block will be cleared."
+ bugs:
+ rss:
+ description_area: "A list of bugs, reported, commented on or closed in your area [({{min_lat}}|{{min_lon}}) -- ({{max_lat}}|{{max_lon}})]"
+ description_item: "An rss feed for bug {{id}}"
+ closed: "closed bug (near {{place}})"
+ new: "new bug (near {{place}})"
+ comment: "new comment (near {{place}})"
+ user:
+ title_user: "Bugs submitted or commented on by {{user}}"
+ heading_user: "{{user}}'s bugs"
+ description_user: "Bugs submitted or commented on by {{user}}"
+ id: "Id"
+ last_changed: "Last changed"
+
javascripts:
map:
base: