X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3167e6b4bbbf01c2b69d9e67117a734ff0544b6a..a41d500b9f65ec9f4e848effd38dc1ae117e7594:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 7408829a1..917c06a95 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -163,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})]" @@ -278,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" @@ -333,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: @@ -1250,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}." @@ -1502,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. @@ -1597,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 @@ -1605,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 @@ -1629,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 @@ -1855,7 +1857,9 @@ en: newer: "Newer Traces" trace: pending: "PENDING" - count_points: "%{count} points" + count_points: + one: "1 point" + other: "%{count} points" more: "more" trace_details: "View Trace Details" view_map: "View Map" @@ -2087,7 +2091,7 @@ 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?" @@ -2401,7 +2405,6 @@ en: title: "%{block_on} blocked by %{block_by}" heading: "%{block_on} blocked by %{block_by}" created: "Created" - ago: "%{time} ago" status: "Status" show: "Show" edit: "Edit" @@ -2435,7 +2438,6 @@ en: description: "Description" created_at: "Created at" last_changed: "Last changed" - ago_html: "%{when} ago" javascripts: close: Close share: