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

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 39f425fbdec39a498ecab3090f8246ec8804d556..083c2e42c84d3e7a41186bb1dbe0fb7dd9609333 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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
@@ -1574,7 +1573,6 @@ en:
     export: Export
     issues: Issues
     gps_traces: GPS Traces
-    gps_traces_tooltip: Manage GPS traces
     user_diaries: User Diaries
     edit_with: Edit with %{editor}
     intro_header: Welcome to OpenStreetMap!
@@ -1587,7 +1585,6 @@ en:
     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
     copyright: Copyright
@@ -1749,7 +1746,6 @@ en:
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
-      reply_button: "Reply"
       destroy_button: "Delete"
       unmute_button: "Move to Inbox"
     new:
@@ -1765,7 +1761,6 @@ en:
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"
-      actions: "Actions"
       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"
@@ -1902,7 +1897,6 @@ en:
       help: Help
   site:
     about:
-      next: Next
       heading_html: "%{copyright}OpenStreetMap %{br} contributors"
       copyright_symbol_html: "©"
       used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
@@ -2292,7 +2286,6 @@ en:
       close: Close
     search:
       search: Search
-      get_directions: "Get directions"
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"
@@ -2492,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}"
@@ -2551,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: