Various gettext fixes

  * Merged a few split strings
  * Fixed some spellings and wordings
  * Turned a couple of std::cout and std::cerr into logger messages

1 files changed, 9 insertions, 9 deletions

diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index d36ab487..362c7e17 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.cpp
@@ -114,29 +114,29 @@ ChangeEmailDialog::action(const gcn::ActionEvent &event)
         logger->log("ChangeEmailDialog::Email change, Username is %s",
                      username.c_str());
 
-        std::stringstream errorMsg;
+        std::stringstream errorMessage;
         int error = 0;
 
         if (newFirstEmail.length() < LEN_MIN_PASSWORD)
         {
             // First email address too short
-            errorMsg << "The new email address needs to be at least "
-                     << LEN_MIN_PASSWORD
-                     << " characters long.";
+            errorMessage << strprintf(_("The new email address needs to be at "
+                                        "least %d characters long."),
+                                      LEN_MIN_PASSWORD);
             error = 1;
         }
         else if (newFirstEmail.length() > LEN_MAX_PASSWORD - 1 )
         {
             // First email address too long
-            errorMsg << "The new email address needs to be less than "
-                     << LEN_MAX_PASSWORD
-                     << " characters long.";
+            errorMessage << strprintf(_("The new email address needs to be "
+                                        "less than %d characters long."),
+                                      LEN_MAX_PASSWORD);
             error = 1;
         }
         else if (newFirstEmail != newSecondEmail)
         {
             // Second Pass mismatch
-            errorMsg << "The email address entries mismatch.";
+            errorMessage << _("The email address entries mismatch.");
             error = 2;
         }
 
@@ -151,7 +151,7 @@ ChangeEmailDialog::action(const gcn::ActionEvent &event)
                 mWrongDataNoticeListener->setTarget(this->mSecondEmailField);
             }
 
-            OkDialog *dlg = new OkDialog("Error", errorMsg.str());
+            OkDialog *dlg = new OkDialog(_("Error"), errorMessage.str());
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else