X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/64fb530581ffd21e2522e70e8a2d4c46d666f760..7dbf68aa52f061b6575d42e2a0bec577da6ec827:/config/locales/en.yml?ds=inline
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 95fd929d0..874f44f1a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -87,6 +87,9 @@ en:
download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
changesetxml: "Changeset XML"
osmchangexml: "osmChange XML"
+ feed:
+ title: "Changeset {{id}}"
+ title_comment: "Changeset {{id}} - {{comment}}"
changeset_navigation:
user:
name_tooltip: "View edits by {{user}}"
@@ -117,6 +120,7 @@ en:
edited_by: "Edited by:"
version: "Version:"
in_changeset: "In changeset:"
+ changeset_comment: "Comment:"
containing_relation:
entry: "Relation {{relation_name}}"
entry_role: "Relation {{relation_name}} (as {{relation_role}})"
@@ -129,7 +133,7 @@ en:
way: "View way on larger map"
relation: "View relation on larger map"
node_details:
- coordinates: "Coordinates: "
+ coordinates: "Coordinates:"
part_of: "Part of:"
node_history:
node_history: "Node History"
@@ -150,6 +154,7 @@ en:
node: node
way: way
relation: relation
+ changeset: changeset
paging_nav:
showing_page: "Showing page"
of: "of"
@@ -239,6 +244,7 @@ en:
showing_page: "Showing page"
of: "of"
changeset:
+ id: "#{{id}}"
still_editing: "(still editing)"
anonymous: "Anonymous"
no_comment: "(none)"
@@ -246,7 +252,6 @@ en:
show_area_box: "show area box"
big_area: "(big)"
view_changeset_details: "View changeset details"
- more: "more"
changesets:
id: "ID"
saved_at: "Saved at"
@@ -255,10 +260,19 @@ en:
area: "Area"
list:
title: "Changesets"
- description: "Recent edits"
- description_user: "Recent edits by {{user}}"
- description_bbox: "Recent edits within {{bbox}}"
- description_user_bbox: "Recent edits by {{user}} within {{bbox}}"
+ title_user: "Changesets by {{user}}"
+ title_bbox: "Changesets within {{bbox}}"
+ title_user_bbox: "Changesets by {{user}} within {{bbox}}"
+
+ heading: "Changesets"
+ heading_user: "Changesets"
+ heading_bbox: "Changesets"
+ heading_user_bbox: "Changesets"
+
+ description: "Recent changes"
+ description_user: "Changesets by {{user}}"
+ description_bbox: "Changesets within {{bbox}}"
+ description_user_bbox: "Changesets by {{user}} within {{bbox}}"
diary_entry:
new:
title: New Diary Entry
@@ -269,17 +283,17 @@ en:
new: New Diary Entry
new_title: Compose a new entry in your user diary
no_entries: No diary entries
- recent_entries: "Recent diary entries: "
+ recent_entries: "Recent diary entries:"
older_entries: Older Entries
newer_entries: Newer Entries
edit:
title: "Edit diary entry"
- subject: "Subject: "
- body: "Body: "
- language: "Language: "
- location: "Location: "
- latitude: "Latitude: "
- longitude: "Longitude: "
+ subject: "Subject:"
+ body: "Body:"
+ language: "Language:"
+ location: "Location:"
+ latitude: "Latitude:"
+ longitude: "Longitude:"
use_map_link: "use map"
save_button: "Save"
marker_text: Diary entry location
@@ -308,6 +322,16 @@ en:
edit_link: Edit this entry
diary_comment:
comment_from: "Comment from {{link_user}} at {{comment_created_at}}"
+ feed:
+ user:
+ title: "OpenStreetMap diary entries for {{user}}"
+ description: "Recent OpenStreetMap diary entries from {{user}}"
+ language:
+ title: "OpenStreetMap diary entries in {{language_name}}"
+ description: "Recent diary entries from users of OpenStreetMap in {{language_name}}"
+ all:
+ title: "OpenStreetMap diary entries"
+ description: "Recent diary entries from users of OpenStreetMap"
export:
start:
area_to_export: "Area to Export"
@@ -349,7 +373,7 @@ en:
osm_namefinder: 'Results from OpenStreetMap Namefinder'
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}}"
@@ -362,7 +386,7 @@ en:
towns: Towns
places: Places
description_osm_namefinder:
- prefix: "{{distance}} {{direction}} of {{type}} "
+ prefix: "{{distance}} {{direction}} of {{type}}"
results:
no_results: "No results found"
distance:
@@ -498,7 +522,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 or the opengeodata blog 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.'
@@ -524,14 +548,6 @@ en:
greeting: "Hi,"
hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password."
- reset_password:
- subject: "[OpenStreetMap] Password reset"
- reset_password_plain:
- greeting: "Hi,"
- reset: "Your password has been reset to {{new_password}}"
- reset_password_html:
- greeting: "Hi,"
- reset: "Your password has been reset to {{new_password}}"
message:
inbox:
title: "Inbox"
@@ -547,6 +563,7 @@ en:
unread_button: "Mark as unread"
read_button: "Mark as read"
reply_button: "Reply"
+ delete_button: "Delete"
new:
title: "Send message"
send_message_to: "Send a new message to {{name}}"
@@ -582,14 +599,18 @@ en:
reading_your_sent_messages: "Reading your sent messages"
to: "To"
back_to_outbox: "Back to outbox"
+ sent_message_summary:
+ delete_button: "Delete"
mark:
as_read: "Message marked as read"
as_unread: "Message marked as unread"
+ delete:
+ 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 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.'
permalink: Permalink
shortlink: Shortlink
license:
@@ -671,7 +692,9 @@ en:
centre: "Sports centre"
reserve: "Nature reserve"
military: "Military area"
- school: "School; university"
+ school:
+ - School
+ - university
building: "Significant building"
station: "Railway station"
summit:
@@ -684,6 +707,11 @@ en:
destination: "Destination access"
construction: "Roads under construction"
trace:
+ visibility:
+ private: "Private (only shared as anonymous, unordered points)"
+ public: "Public (shown in trace list and as anonymous, unordered points)"
+ trackable: "Trackable (only shared as anonymous, ordered points with timestamps)"
+ identifiable: "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)"
create:
upload_trace: "Upload GPS Trace"
trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
@@ -702,6 +730,9 @@ en:
tags: "Tags:"
tags_help: "comma delimited"
save_button: "Save Changes"
+ visibility: "Visibility:"
+ visibility_help: "what does this mean?"
+ visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
no_such_user:
title: "No such user"
heading: "The user {{user}} does not exist"
@@ -711,9 +742,9 @@ en:
description: "Description"
tags: "Tags"
tags_help: "comma delimited"
- public: "Public?"
- public_help: "what does this mean?"
- public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+ visibility: "Visibility"
+ visibility_help: "what does this mean?"
+ visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
upload_button: "Upload"
help: "Help"
help_url: "http://wiki.openstreetmap.org/wiki/Upload"
@@ -739,10 +770,10 @@ en:
description: "Description:"
tags: "Tags:"
none: "None"
- make_public: "Make this track public permanently"
edit_track: "Edit this track"
delete_track: "Delete this track"
trace_not_found: "Trace not found!"
+ visibility: "Visibility:"
trace_paging_nav:
showing: "Showing page"
of: "of"
@@ -769,8 +800,11 @@ en:
scheduled_for_deletion: "Track scheduled for deletion"
make_public:
made_public: "Track made public"
+ application:
+ setup_user_auth:
+ blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
oauth:
- client_application:
+ 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."
allow_to: "Allow the client application to:"
allow_read_prefs: "read your user preferences."
@@ -779,47 +813,103 @@ en:
allow_write_api: "modify the map."
allow_read_gpx: "read your private GPS traces."
allow_write_gpx: "upload GPS traces."
- token:
- none: "You have not authorised any clients to act on your behalf. You do not have to do anything now to authorise them, as they will ask for authorisation when they need it. After that time you can return here to revoke those permissions if you do not want the clients to have your authorisation any more."
- application: "Application"
- issued: "Issued"
+ revoke:
+ flash: "You've revoked the token for {{application}}"
+ oauth_clients:
+ new:
+ title: "Register a new application"
+ submit: "Register"
+ edit:
+ title: "Edit your application"
+ submit: "Edit"
+ show:
+ title: "OAuth details for {{app_name}}"
+ key: "Consumer Key:"
+ secret: "Consumer Secret:"
+ 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."
+ edit: "Edit Details"
+ requests: "Requesting the following permissions from the user:"
+ allow_read_prefs: "read their user preferences."
+ allow_write_prefs: "modify their user preferences."
+ allow_write_diary: "create diary entries, comments and make friends."
+ allow_write_api: "modify the map."
+ allow_read_gpx: "read their private GPS traces."
+ allow_write_gpx: "upload GPS traces."
+ index:
+ title: "My OAuth Details"
+ my_tokens: "My Authorised Applications"
+ list_tokens: "The following tokens have been issued to applications in your name:"
+ application: "Application Name"
+ issued_at: "Issued At"
revoke: "Revoke!"
+ my_apps: "My Client Applications"
+ no_apps: "Do you have an application you would like to register for use with us using the {{oauth}} standard? You must register your web application before it can make OAuth requests to this service."
+ registered_apps: "You have the following client applications registered:"
+ register_new: "Register your application"
+ form:
+ name: "Name"
+ required: "Required"
+ url: "Main Application URL"
+ callback_url: "Callback URL"
+ support_url: "Support URL"
+ requests: "Request the following permissions from the user:"
+ allow_read_prefs: "read their user preferences."
+ allow_write_prefs: "modify their user preferences."
+ allow_write_diary: "create diary entries, comments and make friends."
+ allow_write_api: "modify the map."
+ allow_read_gpx: "read their private GPS traces."
+ allow_write_gpx: "upload GPS traces."
+ not_found:
+ sorry: "Sorry, that {{type}} could not be found."
+ create:
+ flash: "Registered the information successfully"
+ update:
+ flash: "Updated the client information successfully"
+ destroy:
+ flash: "Destroyed the client application registration"
user:
login:
title: "Login"
heading: "Login"
please login: "Please login or {{create_user_link}}."
create_account: "create an account"
- email or username: "Email Address or Username: "
- password: "Password: "
+ email or username: "Email Address or Username:"
+ password: "Password:"
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 click on the link in the account confirmation email to activate your account."
auth failure: "Sorry, couldn't log in with those details."
lost_password:
- title: "lost password"
+ title: "Lost password"
heading: "Forgotten Password?"
email address: "Email Address:"
- new password button: "Send me a new password"
+ new password button: "Reset 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."
reset_password:
- title: "reset password"
- flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
+ title: "Reset password"
+ heading: "Reset Password for {{user}}"
+ password: "Password:"
+ 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?"
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. '
+ 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."
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: "
+ email address: "Email Address:"
+ confirm email address: "Confirm Email Address:"
not displayed publicly: 'Not displayed publicly (see privacy policy)'
- display name: "Display Name: "
- password: "Password: "
- confirm password: "Confirm Password: "
+ display name: "Display Name:"
+ 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."
no_such_user:
@@ -838,7 +928,7 @@ en:
traces: traces
remove as friend: remove as friend
add as friend: add as friend
- mapper since: "Mapper since: "
+ mapper since: "Mapper since:"
ago: "({{time_in_words_ago}} ago)"
user image heading: User image
delete image: Delete Image
@@ -853,41 +943,48 @@ en:
no friends: You have not added any friends yet.
km away: "{{count}}km away"
m away: "{{count}}m away"
- nearby users: "Nearby users: "
+ nearby users: "Nearby users:"
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"
friend_map:
your location: Your location
- nearby mapper: "Nearby mapper: "
+ nearby mapper: "Nearby mapper: [[nearby_user]]"
account:
title: "Edit account"
my settings: My settings
email never displayed publicly: "(never displayed publicly)"
public editing:
- heading: "Public editing: "
+ 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?"
disabled: "Disabled and cannot edit data, all previous edits are anonymous."
disabled link text: "why can't I edit?"
- profile description: "Profile Description: "
- preferred languages: "Preferred Languages: "
- home location: "Home Location: "
+ profile description: "Profile Description:"
+ preferred languages: "Preferred Languages:"
+ home location: "Home Location:"
no home location: "You have not entered your home location."
- latitude: "Latitude: "
- longitude: "Longitude: "
+ latitude: "Latitude:"
+ longitude: "Longitude:"
update home location on click: "Update home location when I click on the map?"
save changes button: Save Changes
make edits public button: Make all my edits public
return to profile: Return to profile
flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
flash update success: "User information updated successfully."
- my apps: "My client applications"
- developers: "Application Developers"
- dev_intro: "Have you written an application which you would like to register to make {{link}} requests to the OpenStreetMap server?"
- register_app: "Register your application"
- apps_registered: "You have the following client applications registered:"
- register_another_app: "Register another application"
confirm:
heading: Confirm a user account
press confirm button: "Press the confirm button below to activate your account."
@@ -911,3 +1008,109 @@ en:
remove_friend:
success: "{{name}} was removed from your friends."
not_a_friend: "{{name}} is not one of your friends."
+ user_role:
+ filter:
+ not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
+ not_a_role: "The string `{{role}}' isn't a valid role."
+ already_has_role: "The user already has role {{role}}."
+ doesnt_have_role: "The user does not have role {{role}}."
+ grant:
+ title: Confirm role granting
+ heading: Confirm role granting
+ are_you_sure: "Are you sure you want to grant the role `{{role}}' to the user `{{name}}'?"
+ confirm: "Confirm"
+ fail: "Couldn't grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid."
+ revoke:
+ title: Confirm role revoking
+ heading: Confirm role revoking
+ are_you_sure: "Are you sure you want to revoke the role `{{role}}' from the user `{{name}}'?"
+ confirm: "Confirm"
+ fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."
+ user_block:
+ model:
+ non_moderator_update: "Must be a moderator to create or update a block."
+ non_moderator_revoke: "Must be a moderator to revoke a block."
+ not_found:
+ sorry: "Sorry, the user block with ID {{id}} could not be found."
+ back: "Back to index"
+ new:
+ title: "Creating block on {{name}}"
+ heading: "Creating block on {{name}}"
+ reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
+ period: "How long, starting now, the user will be blocked from the API for."
+ submit: "Create block"
+ tried_contacting: "I have contacted the user and asked them to stop."
+ tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications."
+ needs_view: "Does the user need to log in before this block will be cleared?"
+ edit:
+ title: "Editing block on {{name}}"
+ heading: "Editing block on {{name}}"
+ reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
+ period: "How long, starting now, the user will be blocked from the API for."
+ submit: "Update block"
+ show: "Show"
+ back: "Back"
+ needs_view: "Does the user need to log in before this block will be cleared?"
+ filter:
+ not_a_moderator: "You need to be a moderator to perform that action."
+ block_expired: "The block has already expired and cannot be edited."
+ block_period: "The blocking period must be one of the values selectable in the drop-down list."
+ create:
+ try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond."
+ try_waiting: "Please try giving the user a reasonable time to respond before blocking them."
+ flash: "Created a block on user {{name}}."
+ update:
+ only_creator_can_edit: "Only the moderator who created this block can edit it."
+ success: "Block updated."
+ index:
+ title: "User blocks"
+ heading: "List of user blocks"
+ revoke:
+ title: "Revoking block on {{block_on}}"
+ heading: "Revoking block on {{block_on}} by {{block_by}}"
+ time_future: "This block will end in {{time}}."
+ past: "This block ended {{time}} ago and cannot be revoked now."
+ confirm: "Are you sure you wish to revoke this block?"
+ revoke: "Revoke!"
+ flash: "This block has been revoked."
+ period:
+ one: "1 hour"
+ other: "{{count}} hours"
+ partial:
+ show: "Show"
+ edit: "Edit"
+ revoke: "Revoke!"
+ confirm: "Are you sure?"
+ display_name: "Blocked User"
+ creator_name: "Creator"
+ reason: "Reason for block"
+ status: "Status"
+ revoker_name: "Revoked by"
+ not_revoked: "(not revoked)"
+ helper:
+ time_future: "Ends in {{time}}."
+ until_login: "Active until the user logs in."
+ time_past: "Ended {{time}} ago."
+ blocks_on:
+ title: "Blocks on {{name}}"
+ heading: "List of blocks on {{name}}"
+ empty: "{{name}} has not made any blocks yet."
+ blocks_by:
+ title: "Blocks by {{name}}"
+ heading: "List of blocks by {{name}}"
+ empty: "{{name}} has not been blocked yet."
+ show:
+ title: "{{block_on}} blocked by {{block_by}}"
+ heading: "{{block_on}} blocked by {{block_by}}"
+ time_future: "Ends in {{time}}"
+ time_past: "Ended {{time}} ago"
+ status: "Status"
+ show: "Show"
+ edit: "Edit"
+ revoke: "Revoke!"
+ confirm: "Are you sure?"
+ reason: "Reason for block:"
+ back: "View all blocks"
+ revoker: "Revoker:"
+ needs_view: "The user needs to log in before this block will be cleared."
+