]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/5162'
authorTom Hughes <tom@compton.nu>
Fri, 6 Sep 2024 16:02:45 +0000 (17:02 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 6 Sep 2024 16:02:45 +0000 (17:02 +0100)
1  2 
config/locales/en.yml

diff --combined config/locales/en.yml
index bdb57f54d806e238197916242dcff4cca6f1a703,4c7e3f3f7492b5874639757de6d6d421247db861..2634672f18e66667b4ebcd4354d263768be8c4b3
@@@ -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
      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"
      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:
        help: Help
    site:
      about:
-       next: Next
        heading_html: "%{copyright}OpenStreetMap %{br} contributors"
        copyright_symbol_html: "&copy;"
        used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"