ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of strings for translation. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7584 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-06-04 04:34:44 +00:00
parent 2d852f579c
commit 0e6bb4de35
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -593,13 +593,9 @@ void CGameListCtrl::ScanForISOs()
std::string FileName; std::string FileName;
SplitPath(rFilenames[i], NULL, &FileName, NULL); SplitPath(rFilenames[i], NULL, &FileName, NULL);
wxString msg; // Update with the progress (i) and the message
char tempstring[128]; bool Cont = dialog.Update(i,
sprintf(tempstring,"Scanning %s", FileName.c_str()); wxString::Format(_("Scanning %s"), wxString(FileName.c_str(), *wxConvCurrent).c_str()));
msg = wxString(tempstring, *wxConvCurrent);
// Update with the progress (i) and the message (msg)
bool Cont = dialog.Update(i, msg);
if (!Cont) if (!Cont)
break; break;

4
Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
View File

@ -218,10 +218,10 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
it = g_available_video_backends.begin(), it = g_available_video_backends.begin(),
itend = g_available_video_backends.end(); itend = g_available_video_backends.end();
for (; it != itend; ++it) 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? // 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); _connect_macro_(choice_backend, VideoConfigDiag::Event_Backend, wxEVT_COMMAND_CHOICE_SELECTED, this);
szr_basic->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5); szr_basic->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5);

7
Source/Core/DolphinWX/Src/VideoConfigDiag.h
View File

@ -78,15 +78,16 @@ protected:
if (g_video_backend != new_backend) if (g_video_backend != new_backend)
{ {
bool do_switch = true; 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'."), 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) 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 // reopen the dialog
Close(); Close();