[geary/wip/save-sent-713263: 10/12] Consistent e/mail, again

[Charles Lindsay <clindsay src gnome org>]

commit ec3b51771421b408e29a7887389d55d38bb9f26a
Author: Charles Lindsay <chaz yorba org>
Date:   Tue Jan 28 13:04:13 2014 -0800

    Consistent e/mail, again

 src/client/application/geary-controller.vala      |    2 +-
 src/client/components/status-bar.vala             |    2 +-
 src/engine/imap-db/outbox/smtp-outbox-folder.vala |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 7ded3d2..0865781 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -697,7 +697,7 @@ public class GearyController : Geary.BaseObject {
                 break;
                 
                 case StatusBar.Message.OUTBOX_SAVE_SENT_MAIL_FAILED:
-                    libnotify.set_error_notification(_("Error saving sent email"),
+                    libnotify.set_error_notification(_("Error saving sent mail"),
                         _("Geary encountered an error saving a sent message to Sent Mail.  The message will 
stay in your Outbox folder until you delete it."));
                 break;
                 
diff --git a/src/client/components/status-bar.vala b/src/client/components/status-bar.vala
index 26058a9..6a7bf58 100644
--- a/src/client/components/status-bar.vala
+++ b/src/client/components/status-bar.vala
@@ -30,7 +30,7 @@ public class StatusBar : Gtk.Statusbar {
                 case Message.OUTBOX_SAVE_SENT_MAIL_FAILED:
                     // Displayed in the space-limited status bar when a message fails to be uploaded
                     // to Sent Mail after being sent.
-                    return _("Error saving sent email");
+                    return _("Error saving sent mail");
                 default:
                     assert_not_reached();
             }
diff --git a/src/engine/imap-db/outbox/smtp-outbox-folder.vala 
b/src/engine/imap-db/outbox/smtp-outbox-folder.vala
index 14ff018..83843ef 100644
--- a/src/engine/imap-db/outbox/smtp-outbox-folder.vala
+++ b/src/engine/imap-db/outbox/smtp-outbox-folder.vala
@@ -274,7 +274,7 @@ private class Geary.SmtpOutboxFolder : Geary.AbstractLocalFolder, Geary.FolderSu
                     debug("Outbox postman: Saving %s to sent mail", row.outbox_id.to_string());
                     yield save_sent_mail_async(message, null);
                 } catch (Error e) {
-                    debug("Outbox postman: Error saving sent email: %s", e.message);
+                    debug("Outbox postman: Error saving sent mail: %s", e.message);
                     report_problem(Geary.Account.Problem.SAVE_SENT_MAIL_FAILED, e);
                     
                     continue;