From: Tom Hughes <tom@compton.nu>
Date: Wed, 14 Feb 2024 18:43:26 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4521'
X-Git-Tag: live~1053
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d22e851557581fe92d837fb99705e5541582c9fe?ds=inline;hp=-c

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

d22e851557581fe92d837fb99705e5541582c9fe
diff --combined config/locales/en.yml
index 3fe583d5f,00c27dfc7..d66482639
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -342,7 -342,6 +342,6 @@@ en
        way_paginated: "Ways (%{x}-%{y} of %{count})"
        relation: "Relations (%{count})"
        relation_paginated: "Relations (%{x}-%{y} of %{count})"
-       comment: "Comments (%{count})"
        hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
        comment_by_html: "Comment from %{user} %{time_ago}"
        changesetxml: "Changeset XML"
@@@ -524,7 -523,6 +523,7 @@@
      show:
        title: "%{user}'s Diary | %{title}"
        user_title: "%{user}'s Diary"
 +      discussion: "Discussion"
        leave_a_comment: "Leave a comment"
        login_to_leave_a_comment_html: "%{login_link} to leave a comment"
        login: "Login"