Merge remote-tracking branch 'upstream/pull/2400'

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e8a36f945f7866ebe73fcc726183822a813122c1..35da13709689473cc3151f7837bee623eb5cc13e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -279,6 +279,7 @@ en:
       wikidata_link: "The %{page} item on Wikidata"
       wikipedia_link: "The %{page} article on Wikipedia"
       telephone_link: "Call %{phone_number}"
+      colour_preview: "Colour %{colour_value} preview"
     note:
       title: "Note: %{id}"
       new_note: "New Note"
@@ -1250,8 +1251,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 +1503,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>.
@@ -1855,7 +1856,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"