Merge branch 'pull/5783'

diff --combined config/locales/en.yml
index e8661906233974faf59781e767ddabcc3c0e96f3,b2f9272ec929a78ab77be094bcaee61530dab967..04968211dba116bcb20809e40ae604bf8342d4a7
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1607,9 -1607,6 +1607,9 @@@ en
        reportable_title:
          diary_comment: "%{entry_title}, comment #%{comment_id}"
          note: "Note #%{note_id}"
 +      reportable_dates:
 +        created_on_html: "created on %{datetime_created}"
 +        created_on_updated_on_html: "created on %{datetime_created}, updated on %{datetime_updated}"
      reporters:
        index:
          title: "Issue #%{issue_id} Reporters"
@@@ -2951,6 -2948,9 +2951,9 @@@
            deleted: Deleted
          name_or_email: Name or Email
          ip_address: IP Address
+         edits: Edits?
+         has_edits: Has Edits
+         no_edits: No Edits
          search: Search
        page:
          found_users: