Fix format errors.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2312 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/wx-console/console_thread.cpp b/bacula/src/wx-console/console_thread.cpp
index 46cce5379319954568dc7b6beb893edb11d1fb60..eb54a5bc1e0554b2013e8111862dd6d83d7b17ee 100644 (file)
--- a/bacula/src/wx-console/console_thread.cpp
+++ b/bacula/src/wx-console/console_thread.cpp
@@ -322,7 +322,7 @@ void* console_thread::Entry() {
                csprint(wxString(wxT("   ")) <<  (i+1) << wxT(": ") << wxString(res[i]->hdr.name,*wxConvCurrent) << wxT("\n"));
             }
          }
-         csprint(wxString::Format(wxT(_("Please choose a director (1-%s): ")), count), CS_DATA);
+         csprint(wxString::Format(wxT(_("Please choose a director (1-%d): ")), count), CS_DATA);
          csprint(NULL, CS_PROMPT);
          choosingdirector = true;
          directorchoosen = -1;

diff --git a/bacula/src/wx-console/wxbrestorepanel.cpp b/bacula/src/wx-console/wxbrestorepanel.cpp
index ecb72d1bb3b508f62ede21077180426d55155563..ae4a90b4fc2c56a6566abc2954d7667666aa8f0e 100644 (file)
--- a/bacula/src/wx-console/wxbrestorepanel.cpp
+++ b/bacula/src/wx-console/wxbrestorepanel.cpp
@@ -738,7 +738,7 @@ void wxbRestorePanel::CmdStart() {
       }
       
       wxbMainFrame::GetInstance()->SetStatusText(
-         wxString::Format(wxT(_("Please configure your restore (%s files selected to be restored)...")), totfilemessages));
+         wxString::Format(wxT(_("Please configure your restore (%ld files selected to be restored)...")), totfilemessages));
       
       UpdateSecondConfig(dt);
       
@@ -843,7 +843,7 @@ void wxbRestorePanel::CmdStart() {
             break;
          case JS_Running:
             wxbMainFrame::GetInstance()->SetStatusText(
-               wxString::Format(wxT(_("Restore job running, please wait (%d of %d files restored)...")), filemessages, totfilemessages));
+               wxString::Format(wxT(_("Restore job running, please wait (%ld of %ld files restored)...")), filemessages, totfilemessages));
             waitforever = true;
             break;
          case JS_Terminated: