From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Mar 2025 19:09:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5751'
X-Git-Tag: live~44
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d8fb371d54ff464bbd45186b5848f6a9f9d87d5e?ds=sidebyside;hp=-c

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

d8fb371d54ff464bbd45186b5848f6a9f9d87d5e
diff --combined config/locales/en.yml
index c49676a26,8b60b094c..a2c12df45
--- a/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}"