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

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

210db7e728608cbaac6baef832a3417ef69f8027
diff --combined config/locales/en.yml
index 3e2c6217a,da906b9a0..958a6f9b9
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1573,6 -1573,7 +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!
@@@ -1585,6 -1586,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
@@@ -1761,7 -1763,6 +1761,6 @@@
        body: "Sorry there is no message with that id."
      outbox:
        title: "Outbox"
-       actions: "Actions"
        messages:
          one: "You have %{count} sent message"
          other: "You have %{count} sent messages"