From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Oct 2019 13:20:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2398'
X-Git-Tag: live~2417
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/752f190a24a6ee30e37d70af337f3428ff048524?hp=0def53c094d5df4da69d984b9b093336eeefb9c3

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3fd5ec91e..35da13709 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1251,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}."