From 45f1104cbc733b184dfb7426ebbed61cd0f8f260 Mon Sep 17 00:00:00 2001
From: Gabriel Albo <gabriel@albo.com.br>
Date: Wed, 12 Nov 2014 10:16:34 +0100
Subject: Changing 'trash it' buttons to 'delete it' so language is consistent
 throughout the app

---
 web-ui/app/locales/en-us/translation.json   | 2 +-
 web-ui/app/locales/en/translation.json      | 2 +-
 web-ui/app/templates/mails/mail_actions.hbs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'web-ui')

diff --git a/web-ui/app/locales/en-us/translation.json b/web-ui/app/locales/en-us/translation.json
index b84f39bb..24eb2899 100644
--- a/web-ui/app/locales/en-us/translation.json
+++ b/web-ui/app/locales/en-us/translation.json
@@ -55,7 +55,7 @@
     "send-button": "Send",
     "sending-mail": "Sending...",
     "draft-button": "Save Draft",
-    "trash-button": "Trash it",
+    "trash-button": "Delete it",
     "Search..." : "Search...",
     "Search results for:": "Search results for:",
     "Tags": "Tags",
diff --git a/web-ui/app/locales/en/translation.json b/web-ui/app/locales/en/translation.json
index b84f39bb..24eb2899 100644
--- a/web-ui/app/locales/en/translation.json
+++ b/web-ui/app/locales/en/translation.json
@@ -55,7 +55,7 @@
     "send-button": "Send",
     "sending-mail": "Sending...",
     "draft-button": "Save Draft",
-    "trash-button": "Trash it",
+    "trash-button": "Delete it",
     "Search..." : "Search...",
     "Search results for:": "Search results for:",
     "Tags": "Tags",
diff --git a/web-ui/app/templates/mails/mail_actions.hbs b/web-ui/app/templates/mails/mail_actions.hbs
index 8933db79..94b79ab9 100644
--- a/web-ui/app/templates/mails/mail_actions.hbs
+++ b/web-ui/app/templates/mails/mail_actions.hbs
@@ -2,5 +2,5 @@
 <button id="view-more-actions" class="no-style"><i class="fa fa-caret-down"></i></button>
 <ul id="more-actions">
     <li><span id="reply-all-button-top">{{t 'Reply to All'}}</span></li>
-    <li><span id="delete-button-top">{{t 'Trash this message'}}</span></li>
+    <li><span id="delete-button-top">{{t 'Delete this message'}}</span></li>
 </ul>
-- 
cgit v1.2.3