3 files changed, 9 insertions, 10 deletions
diff --git a/web-ui/app/js/helpers/monitored_ajax.js b/web-ui/app/js/helpers/monitored_ajax.js
index dc182d58..3dfec34a 100644
--- a/web-ui/app/js/helpers/monitored_ajax.js
+++ b/web-ui/app/js/helpers/monitored_ajax.js
@@ -20,9 +20,9 @@ define(['page/events', 'views/i18n', 'helpers/browser'], function (events, i18n,
   'use strict';
 
   var messages = {
-    timeout: 'a timeout occurred',
-    error: 'problems talking to server',
-    parseerror: 'got invalid response from server'
+    timeout: i18n('error.timeout'),
+    error: i18n('error.general'),
+    parseerror: i18n('error.parse')
   };
 
   function monitoredAjax(on, url, config) {
@@ -48,8 +48,7 @@ define(['page/events', 'views/i18n', 'helpers/browser'], function (events, i18n,
     return $.ajax(url, config).fail(function (xmlhttprequest, textstatus, message) {
       if (!config.skipErrorMessage) {
         var msg = (xmlhttprequest.responseJSON && xmlhttprequest.responseJSON.message) ||
-          messages[textstatus] ||
-          'unexpected problem while talking to server';
+          messages[textstatus] || messages.error;
         on.trigger(document, events.ui.userAlerts.displayMessage, {message: i18n(msg), class: 'error'});
       }
 
diff --git a/web-ui/app/js/mail_view/ui/forward_box.js b/web-ui/app/js/mail_view/ui/forward_box.js
index 659968e5..f767915c 100644
--- a/web-ui/app/js/mail_view/ui/forward_box.js
+++ b/web-ui/app/js/mail_view/ui/forward_box.js
@@ -31,7 +31,7 @@ define(
     return defineComponent(forwardBox, withHideAndShow, withComposeInline);
 
     function forwardBox() {
-      var fwd = function(v) { return i18n('Fwd: ') + v; };
+      var fwd = function(v) { return i18n('fwd') + ': ' + v; };
 
       this.fetchTargetMail = function (ev) {
         this.trigger(document, events.mail.want, { mail: this.attr.ident, caller: this });
diff --git a/web-ui/app/js/services/delete_service.js b/web-ui/app/js/services/delete_service.js
index 5cf86d63..4097ea7e 100644
--- a/web-ui/app/js/services/delete_service.js
+++ b/web-ui/app/js/services/delete_service.js
@@ -22,14 +22,14 @@ define(['flight/lib/component', 'page/events', 'views/i18n'], function (defineCo
 
     this.successDeleteMessageFor = function(mail) {
       return mail.isInTrash() ?
-        i18n('Your message was permanently deleted!') :
-        i18n('Your message was moved to trash!');
+        i18n('delete-single') :
+        i18n('trash-single');
     };
 
     this.successDeleteManyMessageFor = function(mail) {
       return mail.isInTrash() ?
-        i18n('Your messages were permanently deleted!') :
-        i18n('Your messages were moved to trash!');
+        i18n('delete-bulk') :
+        i18n('trash-bulk');
     };
 
     this.deleteEmail = function (event, data) {