From: Tom Hughes <tom@compton.nu>
Date: Sun, 8 Sep 2024 14:26:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5170'
X-Git-Tag: live~674
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c4913d4dae44e8c9aa5b50385277dc18a7493847?ds=inline;hp=-c

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

c4913d4dae44e8c9aa5b50385277dc18a7493847
diff --combined config/locales/en.yml
index 3f997b92d,82d677567..3e2c6217a
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1573,7 -1573,6 +1573,6 @@@ en
      export: Export
      issues: Issues
      gps_traces: GPS Traces
-     gps_traces_tooltip: Manage GPS traces
      user_diaries: User Diaries
      edit_with: Edit with %{editor}
      intro_header: Welcome to OpenStreetMap!
@@@ -1586,6 -1585,7 +1585,6 @@@
      osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
      osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
      nothing_to_preview: "Nothing to preview."
 -    donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
      help: Help
      about: About
      copyright: Copyright