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 03:02:55 +0400
committerJonne Haß <me@mrzyx.de>2014-02-09 18:44:12 +0400
commit7bcea07b99e0da3779c925a041bfab32aaafb1c1 (patch)
treeb41180afd0821fd1e135be58b30c7fe6949c08e4 /config/locales
parentc12efdf5e69ec1927b8a5121497d2ae4a3d05de0 (diff)
Standardise - code refs to 'messages' to 'conversations'
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/diaspora/en.yml8
-rw-r--r--config/locales/javascript/javascript.en.yml2
2 files changed, 5 insertions, 5 deletions
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 8e1868fa2..bede226ef 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -327,10 +327,10 @@ en:
conversations:
index:
- message_inbox: "Conversations – Inbox"
- new_message: "New Message"
+ conversations_inbox: "Conversations – Inbox"
+ new_conversation: "New conversation"
no_conversation_selected: "no conversation selected"
- create_a_new_message: "create a new message"
+ create_a_new_conversation: "start a new conversation"
no_messages: "no messages"
inbox: "Inbox"
conversation:
@@ -354,7 +354,7 @@ en:
sent: "Message sent"
fail: "Invalid message"
no_contact: "Hey, you need to add the contact first!"
- new_message:
+ new_conversation:
fail: "Invalid message"
destroy:
success: "Conversation successfully removed"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index a5ca291f8..5d65beb6c 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: "Conversations"
+ conversations: "Conversations"
search: "Search"