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

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

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