Merge branch 'pull/3112'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f7ee6d04a5822234ed598383e0d835056ff50766..a2b8ab4426985c796ba12bac29efd6d92e134a1b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1519,7 +1519,7 @@ en:
     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,9 +1552,8 @@ en:
       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"