From: Tom Hughes <tom@compton.nu>
Date: Fri, 7 Mar 2025 17:53:32 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5767'
X-Git-Tag: live~35
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/284a142c51dcc7ce4566664ec4c0ae3912906137?ds=sidebyside;hp=-c

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

284a142c51dcc7ce4566664ec4c0ae3912906137
diff --combined config/locales/en.yml
index fe1fdbe52,4120c96e5..5cfb56062
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -476,6 -476,8 +476,6 @@@ en
          sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
    changesets:
      changeset:
 -      no_edits: "(no edits)"
 -      view_changeset_details: "View changeset details"
        comments:
          one: "%{count} comment"
          other: "%{count} comments"
@@@ -551,8 -553,6 +551,8 @@@
        km away: "%{count}km away"
        m away: "%{count}m away"
        latest_edit_html: "Latest edit (%{ago}):"
 +      no_edits: "(no edits)"
 +      view_changeset_details: "View changeset details"
      popup:
        your location: "Your location"
        nearby mapper: "Nearby mapper"
@@@ -1538,7 -1538,6 +1538,6 @@@
        reports_count:
          one: "%{count} Report"
          other: "%{count} Reports"
-       more_reporters: "and %{count} more"
        reported_item: Reported Item
        states:
          ignored: Ignored
@@@ -1581,6 -1580,11 +1580,11 @@@
        reportable_title:
          diary_comment: "%{entry_title}, comment #%{comment_id}"
          note: "Note #%{note_id}"
+     reporters:
+       index:
+         title: "Issue #%{issue_id} Reporters"
+       reporters:
+         more_reporters: "and %{count} more"
    issue_comments:
      create:
        comment_created: Your comment was successfully created