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

diff --combined config/locales/en.yml
index ec4c2adf2fc7614c62ae9dd2b053012a5f124163,b4239091710d7fbec40a87d4bd0db327e3917ced..ebf14bf3f3eca3bfef3141200312ff58f8cc7706
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -969,6 -969,7 +969,7 @@@ en
            cape: "Cape"
            cave_entrance: "Cave Entrance"
            cliff: "Cliff"
+           coastline: "Coastline"
            crater: "Crater"
            dune: "Dune"
            fell: "Fell"
@@@ -986,6 -987,7 +987,7 @@@
            moor: "Moor"
            mud: "Mud"
            peak: "Peak"
+           peninsula: "Peninsula"
            point: "Point"
            reef: "Reef"
            ridge: "Ridge"
@@@ -1519,7 -1521,7 +1521,7 @@@
      inbox:
        title: "Inbox"
        my_inbox: "My Inbox"
 -      outbox: "outbox"
 +      my_outbox: "My Outbox"
        messages: "You have %{new_messages} and %{old_messages}"
        new_messages:
          one: "%{count} new message"
@@@ -1552,8 -1554,9 +1554,8 @@@
        body: "Sorry there is no message with that id."
      outbox:
        title: "Outbox"
 -      my_inbox_html: "My %{inbox_link}"
 -      inbox: "inbox"
 -      outbox: "outbox"
 +      my_inbox: "My Inbox"
 +      my_outbox: "My Outbox"
        messages:
          one: "You have %{count} sent message"
          other: "You have %{count} sent messages"
@@@ -2109,6 -2112,7 +2111,6 @@@
        more: "more"
        trace_details: "View Trace Details"
        view_map: "View Map"
 -      edit: "edit"
        edit_map: "Edit Map"
        public: "PUBLIC"
        identifiable: "IDENTIFIABLE"
@@@ -2116,6 -2120,7 +2118,6 @@@
        trackable: "TRACKABLE"
        by: "by"
        in: "in"
 -      map: "map"
      index:
        public_traces: "Public GPS traces"
        my_traces: "My GPS traces"