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

diff --combined config/locales/en.yml
index c49676a26e5c00d56176498925b975732f136562,8b60b094cbbdf4a5a76ce0a0a6e0cca3de92a655..a2c12df454352b0778917b94a326b11cc98af23b
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -417,7 -417,8 +417,8 @@@ en
        telephone_link: "Call %{phone_number}"
        colour_preview: "Colour %{colour_value} preview"
        email_link: "Email %{email}"
-     query:
+   feature_queries:
+     show:
        title: "Query Features"
        introduction: "Click on the map to find nearby features."
        nearby: "Nearby features"
@@@ -477,12 -478,6 +478,12 @@@
      changeset:
        no_edits: "(no edits)"
        view_changeset_details: "View changeset details"
 +      comments:
 +        one: "%{count} comment"
 +        other: "%{count} comments"
 +      changes:
 +        one: "%{count} change"
 +        other: "%{count} changes"
      index:
        title: "Changesets"
        title_user: "Changesets by %{user}"