diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 38a2bbae16..de7bd83581 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -593,13 +593,9 @@ void CGameListCtrl::ScanForISOs() std::string FileName; SplitPath(rFilenames[i], NULL, &FileName, NULL); - wxString msg; - char tempstring[128]; - sprintf(tempstring,"Scanning %s", FileName.c_str()); - msg = wxString(tempstring, *wxConvCurrent); - - // Update with the progress (i) and the message (msg) - bool Cont = dialog.Update(i, msg); + // Update with the progress (i) and the message + bool Cont = dialog.Update(i, + wxString::Format(_("Scanning %s"), wxString(FileName.c_str(), *wxConvCurrent).c_str())); if (!Cont) break; diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 6bc8323f56..b411bc7752 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -218,10 +218,10 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con it = g_available_video_backends.begin(), itend = g_available_video_backends.end(); for (; it != itend; ++it) - choice_backend->AppendString(wxString::FromAscii((*it)->GetName().c_str())); + choice_backend->AppendString(wxGetTranslation(wxString::FromAscii((*it)->GetName().c_str()))); // TODO: How to get the translated plugin name? - choice_backend->SetStringSelection(wxString::FromAscii(g_video_backend->GetName().c_str())); + choice_backend->SetStringSelection(wxGetTranslation(wxString::FromAscii(g_video_backend->GetName().c_str()))); _connect_macro_(choice_backend, VideoConfigDiag::Event_Backend, wxEVT_COMMAND_CHOICE_SELECTED, this); szr_basic->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5); diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.h b/Source/Core/DolphinWX/Src/VideoConfigDiag.h index 82a9322a70..5765524f03 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.h @@ -78,15 +78,16 @@ protected: if (g_video_backend != new_backend) { bool do_switch = true; - if (strcmp(new_backend->GetName().c_str(), _trans("Software Renderer")) == 0) + if (new_backend->GetName() == "Software Renderer") { do_switch = (wxYES == wxMessageBox(_("Software rendering is an order of magnitude slower than using the other backends.\nIt's only useful for debugging purposes.\nDo you really want to enable software rendering? If unsure, select 'No'."), - _("Warning"), wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION, wxGetActiveWindow())); + _("Warning"), wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION, wxGetActiveWindow())); } if (do_switch) { - // TODO: Only reopen the dialog if the software backend is selected (make sure to reinitialize backend info) + // TODO: Only reopen the dialog if the software backend is + // selected (make sure to reinitialize backend info) // reopen the dialog Close();