Merge branch 'pull/4990'

diff --combined config/locales/en.yml
index 38b810d1f6768fd64a2b00d2619e48920ba8315c,2a9af16c6a8d6ca5e78c0468feeb337e2e51b8fb..172c6618232aedb1927e280e0cc55cd504e0aa18
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -392,7 -392,6 +392,7 @@@ en
          relation: "relation"
      start_rjs:
        feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?"
 +      feature_error: "Features could not be loaded: %{message}"
        load_data: "Load Data"
        loading: "Loading..."
      tag_details:
@@@ -485,6 -484,18 +485,6 @@@
          created: "Created"
          closed: "Closed"
          belongs_to: "Author"
 -    subscribe:
 -      heading: Subscribe to the following changeset discussion?
 -      button: Subscribe to discussion
 -    unsubscribe:
 -      heading: Unsubscribe from the following changeset discussion?
 -      button: Unsubscribe from discussion
 -    heading:
 -      title: "Changeset %{id}"
 -      created_by_html: "Created by %{link_user} on %{created}."
 -    no_such_entry:
 -      heading: "No entry with the id: %{id}"
 -      body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
      show:
        title: "Changeset: %{id}"
        created: "Created: %{when}"
@@@ -516,20 -527,6 +516,20 @@@
        sorry: "Sorry, changeset #%{id} could not be found."
      timeout:
        sorry: "Sorry, the list of changesets you requested took too long to retrieve."
 +  changeset_subscriptions:
 +    show:
 +      subscribe:
 +        heading: Subscribe to the following changeset discussion?
 +        button: Subscribe to discussion
 +      unsubscribe:
 +        heading: Unsubscribe from the following changeset discussion?
 +        button: Unsubscribe from discussion
 +    heading:
 +      title: "Changeset %{id}"
 +      created_by_html: "Created by %{link_user} on %{created}."
 +    no_such_entry:
 +      heading: "No entry with the id: %{id}"
 +      body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
    dashboards:
      contact:
        km away: "%{count}km away"
@@@ -1512,9 -1509,11 +1512,11 @@@
        reports: Reports
        last_updated: Last Updated
        last_updated_time_ago_user_html: "%{time_ago} by %{user}"
+       reporter_users: Reporter Users
        reports_count:
          one: "%{count} Report"
          other: "%{count} Reports"
+       more_reporters: "and %{count} more"
        reported_item: Reported Item
        states:
          ignored: Ignored
@@@ -1783,17 -1782,14 +1785,17 @@@
        destroy_button: "Delete"
        back: "Back"
        wrong_user: "You are logged in as '%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it."
 -    mark:
 -      as_read: "Message marked as read"
 -      as_unread: "Message marked as unread"
 -    unmute:
 -      notice: "Message has been moved to Inbox"
 -      error: "The message could not be moved to the Inbox."
      destroy:
        destroyed: "Message deleted"
 +    read_marks:
 +      create:
 +        notice: "Message marked as read"
 +      destroy:
 +        notice: "Message marked as unread"
 +    mutes:
 +      destroy:
 +        notice: "Message has been moved to Inbox"
 +        error: "The message could not be moved to the Inbox."
      mailboxes:
        heading:
          my_inbox: "My Inbox"