From: Anton Khorev <tony29@yandex.ru>
Date: Sun, 4 Aug 2024 15:46:25 +0000 (+0300)
Subject: Merge branch 'pull/5023'
X-Git-Tag: live~739
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fa9654fe90bc3352f16bb2924191af2217a83663?ds=inline;hp=-c

Merge branch 'pull/5023'
---

fa9654fe90bc3352f16bb2924191af2217a83663
diff --combined config/locales/en.yml
index 278edf364,1c119fcf3..a69416337
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1586,6 -1586,7 +1586,7 @@@ en
      tou: "Terms of Use"
      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
@@@ -1626,14 -1627,11 +1627,14 @@@
        befriend_them: "You can also add them as a friend at %{befriendurl}."
        befriend_them_html: "You can also add them as a friend at %{befriendurl}."
      gpx_description:
 +      description_with_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
        description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
 +      description_with_no_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
        description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
      gpx_failure:
        hi: "Hi %{to_user},"
        failed_to_import: "failed to import. Here is the error:"
 +      more_info: "More information about GPX import failures and how to avoid them can be found at %{url}."
        more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
        import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
        subject: "[OpenStreetMap] GPX Import failure"
@@@ -1642,8 -1640,6 +1643,8 @@@
        loaded:
          one: "loaded successfully with %{trace_points} out of a possible %{count} point."
          other: "loaded successfully with %{trace_points} out of a possible %{count} points."
 +      trace_location: "Your trace is available at %{trace_url}"
 +      all_your_traces: "All your successfully uploaded GPX traces can be found at %{url}"
        all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
        subject: "[OpenStreetMap] GPX Import success"
      signup_confirm: