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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 99dcb63470f8ef0c8b46bdb94f421951b6068d4e..083c2e42c84d3e7a41186bb1dbe0fb7dd9609333 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2485,8 +2485,6 @@ en:
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:
       updated: Trace updated
-    trace_optionals:
-      tags: "Tags"
     show:
       title: "Viewing Trace %{name}"
       heading: "Viewing Trace %{name}"
@@ -2544,8 +2542,6 @@ en:
       newer: "Newer Traces"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
-    make_public:
-      made_public: "Trace made public"
     offline_warning:
       message: "The GPX file upload system is currently unavailable"
     offline: