From c12efdf5e69ec1927b8a5121497d2ae4a3d05de0 Mon Sep 17 00:00:00 2001
From: goobertron <gooberfox@fastmail.co.uk>
Date: Thu, 30 Jan 2014 22:12:59 +0000
Subject: [PATCH] Changing text messages -> conversations

---
 config/locales/diaspora/en.yml              | 2 +-
 config/locales/javascript/javascript.en.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 5d14b8b0b3..8e1868fa21 100644
--- a/config/locales/diaspora/en.yml
+++ b/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"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index cb8a5893fa..a5ca291f84 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -150,7 +150,7 @@ en:
       log_out: "Log out"
 
       notifications: "Notifications"
-      messages: "Messages"
+      messages: "Conversations"
 
       search: "Search"
 
-- 
GitLab