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

diff --combined config/locales/en.yml
index 3f997b92d39dd58a8379b34695d6836e972d61cb,82d6775678bdc4b89ec9779f1d4520ec0883557a..3e2c6217a0f27767e51716edbf41ea9204b94c97
--- 1/config/locales/en.yml
--- 2/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