X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5450bade1aeb301158a2f5a1de215c7940019b83..82fd7a10aca90135eb54b74d142c7139d8638d04:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index 6ff69733d..0a8d068fe 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -12,11 +12,19 @@ en: diary_entry: create: "Publish" update: "Update" + issue_comment: + create: Add Comment message: create: Send + client_application: + create: Register + update: Edit redaction: create: Create redaction update: Save redaction + trace: + create: Upload + update: Save Changes user_block: create: Create block update: Update block @@ -95,6 +103,45 @@ en: description: "Description" languages: "Languages" pass_crypt: "Password" + datetime: + distance_in_words_ago: + about_x_hours: + one: about 1 hour ago + other: about %{count} hours ago + about_x_months: + one: about 1 month ago + other: about %{count} months ago + about_x_years: + one: about 1 year ago + other: about %{count} years ago + almost_x_years: + one: almost 1 year ago + other: almost %{count} years ago + half_a_minute: half a minute ago + less_than_x_seconds: + one: less than 1 second ago + other: less than %{count} seconds ago + less_than_x_minutes: + one: less than a minute ago + other: less than %{count} minutes ago + over_x_years: + one: over 1 year ago + other: over %{count} years ago + x_seconds: + one: 1 second ago + other: "%{count} seconds ago" + x_minutes: + one: 1 minute ago + other: "%{count} minutes ago" + x_days: + one: 1 day ago + other: "%{count} days ago" + x_months: + one: 1 month ago + other: "%{count} months ago" + x_years: + one: 1 year ago + other: "%{count} years ago" printable_name: with_id: "%{id}" with_version: "%{id}, v%{version}" @@ -116,14 +163,14 @@ en: api: notes: comment: - opened_at_html: "Created %{when} ago" - opened_at_by_html: "Created %{when} ago by %{user}" - commented_at_html: "Updated %{when} ago" - commented_at_by_html: "Updated %{when} ago by %{user}" - closed_at_html: "Resolved %{when} ago" - closed_at_by_html: "Resolved %{when} ago by %{user}" - reopened_at_html: "Reactivated %{when} ago" - reopened_at_by_html: "Reactivated %{when} ago by %{user}" + opened_at_html: "Created %{when}" + opened_at_by_html: "Created %{when} by %{user}" + commented_at_html: "Updated %{when}" + commented_at_by_html: "Updated %{when} by %{user}" + closed_at_html: "Resolved %{when}" + closed_at_by_html: "Resolved %{when} by %{user}" + reopened_at_html: "Reactivated %{when}" + reopened_at_by_html: "Reactivated %{when} by %{user}" rss: title: "OpenStreetMap Notes" description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]" @@ -138,12 +185,12 @@ en: browse: created: "Created" closed: "Closed" - created_html: "Created %{time} ago" - closed_html: "Closed %{time} ago" - created_by_html: "Created %{time} ago by %{user}" - deleted_by_html: "Deleted %{time} ago by %{user}" - edited_by_html: "Edited %{time} ago by %{user}" - closed_by_html: "Closed %{time} ago by %{user}" + created_html: "Created %{time}" + closed_html: "Closed %{time}" + created_by_html: "Created %{time} by %{user}" + deleted_by_html: "Deleted %{time} by %{user}" + edited_by_html: "Edited %{time} by %{user}" + closed_by_html: "Closed %{time} by %{user}" version: "Version" in_changeset: "Changeset" anonymous: "anonymous" @@ -163,8 +210,8 @@ en: relation: "Relations (%{count})" relation_paginated: "Relations (%{x}-%{y} of %{count})" comment: "Comments (%{count})" - hidden_commented_by: "Hidden comment from %{user} %{when} ago" - commented_by: "Comment from %{user} %{when} ago" + hidden_commented_by: "Hidden comment from %{user} %{when}" + commented_by: "Comment from %{user} %{when}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: @@ -174,29 +221,29 @@ en: discussion: Discussion still_open: "Changeset still open - discussion will open once the changeset is closed." node: - title: "Node: %{name}" - history_title: "Node History: %{name}" + title_html: "Node: %{name}" + history_title_html: "Node History: %{name}" way: - title: "Way: %{name}" - history_title: "Way History: %{name}" + title_html: "Way: %{name}" + history_title_html: "Way History: %{name}" nodes: "Nodes" - also_part_of: + also_part_of_html: one: "part of way %{related_ways}" other: "part of ways %{related_ways}" relation: - title: "Relation: %{name}" - history_title: "Relation History: %{name}" + title_html: "Relation: %{name}" + history_title_html: "Relation History: %{name}" members: "Members" relation_member: - entry: "%{type} %{name}" - entry_role: "%{type} %{name} as %{role}" + entry_html: "%{type} %{name}" + entry_role_html: "%{type} %{name} as %{role}" type: node: "Node" way: "Way" relation: "Relation" containing_relation: - entry: "Relation %{relation_name}" - entry_role: "Relation %{relation_name} (as %{relation_role})" + entry_html: "Relation %{relation_name}" + entry_role_html: "Relation %{relation_name} (as %{relation_role})" not_found: sorry: "Sorry, %{type} #%{id} could not be found." type: @@ -231,7 +278,9 @@ en: tag: "The wiki description page for the %{key}=%{value} tag" wikidata_link: "The %{page} item on Wikidata" wikipedia_link: "The %{page} article on Wikipedia" + wikimedia_commons_link: "The %{page} item on Wikimedia Commons" telephone_link: "Call %{phone_number}" + colour_preview: "Colour %{colour_value} preview" note: title: "Note: %{id}" new_note: "New Note" @@ -239,15 +288,15 @@ en: open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" - open_by: "Created by %{user} %{when} ago" - open_by_anonymous: "Created by anonymous %{when} ago" - commented_by: "Comment from %{user} %{when} ago" - commented_by_anonymous: "Comment from anonymous %{when} ago" - closed_by: "Resolved by %{user} %{when} ago" - closed_by_anonymous: "Resolved by anonymous %{when} ago" - reopened_by: "Reactivated by %{user} %{when} ago" - reopened_by_anonymous: "Reactivated by anonymous %{when} ago" - hidden_by: "Hidden by %{user} %{when} ago" + opened_by: "Created by %{user} %{when}" + opened_by_anonymous: "Created by anonymous %{when}" + commented_by: "Comment from %{user} %{when}" + commented_by_anonymous: "Comment from anonymous %{when}" + closed_by: "Resolved by %{user} %{when}" + closed_by_anonymous: "Resolved by anonymous %{when}" + reopened_by: "Reactivated by %{user} %{when}" + reopened_by_anonymous: "Reactivated by anonymous %{when}" + hidden_by: "Hidden by %{user} %{when}" report: Report this note query: title: "Query Features" @@ -286,7 +335,7 @@ en: changeset_comments: comment: comment: "New comment on changeset #%{changeset_id} by %{author}" - commented_at_by_html: "Updated %{when} ago by %{user}" + commented_at_by_html: "Updated %{when} by %{user}" comments: comment: "New comment on changeset #%{changeset_id} by %{author}" index: @@ -324,14 +373,14 @@ en: title: "%{user}'s diary | %{title}" user_title: "%{user}'s diary" leave_a_comment: "Leave a comment" - login_to_leave_a_comment: "%{login_link} to leave a comment" + login_to_leave_a_comment_html: "%{login_link} to leave a comment" login: "Login" no_such_entry: title: "No such diary entry" heading: "No entry with the id: %{id}" body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." diary_entry: - posted_by: "Posted by %{link_user} on %{created} in %{language_link}" + posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}" comment_link: Comment on this entry reply_link: Reply to this entry comment_count: @@ -344,7 +393,7 @@ en: confirm: Confirm report: Report this entry diary_comment: - comment_from: "Comment from %{link_user} on %{comment_created_at}" + comment_from_html: "Comment from %{link_user} on %{comment_created_at}" hide_link: Hide this comment unhide_link: Unhide this comment confirm: Confirm @@ -368,18 +417,17 @@ en: post: Post when: When comment: Comment - ago: "%{ago} ago" newer_comments: "Newer Comments" older_comments: "Older Comments" geocoder: search: title: - latlon: 'Results from Internal' - ca_postcode: 'Results from Geocoder.CA' - osm_nominatim: 'Results from OpenStreetMap Nominatim' - geonames: 'Results from GeoNames' - osm_nominatim_reverse: 'Results from OpenStreetMap Nominatim' - geonames_reverse: 'Results from GeoNames' + latlon_html: 'Results from Internal' + ca_postcode_html: 'Results from Geocoder.CA' + osm_nominatim_html: 'Results from OpenStreetMap Nominatim' + geonames_html: 'Results from GeoNames' + osm_nominatim_reverse_html: 'Results from OpenStreetMap Nominatim' + geonames_reverse_html: 'Results from GeoNames' search_osm_nominatim: prefix_format: "%{name}" prefix: @@ -981,8 +1029,8 @@ en: status: Status reports: Reports last_updated: Last Updated - last_updated_time_html: "%{time} ago" - last_updated_time_user_html: "%{time} ago by %{user}" + last_updated_time_html: "%{time}" + last_updated_time_user_html: "%{time} by %{user}" link_to_reports: View Reports reported_user: Reported User reports_count: @@ -1204,8 +1252,8 @@ en: commented: subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets" subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in" - your_changeset: "%{commenter} has left a comment on one of your changesets created at %{time}" - commented_changeset: "%{commenter} has left a comment on a map changeset you are watching created by %{changeset_author} at %{time}" + your_changeset: "%{commenter} left a comment at %{time} on one of your changesets" + commented_changeset: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}" partial_changeset_with_comment: "with comment '%{changeset_comment}'" partial_changeset_without_comment: "without comment" details: "More details about the changeset can be found at %{url}." @@ -1225,7 +1273,7 @@ en: from: "From" subject: "Subject" date: "Date" - no_messages_yet: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" + no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" people_mapping_nearby: "people mapping nearby" message_summary: unread_button: "Mark as unread" @@ -1234,7 +1282,7 @@ en: destroy_button: "Delete" new: title: "Send message" - send_message_to: "Send a new message to %{name}" + send_message_to_html: "Send a new message to %{name}" subject: "Subject" body: "Body" back_to_inbox: "Back to inbox" @@ -1247,7 +1295,7 @@ en: body: "Sorry there is no message with that id." outbox: title: "Outbox" - my_inbox: "My %{inbox_link}" + my_inbox_html: "My %{inbox_link}" inbox: "inbox" outbox: "outbox" messages: @@ -1256,7 +1304,7 @@ en: to: "To" subject: "Subject" date: "Date" - no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" + no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" people_mapping_nearby: "people mapping nearby" reply: wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply." @@ -1282,7 +1330,7 @@ en: about: next: Next copyright_html: ©OpenStreetMap
contributors - used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices" + used_by_html: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices" lede_text: | OpenStreetMap is built by a community of mappers that contribute and maintain data about roads, trails, cafés, railway stations, and much more, all over the world. @@ -1325,11 +1373,11 @@ en: copyright: foreign: title: About this translation - text: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence + html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence 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 page or you can stop reading about copyright and %{mapping_link}. + html: 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: @@ -1456,7 +1504,7 @@ en: added to the OpenStreetMap database or this site, please refer to our takedown procedure or file directly at our - on-line filing page. + on-line filing page. trademarks_title_html: Trademarks trademarks_1_html: | OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our Trademark Policy. @@ -1473,12 +1521,12 @@ en: remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled" edit: 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}." + not_public_description_html: "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})" + anon_edits_html: "(%{link})" anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits" anon_edits_link_text: "Find out why this is the case." - flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.' + flash_player_required_html: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.' potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)" potlatch2_not_configured: "Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information" potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)" @@ -1493,7 +1541,7 @@ en: map_image: "Map Image (shows standard layer)" embeddable_html: "Embeddable HTML" licence: "Licence" - export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' + export_details_html: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' too_large: advice: "If the above export fails, please consider using one of the sources listed below:" body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads." @@ -1551,7 +1599,7 @@ en: and collaboratively discussing and documenting mapping topics. welcome: url: /welcome - title: Welcome to OSM + title: Welcome to OpenStreetMap description: Start with this quick guide covering the OpenStreetMap basics. beginners_guide: url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide @@ -1559,8 +1607,8 @@ en: description: Community maintained guide for beginners. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org - description: Ask a question or look up answers on OSM's question-and-answer site. + title: Help Forum + description: Ask a question or look up answers on OpenStreetMap's question-and-answer site. mailing_lists: url: https://lists.openstreetmap.org/ title: Mailing Lists @@ -1583,8 +1631,8 @@ en: description: With an organization making plans for OpenStreetMap? Find what you need to know in the Welcome Mat. wiki: url: https://wiki.openstreetmap.org/ - title: wiki.openstreetmap.org - description: Browse the wiki for in-depth OSM documentation. + title: OpenStreetMap Wiki + description: Browse the wiki for in-depth OpenStreetMap documentation. sidebar: search_results: Search Results close: Close @@ -1753,7 +1801,6 @@ en: visibility: "Visibility:" visibility_help: "what does this mean?" visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" - upload_button: "Upload" help: "Help" help_url: "https://wiki.openstreetmap.org/wiki/Upload" create: @@ -1777,7 +1824,6 @@ en: description: "Description:" tags: "Tags:" tags_help: "comma delimited" - save_button: "Save Changes" visibility: "Visibility:" visibility_help: "what does this mean?" visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" @@ -1811,8 +1857,9 @@ en: newer: "Newer Traces" trace: pending: "PENDING" - count_points: "%{count} points" - ago: "%{time_in_words_ago} ago" + count_points: + one: "1 point" + other: "%{count} points" more: "more" trace_details: "View Trace Details" view_map: "View Map" @@ -1835,7 +1882,7 @@ en: upload_trace: "Upload a trace" see_all_traces: "See all traces" see_my_traces: "See my traces" - delete: + destroy: scheduled_for_deletion: "Trace scheduled for deletion" make_public: made_public: "Trace made public" @@ -1864,7 +1911,7 @@ en: oauth: authorize: title: "Authorize access to your account" - request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." + request_access_html: "The application %{app_name} is requesting access to your account, %{user}. 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." @@ -1876,7 +1923,7 @@ en: grant_access: "Grant Access" authorize_success: title: "Authorization request allowed" - allowed: "You have granted application %{app_name} access to your account." + allowed_html: "You have granted application %{app_name} access to your account." verification: "The verification code is %{code}." authorize_failure: title: "Authorization request failed" @@ -1889,10 +1936,8 @@ en: 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:" @@ -1920,7 +1965,8 @@ en: 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." + no_apps_html: "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." + oauth: OAuth registered_apps: "You have the following client applications registered:" register_new: "Register your application" form: @@ -1951,7 +1997,7 @@ en: heading: "Login" email or username: "Email Address or Username:" password: "Password:" - openid: "%{logo} OpenID:" + openid_html: "%{logo} OpenID:" remember: "Remember me" lost password link: "Lost your password?" login_button: "Login" @@ -2017,7 +2063,7 @@ en: new: title: "Sign Up" 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_html: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.' about: header: Free and editable html: | @@ -2027,7 +2073,7 @@ en: license_agreement: 'When you confirm your account you will need to agree to the contributor terms.' email address: "Email Address:" confirm email address: "Confirm Email Address:" - not displayed publicly: 'Your address is not displayed publicly, see our privacy policy for more information' + not_displayed_publicly_html: 'Your address is not displayed publicly, see our privacy policy for more information' display name: "Display Name:" display name description: "Your publicly displayed username. You can change this later in the preferences." external auth: "Third Party Authentication:" @@ -2046,12 +2092,12 @@ en: read and accept with tou: "Please read the contributor agreement and the terms of use, check both checkboxes when done and then press the continue button." contributor_terms_explain: "This agreement governs the terms for your existing and future contributions." read_ct: "I have read and agree to the above contributor terms" - tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and aggree to the text." + tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and agree to the text." read_tou: "I have read and agree to the Terms of Use" consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain" consider_pd_why: "what's this?" consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain - guidance: 'Information to help understand these terms: a human readable summary and some informal translations' + guidance_html: 'Information to help understand these terms: a human readable summary and some informal translations' continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" @@ -2087,19 +2133,17 @@ en: remove as friend: Unfriend add as friend: Add Friend mapper since: "Mapper since:" - ago: "(%{time_in_words_ago} ago)" ct status: "Contributor terms:" ct undecided: Undecided ct declined: Declined - ct accepted: Accepted %{ago} ago - latest edit: "Latest edit %{ago}:" + latest edit: "Latest edit (%{ago}):" email address: "Email address:" created from: "Created from:" status: "Status:" spam score: "Spam Score:" description: Description user location: User location - if set location: "Set your home location on the %{settings_link} page to see nearby users." + if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users." settings_link_text: settings my friends: My friends no friends: You have not added any friends yet. @@ -2155,7 +2199,7 @@ en: 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)." + html: "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)." contributor terms: heading: "Contributor Terms:" agreed: "You have agreed to the new Contributor Terms." @@ -2232,8 +2276,8 @@ en: showing: one: Page %{page} (%{first_item} of %{items}) other: Page %{page} (%{first_item}-%{last_item} of %{items}) - summary: "%{name} created from %{ip_address} on %{date}" - summary_no_ip: "%{name} created on %{date}" + summary_html: "%{name} created from %{ip_address} on %{date}" + summary_no_ip_html: "%{name} created on %{date}" confirm: Confirm Selected Users hide: Hide Selected Users empty: No matching users found @@ -2241,7 +2285,7 @@ en: title: Account Suspended heading: Account Suspended webmaster: webmaster - body: | + body_html: |

Sorry, your account has been automatically suspended due to suspicious activity. @@ -2292,7 +2336,7 @@ en: back: "Back to index" new: title: "Creating block on %{name}" - heading: "Creating block on %{name}" + heading_html: "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." tried_contacting: "I have contacted the user and asked them to stop." @@ -2301,7 +2345,7 @@ en: back: "View all blocks" edit: title: "Editing block on %{name}" - heading: "Editing block on %{name}" + heading_html: "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." show: "View this block" @@ -2323,9 +2367,9 @@ en: empty: "No blocks have been made yet." revoke: title: "Revoking block on %{block_on}" - heading: "Revoking block on %{block_on} by %{block_by}" + heading_html: "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." + past: "This block ended %{time} and cannot be revoked now." confirm: "Are you sure you wish to revoke this block?" revoke: "Revoke!" flash: "This block has been revoked." @@ -2333,7 +2377,7 @@ en: time_future: "Ends in %{time}." until_login: "Active until the user logs in." time_future_and_until_login: "Ends in %{time} and after the user has logged in." - time_past: "Ended %{time} ago." + time_past: "Ended %{time}." block_duration: hours: one: "1 hour" @@ -2352,19 +2396,16 @@ en: other: "%{count} years" blocks_on: title: "Blocks on %{name}" - heading: "List of blocks on %{name}" + heading_html: "List of blocks on %{name}" empty: "%{name} has not been blocked yet." blocks_by: title: "Blocks by %{name}" - heading: "List of blocks by %{name}" + heading_html: "List of blocks by %{name}" empty: "%{name} has not made any blocks 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" + heading_html: "%{block_on} blocked by %{block_by}" created: "Created" - ago: "%{time} ago" status: "Status" show: "Show" edit: "Edit" @@ -2398,7 +2439,6 @@ en: description: "Description" created_at: "Created at" last_changed: "Last changed" - ago_html: "%{when} ago" javascripts: close: Close share: @@ -2433,6 +2473,8 @@ en: out: Zoom Out locate: title: Show My Location + metersUnit: meters + feetUnit: feet popup: You are within {distance} {unit} of this point base: standard: Standard