From: Tom Hughes <tom@compton.nu>
Date: Fri, 6 Sep 2024 16:00:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5160'
X-Git-Tag: live~226
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6788569211e65f8445fda2caec04105cba4158e1?ds=inline;hp=-c

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

6788569211e65f8445fda2caec04105cba4158e1
diff --combined config/locales/en.yml
index e2f2de059,39f425fbd..bdb57f54d
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -668,6 -668,7 +668,6 @@@ en
    geocoder:
      search:
        title:
 -        results_from_html: 'Results from %{results_link}'
          latlon: Internal
          osm_nominatim: OpenStreetMap Nominatim
          osm_nominatim_reverse: OpenStreetMap Nominatim
@@@ -1572,16 -1573,12 +1572,12 @@@
      history: History
      export: Export
      issues: Issues
-     data: Data
-     export_data: Export Data
      gps_traces: GPS Traces
      gps_traces_tooltip: Manage GPS traces
      user_diaries: User Diaries
      edit_with: Edit with %{editor}
-     tag_line: The Free Wiki World Map
      intro_header: Welcome to OpenStreetMap!
      intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
-     intro_2_create_account: "Create a user account"
      hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."
      partners_fastly: "Fastly"
      partners_corpmembers: "OSMF corporate members"
@@@ -1595,9 -1592,6 +1591,6 @@@
      about: About
      copyright: Copyright
      communities: Communities
-     community: Community
-     community_blogs: "Community Blogs"
-     community_blogs_title: "Blogs from members of the OpenStreetMap community"
      learn_more: "Learn More"
      more: More
    user_mailer:
@@@ -1755,6 -1749,7 +1748,6 @@@
      message_summary:
        unread_button: "Mark as unread"
        read_button: "Mark as read"
 -      reply_button: "Reply"
        destroy_button: "Delete"
        unmute_button: "Move to Inbox"
      new: