From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 Jun 2022 11:49:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3569'
X-Git-Tag: live~1655
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/8e288156d47808a9136fd46eeb03b762e0d59a36?hp=f96c87463dccb57fff359f167b875ff7ec40e3a6

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 65a71bddd..00e8068f8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -109,13 +109,12 @@ en:
       trace:
         user: "User"
         visible: "Visible"
-        name: "Name"
+        name: Filename
         size: "Size"
         latitude: "Latitude"
         longitude: "Longitude"
         public: "Public"
         description: "Description"
-        name: Filename
         gpx_file: Upload GPX File
         visibility: Visibility
         tagstring: Tags
@@ -1389,7 +1388,6 @@ en:
       last_updated_time_html: "<abbr title='%{title}'>%{time}</abbr>"
       last_updated_time_user_html: "<abbr title='%{title}'>%{time}</abbr> by %{user}"
       link_to_reports: View Reports
-      reported_user: Reported User
       reports_count:
         one: "1 Report"
         other: "%{count} Reports"
@@ -2356,7 +2354,6 @@ en:
       in: "in"
     index:
       public_traces: "Public GPS Traces"
-      my_traces: "My GPS Traces"
       public_traces_from: "Public GPS Traces from %{user}"
       description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"