X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9064a5c6a76e6c2ba3a8f470f87adee225ce24a6..0d5be22cb517ebaaab5eb7af13150bf61e41df56:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 5ae59e38d..2cf7a3aa8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -239,6 +239,7 @@ en: showing_page: "Showing page" of: "of" changeset: + id: "#{{id}}" still_editing: "(still editing)" anonymous: "Anonymous" no_comment: "(none)" @@ -246,7 +247,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 +255,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 @@ -498,7 +507,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 +533,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 +548,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,9 +584,13 @@ 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." @@ -769,6 +775,63 @@ en: scheduled_for_deletion: "Track scheduled for deletion" make_public: made_public: "Track made public" + oauth: + client_application: + 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." + allow_write_prefs: "modify your user preferences." + allow_write_diary: "create diary entries, comments and make friends." + allow_write_api: "modify the map." + allow_read_gpx: "read your private GPS traces." + allow_write_gpx: "upload GPS traces." + 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, that {{type}} could not be found." user: login: title: "Login" @@ -782,15 +845,19 @@ en: 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" @@ -841,6 +908,7 @@ en: 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" friend_map: your location: Your location nearby mapper: "Nearby mapper: "