X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/32a06b9e5b12b359f6cd6ac5f8d495f2d9fc9b73..23b8672bc9a8449f6a89d94b25ea036f4815e4bc:/config/locales/en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c2dbe0b58..d37c4a574 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -205,19 +205,19 @@ en:
type:
node: "Node"
way: "Way"
- # There's no 'relation' type because it isn't represented in OpenLayers
+ # There is no 'relation' type because it is not represented in OpenLayers
api: "Retrieve this area from the API"
details: "Details"
selected:
type:
node: "Node [[id]]"
way: "Way [[id]]"
- # There's no 'relation' type because it isn't represented in OpenLayers
+ # There is no 'relation' type because it is not represented in OpenLayers
history:
type:
node: "Node [[id]]"
way: "Way [[id]]"
- # There's no 'relation' type because it isn't represented in OpenLayers
+ # There is no 'relation' type because it is not represented in OpenLayers
tag_details:
tags: "Tags:"
way_details:
@@ -371,22 +371,27 @@ en:
uk_postcode: 'Results from NPEMap / FreeThe Postcode'
ca_postcode: 'Results from Geocoder.CA'
osm_namefinder: 'Results from OpenStreetMap Namefinder'
+ osm_twain: 'Results from OpenStreetMap Twain'
geonames: 'Results from GeoNames'
search_osm_namefinder:
- prefix: "{{type}} "
+ prefix: "{{type}}"
suffix_place: ", {{distance}} {{direction}} of {{placename}}"
suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
suffix_suburb: "{{suffix}}, {{parentname}}"
+ search_osm_twain:
+ prefix_highway: "{{type}} road"
+ prefix_other: "{{type}}"
description:
title:
osm_namefinder: '{{types}} from OpenStreetMap Namefinder'
+ osm_twain: 'Location from OpenStreetMap Twain'
geonames: 'Location from GeoNames'
types:
cities: Cities
towns: Towns
places: Places
description_osm_namefinder:
- prefix: "{{distance}} {{direction}} of {{type}} "
+ prefix: "{{distance}} {{direction}} of {{type}}"
results:
no_results: "No results found"
distance:
@@ -417,7 +422,7 @@ en:
inbox: "inbox ({{count}})"
inbox_tooltip:
zero: Your inbox contains no unread messages
- one: Your inbox contians 1 unread message
+ one: Your inbox contains 1 unread message
other: Your inbox contains {{count}} unread messages
logout: logout
logout_tooltip: "Log out"
@@ -456,7 +461,12 @@ en:
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!'
- alt_donation: Make a Donation
+ license:
+ alt: CC by-sa 2.0
+ title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
+ make_a_donation:
+ title: Support OpenStreetMap with a monetary donation
+ text: Make a Donation
notifier:
diary_comment_notification:
subject: "[OpenStreetMap] {{user}} commented on your diary entry"
@@ -485,15 +495,13 @@ en:
and_no_tags: "and no tags."
failure:
subject: "[OpenStreetMap] GPX Import failure"
- failed_to_import: "failed to import. Here's the error:"
+ failed_to_import: "failed to import. Here is the error:"
more_info_1: "More information about GPX import failures and how to avoid"
more_info_2: "them can be found at:"
import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
success:
subject: "[OpenStreetMap] GPX Import success"
- loaded_successfully: |
- loaded successfully with {{trace_points}} out of a possible
- {{possible_points}} points.
+ loaded_successfully: loaded successfully with {{trace_points}} out of a possible {{possible_points}} points.
signup_confirm:
subject: "[OpenStreetMap] Confirm your email address"
signup_confirm_plain:
@@ -506,7 +514,8 @@ en:
more_videos: "There are more videos here:"
the_wiki: "Get reading about OpenStreetMap on the wiki:"
the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
- opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+ 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:"
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
@@ -522,7 +531,7 @@ en:
video_to_openstreetmap: "introductory video to OpenStreetMap"
more_videos: "There are {{more_videos_link}}."
more_videos_here: "more videos here"
- get_reading: 'Get reading about OpenStreetMap on the wiki or the opengeodata blog which has podcasts to listen to also!'
+ 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!
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.'
@@ -572,6 +581,7 @@ en:
send_button: "Send"
back_to_inbox: "Back to inbox"
message_sent: "Message sent"
+ limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
no_such_user:
title: "No such user or message"
heading: "No such user or message"
@@ -581,7 +591,7 @@ en:
my_inbox: "My {{inbox_link}}"
inbox: "inbox"
outbox: "outbox"
- you_have_sent_messages: "You have {{sent_count}} sent messages"
+ you_have_sent_messages: "You have {{count}} sent messages"
to: "To"
subject: "Subject"
date: "Date"
@@ -608,9 +618,9 @@ en:
deleted: "Message deleted"
site:
index:
- js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
- js_2: "OpenStreetMap uses javascript for its slippy map."
- js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable javascript.'
+ js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
+ js_2: "OpenStreetMap uses JavaScript for its slippy map."
+ js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable JavaScript.'
permalink: Permalink
shortlink: Shortlink
license:
@@ -620,7 +630,7 @@ en:
project_name: "OpenStreetMap project"
project_url: "http://openstreetmap.org"
edit:
- not_public: "You haven't set your edits to be public."
+ not_public: "You have not set your edits to be public."
not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
user_page_link: user page
anon_edits: "({{link}})"
@@ -634,6 +644,7 @@ en:
search:
search: Search
where_am_i: "Where am I?"
+ where_am_i_title: Describe the current location using the search engine
submit_text: "Go"
search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..."
key:
@@ -692,7 +703,9 @@ en:
centre: "Sports centre"
reserve: "Nature reserve"
military: "Military area"
- school: "School; university"
+ school:
+ - School
+ - university
building: "Significant building"
station: "Railway station"
summit:
@@ -768,8 +781,8 @@ en:
description: "Description:"
tags: "Tags:"
none: "None"
- edit_track: "Edit this track"
- delete_track: "Delete this track"
+ edit_track: "Edit this trace"
+ delete_track: "Delete this trace"
trace_not_found: "Trace not found!"
visibility: "Visibility:"
trace_paging_nav:
@@ -795,9 +808,14 @@ en:
public_traces_from: "Public GPS traces from {{user}}"
tagged_with: " tagged with {{tags}}"
delete:
- scheduled_for_deletion: "Track scheduled for deletion"
+ scheduled_for_deletion: "Trace scheduled for deletion"
make_public:
- made_public: "Track made public"
+ made_public: "Trace made public"
+ application:
+ require_cookies:
+ cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
+ setup_user_auth:
+ blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
oauth:
oauthorize:
request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
@@ -824,7 +842,7 @@ en:
url: "Request Token URL:"
access_url: "Access Token URL:"
authorize_url: "Authorise URL:"
- support_notice: "We support hmac-sha1 (recommended) as well as plain text in ssl mode."
+ support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in ssl mode."
edit: "Edit Details"
requests: "Requesting the following permissions from the user:"
allow_read_prefs: "read their user preferences."
@@ -876,14 +894,15 @@ 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."
- auth failure: "Sorry, couldn't log in with those details."
+ auth failure: "Sorry, could not log in with those details."
lost_password:
title: "Lost password"
heading: "Forgotten Password?"
email address: "Email Address:"
new password button: "Reset password"
+ help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
- notice email cannot find: "Couldn't find that email address, sorry."
+ notice email cannot find: "Could not find that email address, sorry."
reset_password:
title: "Reset password"
heading: "Reset Password for {{user}}"
@@ -891,22 +910,23 @@ en:
confirm password: "Confirm Password:"
reset: "Reset Password"
flash changed: "Your password has been changed."
- flash token bad: "Didn't find that token, check the URL maybe?"
+ flash token bad: "Did not find that token, check the URL maybe?"
new:
title: "Create account"
heading: "Create a User Account"
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'll send you a quick email to activate your account."
+ 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).'
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."
password: "Password:"
confirm password: "Confirm Password:"
signup: Signup
- flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)
Please note that you won't 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."
+ 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:
title: "No such user"
heading: "The user {{user}} does not exist"
@@ -917,6 +937,8 @@ en:
my edits: my edits
my traces: my traces
my settings: my settings
+ blocks on me: blocks on me
+ blocks by me: blocks by me
send message: send message
diary: diary
edits: edits
@@ -925,6 +947,8 @@ en:
add as friend: add as friend
mapper since: "Mapper since:"
ago: "({{time_in_words_ago}} ago)"
+ email address: "Email address:"
+ created from: "Created from:"
user image heading: User image
delete image: Delete Image
upload an image: Upload an image
@@ -942,6 +966,24 @@ en:
no nearby users: "There are no users who admit to mapping nearby yet."
change your settings: change your settings
my_oauth_details: "View my OAuth details"
+ role:
+ administrator: "This user is an administrator"
+ moderator: "This user is a moderator"
+ grant:
+ administrator: "Grant administrator access"
+ moderator: "Grant moderator access"
+ revoke:
+ administrator: "Revoke administrator access"
+ moderator: "Revoke moderator access"
+ block_history: "view blocks received"
+ moderator_history: "view blocks given"
+ create_block: "block this user"
+ activate_user: "activate this user"
+ deactivate_user: "deactivate this user"
+ hide_user: "hide this user"
+ unhide_user: "unhide this user"
+ delete_user: "delete this user"
+ confirm: "Confirm"
friend_map:
your location: Your location
nearby mapper: "Nearby mapper: [[nearby_user]]"
@@ -953,9 +995,12 @@ en:
heading: "Public editing:"
enabled: "Enabled. Not anonymous and can edit data."
enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
- enabled link text: "what's this?"
+ enabled link text: "what is this?"
disabled: "Disabled and cannot edit data, all previous edits are anonymous."
disabled link text: "why can't I edit?"
+ 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).