X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2ac919d4f15300c5866daddb1dd56ddb7cc93fcc..e890528aacd74420e445793b532271996e700577:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 114c06ac0..9283fcb57 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -83,10 +83,18 @@ en: browse: changeset: title: "Changeset" - changeset: "Changeset:" + changeset: "Changeset: {{id}}" download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" + changeset_navigation: + user: + name_tooltip: "View edits by {{user}}" + prev_tooltip: "Previous edit by {{user}}" + next_tooltip: "Next edit by {{user}}" + all: + prev_tooltip: "Previous changeset" + next_tooltip: "Next changeset" changeset_details: created_at: "Created at:" closed_at: "Closed at:" @@ -95,9 +103,15 @@ en: no_bounding_box: "No bounding box has been stored for this changeset." show_area_box: "Show Area Box" box: "box" - has_nodes: "Has the following {{count}} nodes:" - has_ways: "Has the following {{count}} ways:" - has_relations: "Has the following {{count}} relations:" + has_nodes: + one: "Has the following {{count}} node:" + other: "Has the following {{count}} nodes:" + has_ways: + one: "Has the following {{count}} way:" + other: "Has the following {{count}} ways:" + has_relations: + one: "Has the following {{count}} relation:" + other: "Has the following {{count}} relations:" common_details: edited_at: "Edited at:" edited_by: "Edited by:" @@ -225,6 +239,7 @@ en: showing_page: "Showing page" of: "of" changeset: + id: "#{{id}}" still_editing: "(still editing)" anonymous: "Anonymous" no_comment: "(none)" @@ -232,34 +247,27 @@ 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" user: "User" comment: "Comment" area: "Area" - list_bbox: - history: "History" - changesets_within_the_area: "Changesets within the area:" - show_area_box: "show area box" - no_changesets: "No changesets" - all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}" - recent_changes: "Recent Changes" - no_area_specified: "No area specified" - first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab." - view_the_map: "view the map" - view_tab: "view tab" - alternatively_view: "Alternatively, view all {{recent_changes_link}}" list: - recent_changes: "Recent Changes" - recently_edited_changesets: "Recently edited changesets:" - for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area." - list_user: - edits_by_username: "Edits by {{username_link}}" - no_visible_edits_by: "No visible edits by {{name}}." - for_all_changes: "For changes by all users see {{recent_changes_link}}" - recent_changes: "Recent Changes" + title: "Changesets" + 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 @@ -525,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" @@ -548,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}}" @@ -583,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." @@ -711,7 +716,7 @@ en: upload_gpx: "Upload GPX File" description: "Description" tags: "Tags" - tags_help: "use commas" + tags_help: "comma delimited" public: "Public?" public_help: "what does this mean?" public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" @@ -783,15 +788,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" 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" + 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"