X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/db39876dd6f0bccb36e4cdde0e1a0da81a05fcfe..8381836f606db4cca681416e0fac497746603d29:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 5bc88547a..b99e068b8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5,7 +5,34 @@ en: formats: friendly: "%e %B %Y at %H:%M" blog: "%e %B %Y" + helpers: + submit: + diary_comment: + create: Save + 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 activerecord: + errors: + messages: + invalid_email_address: does not appear to be a valid e-mail address + email_address_not_routable: is not routable # Translates all the model names, which is used in error handling on the web site models: acl: "Access Control List" @@ -76,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}" @@ -94,15 +160,37 @@ en: remote: name: "Remote Control" description: "Remote Control (JOSM or Merkaartor)" + api: + notes: + comment: + 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})]" + description_item: "An rss feed for note %{id}" + opened: "new note (near %{place})" + commented: "new comment (near %{place})" + closed: "closed note (near %{place})" + reopened: "reactivated note (near %{place})" + entry: + comment: Comment + full: Full note 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" @@ -122,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: @@ -190,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" @@ -198,22 +288,22 @@ 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" introduction: "Click on the map to find nearby features." nearby: "Nearby features" enclosing: "Enclosing features" - changeset: + changesets: changeset_paging_nav: showing_page: "Page %{page}" next: "Next »" @@ -228,7 +318,7 @@ en: user: "User" comment: "Comment" area: "Area" - list: + index: title: "Changesets" title_user: "Changesets by %{user}" title_friend: "Changesets by my friends" @@ -242,18 +332,29 @@ en: load_more: "Load more" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." - rss: + changeset_comments: + comment: + comment: "New comment on changeset #%{changeset_id} by %{author}" + commented_at_by_html: "Updated %{when} by %{user}" + comments: + comment: "New comment on changeset #%{changeset_id} by %{author}" + index: title_all: OpenStreetMap changeset discussion title_particular: "OpenStreetMap changeset #%{changeset_id} discussion" - comment: "New comment on changeset #%{changeset_id} by %{author}" - commented_at_html: "Updated %{when} ago" - commented_at_by_html: "Updated %{when} ago by %{user}" - full: Full discussion - diary_entry: + timeout: + sorry: "Sorry, the list of changeset comments you requested took too long to retrieve." + diary_entries: new: title: New Diary Entry - publish_button: "Publish" - list: + form: + subject: "Subject:" + body: "Body:" + language: "Language:" + location: "Location:" + latitude: "Latitude:" + longitude: "Longitude:" + use_map_link: "use map" + index: title: "Users' diaries" title_friends: "Friends' diaries" title_nearby: "Nearby Users' diaries" @@ -266,23 +367,14 @@ en: 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:" - use_map_link: "use map" - save_button: "Save" + title: Edit Diary Entry marker_text: Diary entry location - view: + show: 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: "Login" - save_button: "Save" no_such_entry: title: "No such diary entry" heading: "No entry with the id: %{id}" @@ -297,11 +389,13 @@ en: other: "%{count} comments" edit_link: Edit this entry hide_link: Hide this entry + unhide_link: Unhide this entry confirm: Confirm report: Report this entry diary_comment: comment_from: "Comment from %{link_user} on %{comment_created_at}" hide_link: Hide this comment + unhide_link: Unhide this comment confirm: Confirm report: Report this comment location: @@ -323,7 +417,6 @@ en: post: Post when: When comment: Comment - ago: "%{ago} ago" newer_comments: "Newer Comments" older_comments: "Older Comments" geocoder: @@ -860,7 +953,7 @@ en: "yes": "Shop" tourism: alpine_hut: "Alpine Hut" - apartment: "Apartment" + apartment: "Holiday Apartment" artwork: "Artwork" attraction: "Attraction" bed_and_breakfast: "Bed and Breakfast" @@ -936,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: @@ -1024,7 +1117,7 @@ en: other_label: Other create: successful_report: Your report has been registered sucessfully - provide_details: Please provide the required details + provide_details: Please provide the required details layouts: project_name: # in @@ -1055,11 +1148,11 @@ en: intro_header: Welcome to OpenStreetMap! intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license. intro_2_create_account: "Create a user account" - partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}." + hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}." partners_ucl: "UCL" - partners_ic: "Imperial College London" partners_bytemark: "Bytemark Hosting" partners_partners: "partners" + tou: "Terms of Use" osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out." donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." @@ -1159,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}." @@ -1192,8 +1285,8 @@ en: send_message_to: "Send a new message to %{name}" subject: "Subject" body: "Body" - send_button: "Send" back_to_inbox: "Back to inbox" + create: 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_message: @@ -1269,7 +1362,7 @@ en: This site and many other related services are formally operated by the <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) on behalf of the community. Use of all OSMF operated services is subject - to our <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy"> + to our <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Terms of Use</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy"> Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a> <br> Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a> @@ -1347,6 +1440,11 @@ en: <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>). + contributors_au_html: | + <strong>Australia</strong>: Contains data sourced from + <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a> + licensed by the Commonwealth of Australia under + <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>. contributors_ca_html: | <strong>Canada</strong>: Contains data from GeoBase®, GeoGratis (© Department of Natural @@ -1374,6 +1472,11 @@ en: <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a> (public information of Slovenia). + contributors_es_html: | + <strong>Spain</strong>: Contains data sourced from the + Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) and + National Cartographic System (<a href="http://www.scne.es/">SCNE</a>) + licensed for reuse under <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>. contributors_za_html: | <strong>South Africa</strong>: Contains data sourced from <a href="http://www.ngi.gov.za/">Chief Directorate: @@ -1381,7 +1484,7 @@ en: contributors_gb_html: | <strong>United Kingdom</strong>: Contains Ordnance Survey data © Crown copyright and database right - 2010-12. + 2010-19. contributors_footer_1_html: | For further details of these, and other sources that have been used to help improve OpenStreetMap, please see the <a @@ -1401,7 +1504,7 @@ en: added to the OpenStreetMap database or this site, please refer to our <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown procedure</a> or file directly at our - <a href="http://dmca.openstreetmap.org/">on-line filing page</a>. + <a href="https://dmca.openstreetmap.org/">on-line filing page</a>. trademarks_title_html: <span id="trademarks"></span>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 <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>. @@ -1496,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 @@ -1504,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 @@ -1522,10 +1625,14 @@ en: url: https://switch2osm.org/ title: switch2osm description: Help for companies and organisations switching to OpenStreetMap based maps and other services. + welcomemat: + url: https://welcome.openstreetmap.org/ + title: For Organizations + 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 @@ -1613,7 +1720,7 @@ en: edit: Edit preview: Preview markdown_help: - title_html: Parsed with <a href="https://daringfireball.net/projects/markdown/">Markdown</a> + title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a> headings: Headings heading: Heading subheading: Subheading @@ -1668,7 +1775,7 @@ en: paragraph_1_html: | OpenStreetMap has several resources for learning about the project, asking and answering questions, and collaboratively discussing and documenting mapping topics. - <a href='%{help_url}'>Get help here</a>. + <a href='%{help_url}'>Get help here</a>. With an organization making plans for OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Check out the Welcome Mat</a>. start_mapping: Start Mapping add_a_note: title: No Time To Edit? Add a Note! @@ -1694,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: @@ -1718,13 +1824,14 @@ 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" + update: + updated: Trace updated trace_optionals: tags: "Tags" - view: + show: title: "Viewing trace %{name}" heading: "Viewing trace %{name}" pending: "PENDING" @@ -1739,8 +1846,8 @@ en: description: "Description:" tags: "Tags:" none: "None" - edit_track: "Edit this trace" - delete_track: "Delete this trace" + edit_trace: "Edit this trace" + delete_trace: "Delete this trace" trace_not_found: "Trace not found!" visibility: "Visibility:" confirm_delete: "Delete this trace?" @@ -1750,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" @@ -1764,7 +1872,7 @@ en: by: "by" in: "in" map: "map" - list: + index: public_traces: "Public GPS traces" my_traces: "My GPS traces" public_traces_from: "Public GPS traces from %{user}" @@ -1774,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" @@ -1791,14 +1899,11 @@ en: other: "GPX file with %{count} points from %{user}" description_without_count: "GPX file from %{user}" application: + permission_denied: You do not have permission to access that action require_cookies: cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." require_admin: not_an_admin: You need to be an admin to perform that action. - require_moderator: - not_a_moderator: "You need to be a moderator to perform that action." - require_moderator_or_admin: - not_a_moderator_or_admin: You need to be a moderator or an admin to perform that action setup_user_auth: blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits." blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." @@ -1831,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:" @@ -1887,7 +1990,7 @@ en: flash: "Updated the client information successfully" destroy: flash: "Destroyed the client application registration" - user: + users: login: title: "Login" heading: "Login" @@ -1982,14 +2085,19 @@ en: terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>." terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: - title: "Contributor terms" - heading: "Contributor terms" - read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions." - consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain" + title: "Terms" + heading: "Terms" + heading_ct: "Contributor terms" + 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 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 <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>' - agree: Agree + continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue." @@ -2003,7 +2111,7 @@ en: heading: "The user %{user} does not exist" body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong." deleted: "deleted" - view: + show: my diary: My Diary new diary entry: new diary entry my edits: My Edits @@ -2024,12 +2132,10 @@ 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:" @@ -2163,9 +2269,7 @@ en: button: "Unfriend" success: "%{name} was removed from your friends." not_a_friend: "%{name} is not one of your friends." - filter: - not_an_administrator: "You need to be an administrator to perform that action." - list: + index: title: Users heading: Users showing: @@ -2206,7 +2310,6 @@ en: with your ID in your user settings. 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}' is not a valid role." already_has_role: "The user already has role %{role}." doesnt_have_role: "The user does not have role %{role}." @@ -2235,7 +2338,6 @@ en: 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: "User needs to log in before this block will be cleared" @@ -2245,7 +2347,6 @@ en: 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: "View this block" back: "View all blocks" needs_view: "Does the user need to log in before this block will be cleared?" @@ -2267,18 +2368,31 @@ en: 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." + 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." - period: - one: "1 hour" - other: "%{count} hours" helper: 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" + other: "%{count} hours" + days: + one: "1 day" + other: "%{count} days" + weeks: + one: "1 week" + other: "%{count} weeks" + months: + one: "1 month" + other: "%{count} months" + years: + one: "1 year" + other: "%{count} years" blocks_on: title: "Blocks on %{name}" heading: "List of blocks on %{name}" @@ -2290,10 +2404,7 @@ en: 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" created: "Created" - ago: "%{time} ago" status: "Status" show: "Show" edit: "Edit" @@ -2318,36 +2429,15 @@ en: next: "Next »" previous: "« Previous" 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}" - 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})]" - description_item: "An rss feed for note %{id}" - opened: "new note (near %{place})" - commented: "new comment (near %{place})" - closed: "closed note (near %{place})" - reopened: "reactivated note (near %{place})" - entry: - comment: Comment - full: Full note mine: title: "Notes submitted or commented on by %{user}" heading: "%{user}'s notes" - subheading: "Notes submitted or commented on by %{user}" + subheading_html: "Notes submitted or commented on by %{user}" id: "Id" creator: "Creator" description: "Description" created_at: "Created at" last_changed: "Last changed" - ago_html: "%{when} ago" javascripts: close: Close share: @@ -2397,6 +2487,7 @@ en: title: "Layers" copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>" donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>" + terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>" site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map @@ -2429,13 +2520,12 @@ en: directions: ascend: "Ascend" engines: + fossgis_osrm_bike: "Bicycle (OSRM)" + fossgis_osrm_car: "Car (OSRM)" + fossgis_osrm_foot: "Foot (OSRM)" graphhopper_bicycle: "Bicycle (GraphHopper)" graphhopper_car: "Car (GraphHopper)" graphhopper_foot: "Foot (GraphHopper)" - mapquest_bicycle: "Bicycle (MapQuest)" - mapquest_car: "Car (MapQuest)" - mapquest_foot: "Foot (MapQuest)" - osrm_car: "Car (OSRM)" descend: "Descend" directions: "Directions" distance: "Distance" @@ -2527,7 +2617,6 @@ en: edit: description: "Description" heading: "Edit redaction" - submit: "Save redaction" title: "Edit redaction" index: empty: "No redactions to show." @@ -2536,7 +2625,6 @@ en: new: description: "Description" heading: "Enter information for new redaction" - submit: "Create redaction" title: "Creating new redaction" show: description: "Description:" @@ -2554,3 +2642,8 @@ en: not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it." flash: "Redaction destroyed." error: "There was an error destroying this redaction." + validations: + leading_whitespace: "has leading whitespace" + trailing_whitespace: "has trailing whitespace" + invalid_characters: "contains invalid characters" + url_characters: "contains special URL characters (%{characters})"