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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index cf783e60b76c2bc8954bb3999719343afca05c9d..e07c9aaab8cb854bfc86c1e523eba033ca4cbed0 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1274,7 +1274,6 @@ en-GB:
   messages:
     inbox:
       title: Inbox
-      my_inbox: My Inbox
       messages: You have %{new_messages} and %{old_messages}
       new_messages:
         one: '%{count} new message'
@@ -1282,12 +1281,14 @@ en-GB:
       old_messages:
         one: '%{count} old message'
         other: '%{count} old messages'
-      from: From
-      subject: Subject
-      date: Date
       no_messages_yet_html: You have no messages yet. Why not get in touch with some
         of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby
+    messages_table:
+      from: From
+      to: To
+      subject: Subject
+      date: Date
     message_summary:
       unread_button: Mark as unread
       read_button: Mark as read
@@ -1310,9 +1311,6 @@ en-GB:
       messages:
         one: You have %{count} sent message
         other: You have %{count} sent messages
-      to: To
-      subject: Subject
-      date: Date
       no_sent_messages_html: You have no sent messages yet. Why not get in touch with
         some of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby
@@ -1331,6 +1329,8 @@ en-GB:
         order to read it.
     sent_message_summary:
       destroy_button: Delete
+    heading:
+      my_inbox: My Inbox
     mark:
       as_read: Message marked as read
       as_unread: Message marked as unread
@@ -1595,32 +1595,24 @@ en-GB:
           footway: Footway
           rail: Railway
           subway: Subway
-          cable:
-          - Cable car
-          - chairlift
-          runway:
-          - Airport Runway
-          - taxiway
-          apron:
-          - Airport apron
-          - terminal
+          cable_car: Cable car
+          chair_lift: chairlift
+          runway_only: Airport Runway
+          taxiway: taxiway
+          apron_only: Airport apron
           admin: Administrative boundary
-          forest:
-          - Forest
-          - Wood
+          forest_only: Forest
+          wood: Wood
           golf: Golf course
           park: Park
-          common:
-          - Common
-          - meadow
+          common_only: Common
           resident: Residential area
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           heathland: Heathland
-          lake:
-          - Lake
-          - reservoir
+          lake_only: Lake
+          reservoir: reservoir
           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery
@@ -1629,14 +1621,12 @@ en-GB:
           centre: Sports centre
           reserve: Nature reserve
           military: Military area
-          school:
-          - School
-          - university
+          school_only: School
+          university: university
           building: Significant building
           station: Railway station
-          summit:
-          - Summit
-          - peak
+          summit_only: Summit
+          peak: peak
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access