Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgoobertron <gooberfox@fastmail.co.uk>2014-01-31 02:12:59 +0400
committerJonne Haß <me@mrzyx.de>2014-02-09 18:44:10 +0400
commitc12efdf5e69ec1927b8a5121497d2ae4a3d05de0 (patch)
treec8792754ffe09ea1294d2f923377b2e96e42113d /config/locales
parent17754f1da85edd6b39b51d0d6d8a6f98c52b2503 (diff)
Changing text messages -> conversations
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/diaspora/en.yml2
-rw-r--r--config/locales/javascript/javascript.en.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 5d14b8b0b..8e1868fa2 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 cb8a5893f..a5ca291f8 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"