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

diff --combined config/locales/en.yml
index f007022207329df7d77be2ce59876440bfbb5fe4,a435eb8a4dc722ae58aa18f3789fe3e9619c03e8..dfad0230eec312bbd179c186065f05ea7843f719
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -246,18 -246,6 +246,6 @@@ en
        entry:
          comment: Comment
          full: Full note
-   feeds:
-     changeset_comments:
-       comment:
-         comment: "New comment on changeset #%{changeset_id} by %{author}"
-         commented_at_by_html: "Updated %{when} by %{user}"
-       comments:
-         comment: "New comment on changeset #%{changeset_id} by %{author}"
-       index:
-         title_all: OpenStreetMap changeset discussion
-         title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
-       timeout:
-         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
    account:
      deletions:
        show:
@@@ -426,6 -414,18 +414,18 @@@
    old_relations:
      not_found:
        sorry: "Sorry, relation #%{id} version %{version} could not be found."
+   changeset_comments:
+     feeds:
+       comment:
+         comment: "New comment on changeset #%{changeset_id} by %{author}"
+         commented_at_by_html: "Updated %{when} by %{user}"
+       comments:
+         comment: "New comment on changeset #%{changeset_id} by %{author}"
+       show:
+         title_all: OpenStreetMap changeset discussion
+         title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+       timeout:
+         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
    changesets:
      changeset_paging_nav:
        showing_page: "Page %{page}"
@@@ -1468,14 -1468,14 +1468,14 @@@
        not_updated: Not Updated
        search: Search
        search_guidance: "Search Issues:"
 -      user_not_found: User does not exist
 -      issues_not_found: No such issues found
        link_to_reports: View Reports
        states:
          ignored: Ignored
          open: Open
          resolved: Resolved
      page:
 +      user_not_found: User does not exist
 +      issues_not_found: No such issues found
        reported_user: Reported User
        status: Status
        reports: Reports