Merge branch 'master' of git@gitorious.org:tmw/eathena

1 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 1f62bd2d..b3861b27 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -75,7 +75,7 @@ std::vector<std::string> loadTextFile(const std::string &fileName)
     std::ifstream fin(fileName.c_str());
 
     if (!fin) {
-        logger->log(_("Couldn't load text file: %s"), fileName.c_str());
+        logger->log("Couldn't load text file: %s", fileName.c_str());
         return lines;
     }
 
@@ -193,7 +193,7 @@ void UpdaterWindow::loadNews()
 {
     if (!mMemoryBuffer)
     {
-        logger->log(_("Couldn't load news"));
+        logger->log("Couldn't load news");
         return;
     }
 
@@ -205,7 +205,7 @@ void UpdaterWindow::loadNews()
 
     // Tokenize and add each line separately
     char *line = strtok(mMemoryBuffer, "\n");
-    while (line != NULL)
+    while (line)
     {
         mBrowserBox->addRow(line);
         line = strtok(NULL, "\n");
@@ -408,9 +408,9 @@ void UpdaterWindow::download()
     mDownloadComplete = false;
     mThread = SDL_CreateThread(UpdaterWindow::downloadThread, this);
 
-    if (mThread == NULL)
+    if (!mThread)
     {
-        logger->log(_("Unable to create mThread"));
+        logger->log("Unable to create mThread");
         mDownloadStatus = UPDATE_ERROR;
     }
 }
@@ -504,7 +504,7 @@ void UpdaterWindow::logic()
                     }
                     else
                     {
-                        logger->log(_("%s already here"), mCurrentFile.c_str());
+                        logger->log("%s already here", mCurrentFile.c_str());
                     }
                     mLineIndex++;
                 }