Changing text messages -> conversations

config/locales/diaspora/en.yml

@@ -327,7 +327,7 @@ en:
 
   conversations:
     index:
-      message_inbox: "Message Inbox"
+      message_inbox: "Conversations – Inbox"
       new_message: "New Message"
       no_conversation_selected: "no conversation selected"
       create_a_new_message: "create a new message"

config/locales/javascript/javascript.en.yml

@@ -150,7 +150,7 @@ en:
       log_out: "Log out"
 
       notifications: "Notifications"
-      messages: "Messages"
+      messages: "Conversations"
 
       search: "Search"