Add internationalization support. There aren't really any translations yet other than a little French thanks to DavidVag. So now the translators need to go to work. See http://wiki.wxwidgets.org/Internationalization for directions. The binary .mo files are generated at build time on linux. They are provided in Data/Languages for windows. I don't know where they need to go on OSX, but they should be able to be generated there at least. I added a target to generate them on windows, but does not build by default as it requires that msgfmt.exe from the gnu gettext tools be installed and in the path.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6747 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp

@@ -40,7 +40,7 @@ CARCodeAddEdit::~CARCodeAddEdit()
 void CARCodeAddEdit::CreateGUIControls(int _selection)
 {
 	ActionReplay::ARCode tempEntries;
-	wxString currentName = wxT("Insert name here..");
+	wxString currentName = _("Insert name here..");
 	
 	if (_selection == -1)
 	{
@@ -65,7 +65,7 @@ void CARCodeAddEdit::CreateGUIControls(int _selection)
 	EntrySelection->SetValue((int)(arCodes.size() - _selection));
 	EditCheatCode = new wxTextCtrl(this, ID_EDITCHEAT_CODE, wxEmptyString, wxDefaultPosition, wxSize(300, 100), wxTE_MULTILINE);
 	UpdateTextCtrl(tempEntries);
-	wxButton* bOK = new wxButton(this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	wxButton* bOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	wxButton* bCancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	sgEntry->Add(EditCheatNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER|wxALL, 5);

Source/Core/DolphinWX/Src/ARCodeAddEdit.h

@@ -27,7 +27,7 @@ class CARCodeAddEdit : public wxDialog
 	public:
 		CARCodeAddEdit(int _selection, wxWindow* parent,
 			wxWindowID id = 1,
-			const wxString& title = wxT("Edit ActionReplay Code"),
+			const wxString& title = _("Edit ActionReplay Code"),
 			const wxPoint& pos = wxDefaultPosition,
 			const wxSize& size = wxDefaultSize,
 			long style = wxDEFAULT_DIALOG_STYLE);

Source/Core/DolphinWX/Src/AboutDolphin.cpp

@@ -39,7 +39,7 @@ AboutDolphin::~AboutDolphin()
 
 void AboutDolphin::CreateGUIControls()
 {
-	m_Close = new wxButton(this, wxID_CLOSE, wxT("Close"),
+	m_Close = new wxButton(this, wxID_CLOSE, _("Close"),
 		wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	wxMemoryInputStream istream(dolphin_logo_png, sizeof dolphin_logo_png);

Source/Core/DolphinWX/Src/AboutDolphin.h

@@ -30,7 +30,7 @@ class AboutDolphin : public wxDialog
 	public:
 		AboutDolphin(wxWindow *parent,
 			wxWindowID id = wxID_ANY,
-			const wxString &title = wxT("About Dolphin"),
+			const wxString &title = _("About Dolphin"),
 			const wxPoint& pos = wxDefaultPosition,
 			const wxSize& size = wxDefaultSize,
 			long style = wxDEFAULT_DIALOG_STYLE);

Source/Core/DolphinWX/Src/CheatsWindow.cpp

@@ -34,7 +34,7 @@ extern std::vector<ActionReplay::ARCode> arCodes;
 static wxCheatsWindow *g_cheat_window;
 
 wxCheatsWindow::wxCheatsWindow(wxWindow* const parent)
-	: wxFrame(parent, wxID_ANY, wxT("Cheats Manager"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
+	: wxFrame(parent, wxID_ANY, _("Cheats Manager"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
 	::g_cheat_window = this;
 
@@ -74,10 +74,10 @@ void wxCheatsWindow::Init_ChildControls()
 	_connect_macro_(m_CheckListBox_CheatsList, wxCheatsWindow::OnEvent_CheatsList_ItemSelected, wxEVT_COMMAND_LISTBOX_SELECTED, this);
 	_connect_macro_(m_CheckListBox_CheatsList, wxCheatsWindow::OnEvent_CheatsList_ItemToggled, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, this);
 
-	m_Label_Codename = new wxStaticText(m_Tab_Cheats, wxID_ANY, _T("Name: "), wxDefaultPosition, wxDefaultSize);
-	m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _T("Code Info"), wxDefaultPosition, wxDefaultSize);
+	m_Label_Codename = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Name: "), wxDefaultPosition, wxDefaultSize);
+	m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _("Code Info"), wxDefaultPosition, wxDefaultSize);
 
-	m_Label_NumCodes = new wxStaticText(m_Tab_Cheats, wxID_ANY, _T("Number Of Codes: "),  wxDefaultPosition, wxDefaultSize);
+	m_Label_NumCodes = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Number Of Codes: "),  wxDefaultPosition, wxDefaultSize);
 	m_ListBox_CodesList = new wxListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(120, 150), 0, 0, wxLB_HSCROLL);
 
 	wxStaticBoxSizer* sGroupBoxInfo = new wxStaticBoxSizer(m_GroupBox_Info, wxVERTICAL);
@@ -97,10 +97,10 @@ void wxCheatsWindow::Init_ChildControls()
 	// $ Log Tab
 	m_Tab_Log = new wxPanel(m_Notebook_Main, wxID_ANY, wxDefaultPosition, wxDefaultSize);
 
-	wxButton* const button_updatelog = new wxButton(m_Tab_Log, wxID_ANY, wxT("Update"));
+	wxButton* const button_updatelog = new wxButton(m_Tab_Log, wxID_ANY, _("Update"));
 	_connect_macro_(button_updatelog, wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, wxEVT_COMMAND_BUTTON_CLICKED, this);
 
-	m_CheckBox_LogAR = new wxCheckBox(m_Tab_Log, wxID_ANY, wxT("Enable AR Logging"));
+	m_CheckBox_LogAR = new wxCheckBox(m_Tab_Log, wxID_ANY, _("Enable AR Logging"));
 	_connect_macro_(m_CheckBox_LogAR, wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, wxEVT_COMMAND_CHECKBOX_CLICKED, this);
 
 	m_CheckBox_LogAR->SetValue(ActionReplay::IsSelfLogging());
@@ -117,16 +117,16 @@ void wxCheatsWindow::Init_ChildControls()
 	m_Tab_Log->SetSizerAndFit(sTabLog);
 
 	// Add Tabs to Notebook
-	m_Notebook_Main->AddPage(m_Tab_Cheats, _T("AR Codes"));
+	m_Notebook_Main->AddPage(m_Tab_Cheats, _("AR Codes"));
 	m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook_Main);
-	m_Notebook_Main->AddPage(m_geckocode_panel, wxT("Gecko Codes"));
-	m_Notebook_Main->AddPage(tab_cheat_search, _T("Cheat Search"));
-	m_Notebook_Main->AddPage(m_Tab_Log, _T("Logging"));
+	m_Notebook_Main->AddPage(m_geckocode_panel, _("Gecko Codes"));
+	m_Notebook_Main->AddPage(tab_cheat_search, _("Cheat Search"));
+	m_Notebook_Main->AddPage(m_Tab_Log, _("Logging"));
 
 	// Button Strip
-	wxButton* const button_apply = new wxButton(panel, wxID_ANY, _T("Apply"), wxDefaultPosition, wxDefaultSize);
+	wxButton* const button_apply = new wxButton(panel, wxID_ANY, _("Apply"), wxDefaultPosition, wxDefaultSize);
 	_connect_macro_(button_apply, wxCheatsWindow::OnEvent_ApplyChanges_Press, wxEVT_COMMAND_BUTTON_CLICKED, this);
-	wxButton* const button_close = new wxButton(panel, wxID_ANY, _T("Close"), wxDefaultPosition, wxDefaultSize);
+	wxButton* const button_close = new wxButton(panel, wxID_ANY, _("Close"), wxDefaultPosition, wxDefaultSize);
 	_connect_macro_(button_close, wxCheatsWindow::OnEvent_ButtonClose_Press, wxEVT_COMMAND_BUTTON_CLICKED, this);
 	wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL);
 	sButtons->Add(button_apply, 1, wxRIGHT, 5);
@@ -146,11 +146,11 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent)
 	: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
 {
 	// first scan button
-	btnInitScan = new wxButton(this, -1, wxT("New Scan"));
+	btnInitScan = new wxButton(this, -1, _("New Scan"));
 	_connect_macro_(btnInitScan, CheatSearchTab::StartNewSearch, wxEVT_COMMAND_BUTTON_CLICKED, this);
 
 	// next scan button
-	btnNextScan = new wxButton(this, -1, wxT("Next Scan"));
+	btnNextScan = new wxButton(this, -1, _("Next Scan"));
 	_connect_macro_(btnNextScan, CheatSearchTab::FilterCheatSearchResults, wxEVT_COMMAND_BUTTON_CLICKED, this);
 	btnNextScan->Disable();
 
@@ -161,27 +161,27 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent)
 	size_radiobtn.rad_8->SetValue(true);
 
 	// data sizes groupbox
-	wxStaticBoxSizer* const sizer_cheat_new_search = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("Data Size"));
+	wxStaticBoxSizer* const sizer_cheat_new_search = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Data Size"));
 	sizer_cheat_new_search->Add(size_radiobtn.rad_8, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5);
 	sizer_cheat_new_search->Add(size_radiobtn.rad_16, 0, wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5);
 	sizer_cheat_new_search->Add(size_radiobtn.rad_32, 0, wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 5);
 
 	// result controls
 	lbox_search_results = new wxListBox(this, -1, wxDefaultPosition, wxDefaultSize);
-	label_results_count = new wxStaticText(this, -1, wxT("Count:"));
+	label_results_count = new wxStaticText(this, -1, _("Count:"));
 
 	// create AR code button
-	wxButton* const button_cheat_search_copy_address = new wxButton(this, -1, wxT("Create AR Code"));
+	wxButton* const button_cheat_search_copy_address = new wxButton(this, -1, _("Create AR Code"));
 	_connect_macro_(button_cheat_search_copy_address, CheatSearchTab::CreateARCode, wxEVT_COMMAND_BUTTON_CLICKED, this);
 
 	// results groupbox
-	wxStaticBoxSizer* const sizer_cheat_search_results = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Results"));
+	wxStaticBoxSizer* const sizer_cheat_search_results = new wxStaticBoxSizer(wxVERTICAL, this, _("Results"));
 	sizer_cheat_search_results->Add(label_results_count, 0, wxALIGN_LEFT | wxALL, 5);
 	sizer_cheat_search_results->Add(lbox_search_results, 1, wxEXPAND | wxALL, 5);
 	sizer_cheat_search_results->Add(button_cheat_search_copy_address, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5);
 
 	// Search value radio buttons
-	value_x_radiobtn.rad_oldvalue = new wxRadioButton(this, -1, wxT("Previous Value"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+	value_x_radiobtn.rad_oldvalue = new wxRadioButton(this, -1, _("Previous Value"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
 	value_x_radiobtn.rad_uservalue = new wxRadioButton(this, -1, wxT(""));
 	value_x_radiobtn.rad_oldvalue->SetValue(true);
 
@@ -194,25 +194,25 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent)
 	sizer_cheat_filter_text->Add(textctrl_value_x, 1, wxALIGN_CENTER_VERTICAL, 5);
 
 	// value groupbox
-	wxStaticBoxSizer* const sizer_cheat_search_filter_x = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Value"));
+	wxStaticBoxSizer* const sizer_cheat_search_filter_x = new wxStaticBoxSizer(wxVERTICAL, this, _("Value"));
 	sizer_cheat_search_filter_x->Add(value_x_radiobtn.rad_oldvalue, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5);
 	sizer_cheat_search_filter_x->Add(sizer_cheat_filter_text, 0, wxALL | wxEXPAND, 5);
 
 	// filter types in the compare dropdown
 	static const wxString searches[] = {
-		wxT("Unknown"),
-		wxT("Not Equal"),
-		wxT("Equal"),
-		wxT("Greater Than"),
-		wxT("Less Than"),
+		_("Unknown"),
+		_("Not Equal"),
+		_("Equal"),
+		_("Greater Than"),
+		_("Less Than"),
 	// TODO: Implement between search.
-		//wxT("Between"),
+		//_("Between"),
 	};
 
 	search_type = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize, sizeof(searches)/sizeof(*searches), searches);
 	search_type->Select(0);
 
-	wxStaticBoxSizer* const sizer_cheat_search_filter = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Search Filter"));
+	wxStaticBoxSizer* const sizer_cheat_search_filter = new wxStaticBoxSizer(wxVERTICAL, this, _("Search Filter"));
 	sizer_cheat_search_filter->Add(sizer_cheat_search_filter_x, 0, wxALL | wxEXPAND, 5);
 	sizer_cheat_search_filter->Add(search_type, 0, wxALL, 5);
 
@@ -275,7 +275,7 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED (e
 		if ((int)indexList[i].uiIndex == index)
 		{
 			ARCode code = GetARCode(i);
-			m_Label_Codename->SetLabel(wxT("Name: ") + wxString(code.name.c_str(), *wxConvCurrent));
+			m_Label_Codename->SetLabel(_("Name: ") + wxString(code.name.c_str(), *wxConvCurrent));
 			char text[CHAR_MAX];
 			char* numcodes = text;
 			sprintf(numcodes, "Number of Codes: %lu", (unsigned long)code.ops.size());
@@ -491,7 +491,7 @@ void CheatSearchTab::UpdateCheatSearchResultsList()
 	wxString count_label = wxString::Format(wxT("Count: %i"), search_results.size());
 	if (search_results.size() > MAX_CHEAT_SEARCH_RESULTS_DISPLAY)
 	{
-		count_label += wxT(" (too many to display)");
+		count_label += _(" (too many to display)");
 	}
 	else
 	{
@@ -542,22 +542,22 @@ void CheatSearchTab::CreateARCode(wxCommandEvent&)
 }
 
 CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address)
-	: wxDialog(parent, -1, wxT("Create AR Code"), wxDefaultPosition)
+	: wxDialog(parent, -1, _("Create AR Code"), wxDefaultPosition)
 	, code_address(address)
 {
 	wxPanel* const panel = new wxPanel(this);
 
-	wxStaticText* const label_name = new wxStaticText(panel, -1, wxT("Name: "));
+	wxStaticText* const label_name = new wxStaticText(panel, -1, _("Name: "));
 	textctrl_name = new wxTextCtrl(panel, -1, wxEmptyString, wxDefaultPosition, wxSize(256,-1));
 
-	wxStaticText* const label_code = new wxStaticText(panel, -1, wxT("Code: "));
+	wxStaticText* const label_code = new wxStaticText(panel, -1, _("Code: "));
 	textctrl_code = new wxTextCtrl(panel, -1, wxString::Format(wxT("0x%08x"), address));
 	textctrl_code->Disable();
 
-	wxStaticText* const label_value = new wxStaticText(panel, -1, wxT("Value: "));
+	wxStaticText* const label_value = new wxStaticText(panel, -1, _("Value: "));
 	textctrl_value = new wxTextCtrl(panel, -1, wxT("0"));
 
-	checkbox_use_hex = new wxCheckBox(panel, -1, wxT("Use Hex"));
+	checkbox_use_hex = new wxCheckBox(panel, -1, _("Use Hex"));
 	checkbox_use_hex->SetValue(true);
 
 	wxBoxSizer* const sizer_value_label = new wxBoxSizer(wxHORIZONTAL);
@@ -566,7 +566,7 @@ CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address)
 
 	wxButton* const btn_ok = new wxButton(panel, -1, wxT("OK"));
 	_connect_macro_(btn_ok, CreateCodeDialog::PressOK, wxEVT_COMMAND_BUTTON_CLICKED, this);
-	wxButton* const btn_cancel = new wxButton(panel, -1, wxT("Cancel"));
+	wxButton* const btn_cancel = new wxButton(panel, -1, _("Cancel"));
 	_connect_macro_(btn_cancel, CreateCodeDialog::PressCancel, wxEVT_COMMAND_BUTTON_CLICKED, this);
 
 	// button sizer

Source/Core/DolphinWX/Src/ConfigMain.cpp

@@ -32,6 +32,7 @@
 #include "SysConf.h"
 #include "Frame.h"
 #include "HotkeyDlg.h"
+#include "Main.h"
 
 #ifdef __APPLE__
 #include <ApplicationServices/ApplicationServices.h>
@@ -207,15 +208,15 @@ void CConfigMain::InitializeGUILists()
 		arrayStringFor_Framelimit.Add(wxString::Format(wxT("%i"), i));
 
 	// Emulator Engine
-	arrayStringFor_CPUEngine.Add(wxT("Interpreter (VERY slow)"));
-	arrayStringFor_CPUEngine.Add(wxT("JIT Recompiler (recommended)"));
-	arrayStringFor_CPUEngine.Add(wxT("JITIL experimental recompiler"));
+	arrayStringFor_CPUEngine.Add(_("Interpreter (VERY slow)"));
+	arrayStringFor_CPUEngine.Add(_("JIT Recompiler (recommended)"));
+	arrayStringFor_CPUEngine.Add(_("JITIL experimental recompiler"));
 	
 	
 	// Display page
 	// Resolutions
 	if (arrayStringFor_FullscreenResolution.empty())
-		arrayStringFor_FullscreenResolution.Add(wxT("<No resolutions found>"));
+		arrayStringFor_FullscreenResolution.Add(_("<No resolutions found>"));
 
 	// Themes
 	arrayStringFor_Themes.Add(wxT("Boomy"));
@@ -224,12 +225,12 @@ void CConfigMain::InitializeGUILists()
 	arrayStringFor_Themes.Add(wxT("KDE"));
 
 	// GUI language arrayStrings
-	arrayStringFor_InterfaceLang.Add(wxT("English"));
-	arrayStringFor_InterfaceLang.Add(wxT("German"));
-	arrayStringFor_InterfaceLang.Add(wxT("French"));
-	arrayStringFor_InterfaceLang.Add(wxT("Spanish"));
-	arrayStringFor_InterfaceLang.Add(wxT("Italian"));
-	arrayStringFor_InterfaceLang.Add(wxT("Dutch"));
+	arrayStringFor_InterfaceLang.Add(_("English"));
+	arrayStringFor_InterfaceLang.Add(_("German"));
+	arrayStringFor_InterfaceLang.Add(_("French"));
+	arrayStringFor_InterfaceLang.Add(_("Spanish"));
+	arrayStringFor_InterfaceLang.Add(_("Italian"));
+	arrayStringFor_InterfaceLang.Add(_("Dutch"));
 	
 	
 	// Gamecube page
@@ -239,8 +240,8 @@ void CConfigMain::InitializeGUILists()
 	
 	// Wii page
 	// Sensorbar Position
-	arrayStringFor_WiiSensBarPos.Add(wxT("Bottom"));
-	arrayStringFor_WiiSensBarPos.Add(wxT("Top"));
+	arrayStringFor_WiiSensBarPos.Add(_("Bottom"));
+	arrayStringFor_WiiSensBarPos.Add(_("Top"));
 	
 	// Aspect ratio
 	arrayStringFor_WiiAspectRatio.Add(wxT("4:3"));
@@ -248,10 +249,10 @@ void CConfigMain::InitializeGUILists()
 	
 	// Wii Language arrayStrings
 	arrayStringFor_WiiSystemLang = arrayStringFor_InterfaceLang;
-	arrayStringFor_WiiSystemLang.Insert(wxT("Japanese"), 0);
-	arrayStringFor_WiiSystemLang.Add(wxT("Simplified Chinese"));
-	arrayStringFor_WiiSystemLang.Add(wxT("Traditional Chinese"));
-	arrayStringFor_WiiSystemLang.Add(wxT("Korean"));
+	arrayStringFor_WiiSystemLang.Insert(_("Japanese"), 0);
+	arrayStringFor_WiiSystemLang.Add(_("Simplified Chinese"));
+	arrayStringFor_WiiSystemLang.Add(_("Traditional Chinese"));
+	arrayStringFor_WiiSystemLang.Add(_("Korean"));
 	
 }
 
@@ -333,47 +334,41 @@ void CConfigMain::InitializeGUIValues()
 void CConfigMain::InitializeGUITooltips()
 {
 	// General - Basic
-	CPUThread->SetToolTip(wxT("This splits the Video and CPU threads, so they can be run on separate cores.")
-		wxT("\nCauses major speed improvements on PCs with more than one core,")
-		wxT("\nbut can also cause occasional crashes/glitches."));
-	Framelimit->SetToolTip(wxT("If you set Framelimit higher than game full speed (NTSC:60, PAL:50),\nyou also have to disable Audio Throttle in DSP to make it effective."));
+	CPUThread->SetToolTip(_("This splits the Video and CPU threads, so they can be run on separate cores.\nCauses major speed improvements on PCs with more than one core,\nbut can also cause occasional crashes/glitches."));
+	Framelimit->SetToolTip(_("If you set Framelimit higher than game full speed (NTSC:60, PAL:50),\nyou also have to disable Audio Throttle in DSP to make it effective."));
 
 	// General - Advanced
-	DSPThread->SetToolTip(wxT("Run DSPLLE on a dedicated thread (not recommended)."));
+	DSPThread->SetToolTip(_("Run DSPLLE on a dedicated thread (not recommended)."));
 
 	// Display - Display
-	FullscreenResolution->SetToolTip(wxT("Select resolution for fullscreen mode"));
-	WindowWidth->SetToolTip(wxT("Window width for windowed mode"));
-	WindowHeight->SetToolTip(wxT("Window height for windowed mode"));
-	Fullscreen->SetToolTip(wxT("Start the rendering window in fullscreen mode."));
-	HideCursor->SetToolTip(wxT("Hide the cursor when it is over the rendering window")
-		wxT("\n and the rendering window has focus."));
-	RenderToMain->SetToolTip(wxT("Render to main window."));
-	ProgressiveScan->SetToolTip(wxT("Will enable progressive scan option if supported by software."));
-	NTSCJ->SetToolTip(wxT("Required for using the Japanese ROM font."));
+	FullscreenResolution->SetToolTip(_("Select resolution for fullscreen mode"));
+	WindowWidth->SetToolTip(_("Window width for windowed mode"));
+	WindowHeight->SetToolTip(_("Window height for windowed mode"));
+	Fullscreen->SetToolTip(_("Start the rendering window in fullscreen mode."));
+	HideCursor->SetToolTip(_("Hide the cursor when it is over the rendering window\n and the rendering window has focus."));
+	RenderToMain->SetToolTip(_("Render to main window."));
+	ProgressiveScan->SetToolTip(_("Will enable progressive scan option if supported by software."));
+	NTSCJ->SetToolTip(_("Required for using the Japanese ROM font."));
 
 	// Display - Interface
-	ConfirmStop->SetToolTip(wxT("Show a confirmation box before stopping a game."));
-	UsePanicHandlers->SetToolTip(wxT("Show a message box when a potentially serious error has occured.")
-		wxT(" Disabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin")
-		wxT(" suddenly crashes without any explanation at all."));
+	ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game."));
+	UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occured.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin\nsuddenly crashes without any explanation at all."));
 
 	// Display - Themes: Copyright notice
-	Theme->SetItemToolTip(0, wxT("Created by Milosz Wlazlo [[email protected], miloszwl.deviantart.com]"));
-	Theme->SetItemToolTip(1, wxT("Created by VistaIcons.com"));
-	Theme->SetItemToolTip(2, wxT("Created by black_rider and published on ForumW.org > Web Developments"));
-	Theme->SetItemToolTip(3, wxT("Created by KDE-Look.org"));
+	Theme->SetItemToolTip(0, _("Created by Milosz Wlazlo [[email protected], miloszwl.deviantart.com]"));
+	Theme->SetItemToolTip(1, _("Created by VistaIcons.com"));
+	Theme->SetItemToolTip(2, _("Created by black_rider and published on ForumW.org > Web Developments"));
+	Theme->SetItemToolTip(3, _("Created by KDE-Look.org"));
 
-	InterfaceLang->SetToolTip(wxT("For the time being this will only change the text shown in")
-		wxT("\nthe game list of PAL GC games."));
+	InterfaceLang->SetToolTip(_("Change the language of the user interface.\nRequires restart."));
 
 
 	// Gamecube - Devices
-	GCEXIDevice[2]->SetToolTip(wxT("Serial Port 1 - This is the port which devices such as the net adapter use"));
+	GCEXIDevice[2]->SetToolTip(_("Serial Port 1 - This is the port which devices such as the net adapter use"));
 
 
 	// Wii - Devices
-	WiiKeyboard->SetToolTip(wxT("This could cause slow down in Wii Menu and some games."));
+	WiiKeyboard->SetToolTip(_("This could cause slow down in Wii Menu and some games."));
 }
 
 void CConfigMain::CreateGUIControls()
@@ -389,30 +384,30 @@ void CConfigMain::CreateGUIControls()
 	PathsPage = new wxPanel(Notebook, ID_PATHSPAGE, wxDefaultPosition, wxDefaultSize);
 	PluginsPage = new wxPanel(Notebook, ID_PLUGINPAGE, wxDefaultPosition, wxDefaultSize);
 
-	Notebook->AddPage(GeneralPage, wxT("General"));
-	Notebook->AddPage(DisplayPage, wxT("Display"));
-	Notebook->AddPage(GamecubePage, wxT("Gamecube"));
-	Notebook->AddPage(WiiPage, wxT("Wii"));
-	Notebook->AddPage(PathsPage, wxT("Paths"));
-	Notebook->AddPage(PluginsPage, wxT("Plugins"));
+	Notebook->AddPage(GeneralPage, _("General"));
+	Notebook->AddPage(DisplayPage, _("Display"));
+	Notebook->AddPage(GamecubePage, _("Gamecube"));
+	Notebook->AddPage(WiiPage, _("Wii"));
+	Notebook->AddPage(PathsPage, _("Paths"));
+	Notebook->AddPage(PluginsPage, _("Plugins"));
 
 	// General page
 	// Core Settings - Basic
-	sbBasic = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, wxT("Basic Settings"));
-	CPUThread = new wxCheckBox(GeneralPage, ID_CPUTHREAD, wxT("Enable Dual Core (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	SkipIdle = new wxCheckBox(GeneralPage, ID_IDLESKIP, wxT("Enable Idle Skipping (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	EnableCheats = new wxCheckBox(GeneralPage, ID_ENABLECHEATS, wxT("Enable Cheats"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	sbBasic = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Basic Settings"));
+	CPUThread = new wxCheckBox(GeneralPage, ID_CPUTHREAD, _("Enable Dual Core (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	SkipIdle = new wxCheckBox(GeneralPage, ID_IDLESKIP, _("Enable Idle Skipping (speedup)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	EnableCheats = new wxCheckBox(GeneralPage, ID_ENABLECHEATS, _("Enable Cheats"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	// Framelimit
-	wxStaticText* FramelimitText = new wxStaticText(GeneralPage, ID_FRAMELIMIT_TEXT, wxT("Framelimit :"), wxDefaultPosition, wxDefaultSize);
+	wxStaticText* FramelimitText = new wxStaticText(GeneralPage, ID_FRAMELIMIT_TEXT, _("Framelimit :"), wxDefaultPosition, wxDefaultSize);
 	Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit, 0, wxDefaultValidator);
-	UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, wxT("Use FPS  For Limiting"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, _("Use FPS  For Limiting"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	// Core Settings - Advanced
-	sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, wxT("Advanced Settings"));
-	AlwaysHLE_BS2 = new wxCheckBox(GeneralPage, ID_ALWAYS_HLE_BS2, wxT("Skip GC BIOS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, wxT("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS);
-	LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, wxT("Lock threads to cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	DSPThread = new wxCheckBox(GeneralPage, ID_DSPTHREAD, wxT("DSPLLE on thread"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings"));
+	AlwaysHLE_BS2 = new wxCheckBox(GeneralPage, ID_ALWAYS_HLE_BS2, _("Skip GC BIOS"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS);
+	LockThreads = new wxCheckBox(GeneralPage, ID_LOCKTHREADS, _("Lock threads to cores"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	DSPThread = new wxCheckBox(GeneralPage, ID_DSPTHREAD, _("DSPLLE on thread"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	// Populate the settings
 	sbBasic->Add(CPUThread, 0, wxALL, 5);
@@ -439,37 +434,38 @@ void CConfigMain::CreateGUIControls()
 	
 	// Display page
 	// General display settings
-	sbDisplay = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, wxT("Emulator Display Settings"));
-	wxStaticText* FullscreenResolutionText = new wxStaticText(DisplayPage, wxID_ANY, wxT("Fullscreen Display Resolution:"), wxDefaultPosition, wxDefaultSize, 0);
+	sbDisplay = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Emulator Display Settings"));
+	wxStaticText* FullscreenResolutionText = new wxStaticText(DisplayPage, wxID_ANY, _("Fullscreen Display Resolution:"), wxDefaultPosition, wxDefaultSize, 0);
 	FullscreenResolution = new wxChoice(DisplayPage, ID_DISPLAY_FULLSCREENRES, wxDefaultPosition, wxDefaultSize, arrayStringFor_FullscreenResolution, 0, wxDefaultValidator, arrayStringFor_FullscreenResolution[0]);
-	wxStaticText *WindowSizeText = new wxStaticText(DisplayPage, wxID_ANY, wxT("Window Size:"), wxDefaultPosition, wxDefaultSize, 0);
+	wxStaticText *WindowSizeText = new wxStaticText(DisplayPage, wxID_ANY, _("Window Size:"), wxDefaultPosition, wxDefaultSize, 0);
 	WindowWidth = new wxSpinCtrl(DisplayPage, ID_DISPLAY_WINDOWWIDTH, wxEmptyString, wxDefaultPosition, wxSize(70, -1));
 	WindowWidth->SetRange(0,3280);
 	wxStaticText *WindowXText = new wxStaticText(DisplayPage, wxID_ANY, wxT("x"), wxDefaultPosition, wxDefaultSize, 0);
 	WindowHeight = new wxSpinCtrl(DisplayPage, ID_DISPLAY_WINDOWHEIGHT, wxEmptyString, wxDefaultPosition, wxSize(70, -1));
 	WindowHeight->SetRange(0,2048);
-	Fullscreen = new wxCheckBox(DisplayPage, ID_DISPLAY_FULLSCREEN, wxT("Start Renderer in Fullscreen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	HideCursor = new wxCheckBox(DisplayPage, ID_DISPLAY_HIDECURSOR, wxT("Hide Mouse Cursor"));
-	RenderToMain = new wxCheckBox(DisplayPage, ID_DISPLAY_RENDERTOMAIN, wxT("Render to Main Window"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	ProgressiveScan = new wxCheckBox(DisplayPage, ID_DISPLAY_PROGSCAN, wxT("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	NTSCJ = new wxCheckBox(DisplayPage, ID_DISPLAY_NTSCJ, wxT("Set Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	Fullscreen = new wxCheckBox(DisplayPage, ID_DISPLAY_FULLSCREEN, _("Start Renderer in Fullscreen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	HideCursor = new wxCheckBox(DisplayPage, ID_DISPLAY_HIDECURSOR, _("Hide Mouse Cursor"));
+	RenderToMain = new wxCheckBox(DisplayPage, ID_DISPLAY_RENDERTOMAIN, _("Render to Main Window"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	ProgressiveScan = new wxCheckBox(DisplayPage, ID_DISPLAY_PROGSCAN, _("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	NTSCJ = new wxCheckBox(DisplayPage, ID_DISPLAY_NTSCJ, _("Set Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	// Interface settings
-	sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, wxT("Interface Settings"));
-	ConfirmStop = new wxCheckBox(DisplayPage, ID_INTERFACE_CONFIRMSTOP, wxT("Confirm On Stop"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	UsePanicHandlers = new wxCheckBox(DisplayPage, ID_INTERFACE_USEPANICHANDLERS, wxT("Use Panic Handlers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, _("Interface Settings"));
+	ConfirmStop = new wxCheckBox(DisplayPage, ID_INTERFACE_CONFIRMSTOP, _("Confirm On Stop"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	UsePanicHandlers = new wxCheckBox(DisplayPage, ID_INTERFACE_USEPANICHANDLERS, _("Use Panic Handlers"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	
 	// Themes - this should really be a wxChoice...
-	Theme = new wxRadioBox(DisplayPage, ID_INTERFACE_THEME, wxT("Theme"), wxDefaultPosition, wxDefaultSize, arrayStringFor_Themes, 1, wxRA_SPECIFY_ROWS);
+	Theme = new wxRadioBox(DisplayPage, ID_INTERFACE_THEME, _("Theme"), wxDefaultPosition, wxDefaultSize, arrayStringFor_Themes, 1, wxRA_SPECIFY_ROWS);
 
 	// Interface Language
 	// At the moment this only changes the language displayed in m_gamelistctrl
 	// If someone wants to control the whole GUI's language, it should be set here too
-	wxStaticText* InterfaceLangText = new wxStaticText(DisplayPage, ID_INTERFACE_LANG_TEXT, wxT("Game List Language:"), wxDefaultPosition, wxDefaultSize);
+	wxStaticText* InterfaceLangText = new wxStaticText(DisplayPage, ID_INTERFACE_LANG_TEXT,
+			_("Language:"), wxDefaultPosition, wxDefaultSize);
 	InterfaceLang = new wxChoice(DisplayPage, ID_INTERFACE_LANG, wxDefaultPosition, wxDefaultSize, arrayStringFor_InterfaceLang, 0, wxDefaultValidator);
 
 	// Hotkey configuration
-	HotkeyConfig = new wxButton(DisplayPage, ID_HOTKEY_CONFIG, wxT("Hotkeys"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator);
+	HotkeyConfig = new wxButton(DisplayPage, ID_HOTKEY_CONFIG, _("Hotkeys"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT, wxDefaultValidator);
 
 	// Populate the settings
 	wxBoxSizer* sDisplayRes = new wxBoxSizer(wxHORIZONTAL);
@@ -508,12 +504,12 @@ void CConfigMain::CreateGUIControls()
 
 	// Gamecube page
 	// IPL settings
-	sbGamecubeIPLSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, wxT("IPL Settings"));
-	wxStaticText* GCSystemLangText = new wxStaticText(GamecubePage, ID_GC_SRAM_LNG_TEXT, wxT("System Language:"), wxDefaultPosition, wxDefaultSize);
+	sbGamecubeIPLSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, _("IPL Settings"));
+	wxStaticText* GCSystemLangText = new wxStaticText(GamecubePage, ID_GC_SRAM_LNG_TEXT, _("System Language:"), wxDefaultPosition, wxDefaultSize);
 	GCSystemLang = new wxChoice(GamecubePage, ID_GC_SRAM_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_GCSystemLang, 0, wxDefaultValidator);
 	// Device settings
 	// EXI Devices
-	wxStaticBoxSizer *sbGamecubeDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, wxT("Device Settings"));
+	wxStaticBoxSizer *sbGamecubeDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, GamecubePage, _("Device Settings"));
 	wxStaticText* GCEXIDeviceText[3];
 	GCEXIDeviceText[0] = new wxStaticText(GamecubePage, ID_GC_EXIDEVICE_SLOTA_TEXT, wxT("Slot A"), wxDefaultPosition, wxDefaultSize);
 	GCEXIDeviceText[1] = new wxStaticText(GamecubePage, ID_GC_EXIDEVICE_SLOTB_TEXT, wxT("Slot B"), wxDefaultPosition, wxDefaultSize);
@@ -627,26 +623,26 @@ void CConfigMain::CreateGUIControls()
 
 	// Wii page
 	// Wiimote Settings
-	sbWiimoteSettings = new wxStaticBoxSizer(wxHORIZONTAL, WiiPage, wxT("Wiimote Settings"));
-	wxStaticText* WiiSensBarPosText = new wxStaticText(WiiPage, ID_WII_BT_BAR_TEXT, wxT("Sensor Bar Position:"), wxDefaultPosition, wxDefaultSize);
+	sbWiimoteSettings = new wxStaticBoxSizer(wxHORIZONTAL, WiiPage, _("Wiimote Settings"));
+	wxStaticText* WiiSensBarPosText = new wxStaticText(WiiPage, ID_WII_BT_BAR_TEXT, _("Sensor Bar Position:"), wxDefaultPosition, wxDefaultSize);
 	WiiSensBarPos = new wxChoice(WiiPage, ID_WII_BT_BAR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSensBarPos, 0, wxDefaultValidator);
-	wxStaticText* WiiSensBarSensText = new wxStaticText(WiiPage, ID_WII_BT_SENS_TEXT, wxT("IR Sensitivity:"), wxDefaultPosition, wxDefaultSize);
+	wxStaticText* WiiSensBarSensText = new wxStaticText(WiiPage, ID_WII_BT_SENS_TEXT, _("IR Sensitivity:"), wxDefaultPosition, wxDefaultSize);
 	WiiSensBarSens = new wxSlider(WiiPage, ID_WII_BT_SENS, 0, 0, 4);
-	WiimoteMotor = new wxCheckBox(WiiPage, ID_WII_BT_MOT, wxT("Wiimote Motor"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	WiimoteMotor = new wxCheckBox(WiiPage, ID_WII_BT_MOT, _("Wiimote Motor"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	// Misc Settings
-	sbWiiIPLSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, wxT("Misc Settings"));
-	WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, wxT("Enable Screen Saver (burn-in reduction)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, wxT("Use EuRGB60 Mode (PAL60)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	wxStaticText* WiiAspectRatioText = new wxStaticText(WiiPage, ID_WII_IPL_AR_TEXT, wxT("Aspect Ratio:"), wxDefaultPosition, wxDefaultSize);
+	sbWiiIPLSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, _("Misc Settings"));
+	WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, _("Enable Screen Saver (burn-in reduction)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, _("Use EuRGB60 Mode (PAL60)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	wxStaticText* WiiAspectRatioText = new wxStaticText(WiiPage, ID_WII_IPL_AR_TEXT, _("Aspect Ratio:"), wxDefaultPosition, wxDefaultSize);
 	WiiAspectRatio = new wxChoice(WiiPage, ID_WII_IPL_AR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiAspectRatio, 0, wxDefaultValidator);
-	wxStaticText* WiiSystemLangText = new wxStaticText(WiiPage, ID_WII_IPL_LNG_TEXT, wxT("System Language:"), wxDefaultPosition, wxDefaultSize);
+	wxStaticText* WiiSystemLangText = new wxStaticText(WiiPage, ID_WII_IPL_LNG_TEXT, _("System Language:"), wxDefaultPosition, wxDefaultSize);
 	WiiSystemLang = new wxChoice(WiiPage, ID_WII_IPL_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSystemLang, 0, wxDefaultValidator);
 
 	// Device Settings
-	sbWiiDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, wxT("Device Settings"));
-	WiiSDCard = new wxCheckBox(WiiPage, ID_WII_SD_CARD, wxT("Insert SD Card"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	WiiKeyboard = new wxCheckBox(WiiPage, ID_WII_KEYBOARD, wxT("Connect USB Keyboard"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	sbWiiDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, _("Device Settings"));
+	WiiSDCard = new wxCheckBox(WiiPage, ID_WII_SD_CARD, _("Insert SD Card"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	WiiKeyboard = new wxCheckBox(WiiPage, ID_WII_KEYBOARD, _("Connect USB Keyboard"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	// Populate the settings
 	sWiimoteSettings = new wxGridBagSizer();
@@ -679,21 +675,21 @@ void CConfigMain::CreateGUIControls()
 
 	
 	// Paths page
-	sbISOPaths = new wxStaticBoxSizer(wxVERTICAL, PathsPage, wxT("ISO Directories"));
+	sbISOPaths = new wxStaticBoxSizer(wxVERTICAL, PathsPage, _("ISO Directories"));
 	ISOPaths = new wxListBox(PathsPage, ID_ISOPATHS, wxDefaultPosition, wxDefaultSize, arrayStringFor_ISOPaths, wxLB_SINGLE, wxDefaultValidator);
-	RecursiveISOPath = new wxCheckBox(PathsPage, ID_RECURSIVEISOPATH, wxT("Search Subfolders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
-	AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, wxT("Add..."), wxDefaultPosition, wxDefaultSize, 0);
-	RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, wxT("Remove"), wxDefaultPosition, wxDefaultSize, 0);
+	RecursiveISOPath = new wxCheckBox(PathsPage, ID_RECURSIVEISOPATH, _("Search Subfolders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, _("Add..."), wxDefaultPosition, wxDefaultSize, 0);
+	RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, _("Remove"), wxDefaultPosition, wxDefaultSize, 0);
 	RemoveISOPath->Enable(false);
 
-	wxStaticText* DefaultISOText = new wxStaticText(PathsPage, ID_DEFAULTISO_TEXT, wxT("Default ISO:"), wxDefaultPosition, wxDefaultSize);
-	DefaultISO = new wxFilePickerCtrl(PathsPage, ID_DEFAULTISO, wxEmptyString, wxT("Choose a default ISO:"),
+	wxStaticText* DefaultISOText = new wxStaticText(PathsPage, ID_DEFAULTISO_TEXT, _("Default ISO:"), wxDefaultPosition, wxDefaultSize);
+	DefaultISO = new wxFilePickerCtrl(PathsPage, ID_DEFAULTISO, wxEmptyString, _("Choose a default ISO:"),
 		wxString::Format(wxT("All GC/Wii images (gcm, iso, ciso, gcz)|*.gcm;*.iso;*.ciso;*.gcz|All files (%s)|%s"), wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr),
 		wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
-	wxStaticText* DVDRootText = new wxStaticText(PathsPage, ID_DVDROOT_TEXT, wxT("DVD Root:"), wxDefaultPosition, wxDefaultSize);
-	DVDRoot = new wxDirPickerCtrl(PathsPage, ID_DVDROOT, wxEmptyString, wxT("Choose a DVD root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL);
-	wxStaticText* ApploaderPathText = new wxStaticText(PathsPage, ID_APPLOADERPATH_TEXT, wxT("Apploader:"), wxDefaultPosition, wxDefaultSize);
-	ApploaderPath = new wxFilePickerCtrl(PathsPage, ID_APPLOADERPATH, wxEmptyString, wxT("Choose file to use as apploader: (applies to discs constructed from directories only)"),
+	wxStaticText* DVDRootText = new wxStaticText(PathsPage, ID_DVDROOT_TEXT, _("DVD Root:"), wxDefaultPosition, wxDefaultSize);
+	DVDRoot = new wxDirPickerCtrl(PathsPage, ID_DVDROOT, wxEmptyString, _("Choose a DVD root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL);
+	wxStaticText* ApploaderPathText = new wxStaticText(PathsPage, ID_APPLOADERPATH_TEXT, _("Apploader:"), wxDefaultPosition, wxDefaultSize);
+	ApploaderPath = new wxFilePickerCtrl(PathsPage, ID_APPLOADERPATH, wxEmptyString, _("Choose file to use as apploader: (applies to discs constructed from directories only)"),
 		wxString::Format(wxT("apploader (.img)|*.img|All files (%s)|%s"), wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr),
 		wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
 
@@ -724,13 +720,13 @@ void CConfigMain::CreateGUIControls()
 
 	
 	// Plugins page
-	sbGraphicsPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginsPage, wxT("Graphics"));
+	sbGraphicsPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginsPage, _("Graphics"));
 	GraphicSelection = new wxChoice(PluginsPage, ID_GRAPHIC_CB, wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
-	GraphicConfig = new wxButton(PluginsPage, ID_GRAPHIC_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	GraphicConfig = new wxButton(PluginsPage, ID_GRAPHIC_CONFIG, _("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
-	sbDSPPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginsPage, wxT("DSP"));
+	sbDSPPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginsPage, _("DSP"));
 	DSPSelection = new wxChoice(PluginsPage, ID_DSP_CB, wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
-	DSPConfig = new wxButton(PluginsPage, ID_DSP_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	DSPConfig = new wxButton(PluginsPage, ID_DSP_CONFIG, _("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	// Populate the settings
 	sbGraphicsPlugin->Add(GraphicSelection, 1, wxEXPAND|wxALL, 5);
@@ -870,6 +866,9 @@ void CConfigMain::DisplaySettingsChanged(wxCommandEvent& event)
 		main_frame->InitBitmaps();
 		break;
 	case ID_INTERFACE_LANG:
+		if (SConfig::GetInstance().m_InterfaceLanguage !=
+				(INTERFACE_LANGUAGE)InterfaceLang->GetSelection())
+			SuccessAlert("You must restart Dolphin in order for the change to take effect.");
 		SConfig::GetInstance().m_InterfaceLanguage = (INTERFACE_LANGUAGE)InterfaceLang->GetSelection();
 		bRefreshList = true;
 		break;
@@ -927,11 +926,11 @@ void CConfigMain::GCSettingsChanged(wxCommandEvent& event)
 void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA)
 {
 	std::string filename = std::string(wxFileSelector(
-		wxT("Choose a file to open"),
+		_("Choose a file to open"),
 		wxString::From8BitData(File::GetUserPath(D_GCUSER_IDX)),
 		isSlotA ? wxT(GC_MEMCARDA) : wxT(GC_MEMCARDB),
 		wxEmptyString,
-		wxT("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp")).mb_str());
+		_("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp")).mb_str());
 
 	if (!filename.empty())
 	{
@@ -1078,7 +1077,7 @@ void CConfigMain::AddRemoveISOPaths(wxCommandEvent& event)
 {
 	if (event.GetId() == ID_ADDISOPATH)
 	{
-		wxDirDialog dialog(this, _T("Choose a directory to add"), wxGetHomeDir(),
+		wxDirDialog dialog(this, _("Choose a directory to add"), wxGetHomeDir(),
 				wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST);
 
 		if (dialog.ShowModal() == wxID_OK)

Source/Core/DolphinWX/Src/ConfigMain.h

@@ -33,7 +33,7 @@ public:
 
 	CConfigMain(wxWindow* parent,
 		wxWindowID id = 1,
-		const wxString& title = wxT("Dolphin Configuration"),
+		const wxString& title = _("Dolphin Configuration"),
 		const wxPoint& pos = wxDefaultPosition,
 		const wxSize& size = wxDefaultSize,
 		long style = wxDEFAULT_DIALOG_STYLE);

Source/Core/DolphinWX/Src/Frame.cpp

@@ -171,11 +171,8 @@ CPanel::CPanel(
 							// The Wiimote has been disconnected, we offer reconnect here.
 							wxMessageDialog *dlg = new wxMessageDialog(
 								this,
-								wxString::Format(wxT("Wiimote %i has been disconnected by system.\n")
-								wxT("Maybe this game doesn't support multi-wiimote,\n")
-								wxT("or maybe it is due to idle time out or other reason.\n\n")
-								wxT("Do you want to reconnect immediately?"), wiimote_num),
-								wxT("Reconnect Wiimote Confirm"),
+								wxString::Format(_("Wiimote %i has been disconnected by system.\nMaybe this game doesn't support multi-wiimote,\nor maybe it is due to idle time out or other reason.\nDo you want to reconnect immediately?"), wiimote_num),
+								_("Reconnect Wiimote Confirm"),
 								wxYES_NO | wxSTAY_ON_TOP | wxICON_INFORMATION, //wxICON_QUESTION,
 								wxDefaultPosition);
 
@@ -409,17 +406,17 @@ CFrame::CFrame(wxFrame* parent,
 	if (g_pCodeWindow)
 	{
 		m_Mgr->AddPane(m_Panel, wxAuiPaneInfo()
-				.Name(wxT("Pane 0")).Caption(wxT("Pane 0"))
+				.Name(_("Pane 0")).Caption(_("Pane 0"))
 				.CenterPane().PaneBorder(false).Show());
 		AuiFullscreen = m_Mgr->SavePerspective();
 	}
 	else
 	{
 		m_Mgr->AddPane(m_Panel, wxAuiPaneInfo()
-				.Name(wxT("Pane 0")).Caption(wxT("Pane 0")).PaneBorder(false)
+				.Name(_("Pane 0")).Caption(_("Pane 0")).PaneBorder(false)
 				.CaptionVisible(false).Layer(0).Center().Show());
 		m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo()
-				.Name(wxT("Pane 1")).Caption(wxT("Logging")).CaptionVisible(true)
+				.Name(_("Pane 1")).Caption(_("Logging")).CaptionVisible(true)
 				.Layer(0).FloatingSize(wxSize(600, 350)).CloseButton(true).Hide());
 		AuiFullscreen = m_Mgr->SavePerspective();
 	}
@@ -659,7 +656,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
 #ifdef __WXGTK__
 	case IDM_PANIC:
 		bPanicResult = (wxYES == wxMessageBox(event.GetString(), 
-					wxT("Warning"), event.GetInt() ? wxYES_NO : wxOK, this));
+					_("Warning"), event.GetInt() ? wxYES_NO : wxOK, this));
 		panic_event.Set();
 		break;
 #endif
@@ -825,7 +822,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 			GetMenuBar()->Check(IDM_CONNECT_WIIMOTE1 + WiimoteId, !bNoWiimoteMsg);
 			GetUsbPointer()->AccessWiiMote(WiimoteId | 0x100)->Activate(!bNoWiimoteMsg);
 			wxString msg(wxString::Format(wxT("Wiimote %i %s"), WiimoteId + 1,
-						bNoWiimoteMsg ?  wxT("Disconnected") : wxT("Connected")));
+						bNoWiimoteMsg ?  _("Disconnected") : _("Connected")));
 			Core::DisplayMessage(msg.ToAscii(), 3000);
 		}
 

Source/Core/DolphinWX/Src/FrameAui.cpp

@@ -78,11 +78,11 @@ void CFrame::OnPaneClose(wxAuiManagerEvent& event)
 	else
 	{
 		if (GetNotebookCount() == 1)
-			wxMessageBox(wxT("At least one pane must remain open."),
-					wxT("Notice"), wxOK, this);
+			wxMessageBox(_("At least one pane must remain open."),
+					_("Notice"), wxOK, this);
 		else if (nb->GetPageCount() != 0 && !nb->GetPageText(0).IsSameAs(wxT("<>")))
-			wxMessageBox(wxT("You can't close panes that have pages in them."),
-					wxT("Notice"), wxOK, this);
+			wxMessageBox(_("You can't close panes that have pages in them."),
+					_("Notice"), wxOK, this);
 		else
 		{
 			// Detach and delete the empty notebook
@@ -335,7 +335,7 @@ void CFrame::OnTab(wxAuiNotebookEvent& event)
 	wxMenu* MenuPopup = new wxMenu;
 
 	wxMenuItem* Item =  new wxMenuItem(MenuPopup, wxID_ANY,
-			wxT("Select floating windows"));
+			_("Select floating windows"));
 	MenuPopup->Append(Item);
 	Item->Enable(false);
 	MenuPopup->Append(new wxMenuItem(MenuPopup));
@@ -378,20 +378,20 @@ void CFrame::TogglePane()
 	{
 		if (NB->GetPageCount() == 0)
 		{
-			m_LogWindow->x = m_Mgr->GetPane(wxT("Pane 1")).rect.GetWidth();
-			m_LogWindow->y = m_Mgr->GetPane(wxT("Pane 1")).rect.GetHeight();
-			m_LogWindow->winpos = m_Mgr->GetPane(wxT("Pane 1")).dock_direction;
-			m_Mgr->GetPane(wxT("Pane 1")).Hide();
+			m_LogWindow->x = m_Mgr->GetPane(_("Pane 1")).rect.GetWidth();
+			m_LogWindow->y = m_Mgr->GetPane(_("Pane 1")).rect.GetHeight();
+			m_LogWindow->winpos = m_Mgr->GetPane(_("Pane 1")).dock_direction;
+			m_Mgr->GetPane(_("Pane 1")).Hide();
 		}
 		else
 		{
-			m_Mgr->GetPane(wxT("Pane 1")).BestSize(m_LogWindow->x, m_LogWindow->y)
+			m_Mgr->GetPane(_("Pane 1")).BestSize(m_LogWindow->x, m_LogWindow->y)
 				.MinSize(m_LogWindow->x, m_LogWindow->y)
 				.Direction(m_LogWindow->winpos).Show();
 			m_Mgr->Update();
 
 			// Reset the minimum size of the pane
-			m_Mgr->GetPane(wxT("Pane 1")).MinSize(-1, -1);
+			m_Mgr->GetPane(_("Pane 1")).MinSize(-1, -1);
 		}
 		m_Mgr->Update();
 	}
@@ -464,14 +464,14 @@ void CFrame::OnDropDownSettingsToolbar(wxAuiToolBarEvent& event)
 		wxMenu* menuPopup = new wxMenu;
 
 		wxMenuItem* Item =  new wxMenuItem(menuPopup, IDM_PERSPECTIVES_ADD_PANE,
-				wxT("Add new pane"));
+				_("Add new pane"));
 		menuPopup->Append(Item);
 		menuPopup->Append(new wxMenuItem(menuPopup));
-		Item = new wxMenuItem(menuPopup, IDM_TAB_SPLIT, wxT("Tab split"),
+		Item = new wxMenuItem(menuPopup, IDM_TAB_SPLIT, _("Tab split"),
 				wxT(""), wxITEM_CHECK);
 		menuPopup->Append(Item);
 		Item->Check(m_bTabSplit);
-		Item = new wxMenuItem(menuPopup, IDM_NO_DOCKING, wxT("No docking"),
+		Item = new wxMenuItem(menuPopup, IDM_NO_DOCKING, _("No docking"),
 				wxT(""), wxITEM_CHECK);
 		menuPopup->Append(Item);
 		Item->Check(m_bNoDocking);
@@ -500,7 +500,7 @@ void CFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& event)
 		// create the popup menu
 		wxMenu* menuPopup = new wxMenu;
 		wxMenuItem* Item = new wxMenuItem(menuPopup, IDM_ADD_PERSPECTIVE,
-				wxT("Create new perspective"));
+				_("Create new perspective"));
 		menuPopup->Append(Item);
 
 		if (Perspectives.size() > 0)
@@ -536,8 +536,8 @@ void CFrame::OnToolBar(wxCommandEvent& event)
 		case IDM_SAVE_PERSPECTIVE:
 			if (Perspectives.size() == 0)
 			{
-				wxMessageBox(wxT("Please create a perspective before saving"),
-						wxT("Notice"), wxOK, this);
+				wxMessageBox(_("Please create a perspective before saving"),
+						_("Notice"), wxOK, this);
 				return;
 			}
 			SaveIniPerspectives();
@@ -564,8 +564,8 @@ void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
 		case IDM_ADD_PERSPECTIVE:
 			{
 				wxTextEntryDialog dlg(this,
-						wxT("Enter a name for the new perspective:"),
-						wxT("Create new perspective"));
+						_("Enter a name for the new perspective:"),
+						_("Create new perspective"));
 				wxString DefaultValue = wxString::Format(wxT("Perspective %d"),
 						Perspectives.size() + 1);
 				dlg.SetValue(DefaultValue);
@@ -577,16 +577,16 @@ void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
 						return;
 					else if (dlg.GetValue().Find(wxT(",")) != -1)
 					{
-						wxMessageBox(wxT("The name can not contain the character ','"),
-								wxT("Notice"), wxOK, this);
+						wxMessageBox(_("The name can not contain the character ','"),
+								_("Notice"), wxOK, this);
 						wxString Str = dlg.GetValue();
 						Str.Replace(wxT(","), wxT(""), true);
 						dlg.SetValue(Str);
 					}
 					else if (dlg.GetValue().IsSameAs(wxT("")))
 					{
-						wxMessageBox(wxT("The name can not be empty"),
-								wxT("Notice"), wxOK, this);
+						wxMessageBox(_("The name can not be empty"),
+								_("Notice"), wxOK, this);
 						dlg.SetValue(DefaultValue);
 					}
 					else

Source/Core/DolphinWX/Src/FrameTools.cpp

@@ -106,11 +106,11 @@ void CFrame::CreateMenu()
 
 	// file menu
 	wxMenu* fileMenu = new wxMenu;
-	fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl+O"));
-	fileMenu->Append(IDM_CHANGEDISC, _T("Change &Disc..."));
+	fileMenu->Append(wxID_OPEN, _("&Open...\tCtrl+O"));
+	fileMenu->Append(IDM_CHANGEDISC, _("Change &Disc..."));
 
 	wxMenu *externalDrive = new wxMenu;
-	fileMenu->Append(IDM_DRIVES, _T("&Boot from DVD Drive..."), externalDrive);
+	fileMenu->Append(IDM_DRIVES, _("&Boot from DVD Drive..."), externalDrive);
 	
 	drives = cdio_get_devices();
 	// Windows Limitation of 24 character drives
@@ -119,32 +119,32 @@ void CFrame::CreateMenu()
 	}
 
 	fileMenu->AppendSeparator();
-	fileMenu->Append(wxID_REFRESH, _T("&Refresh List"));
+	fileMenu->Append(wxID_REFRESH, _("&Refresh List"));
 	fileMenu->AppendSeparator();
-	fileMenu->Append(IDM_BROWSE, _T("&Browse for ISOs..."));
+	fileMenu->Append(IDM_BROWSE, _("&Browse for ISOs..."));
 	fileMenu->AppendSeparator();
-	fileMenu->Append(wxID_EXIT, _T("E&xit\tAlt+F4"));
-	m_MenuBar->Append(fileMenu, _T("&File"));
+	fileMenu->Append(wxID_EXIT, _("E&xit\tAlt+F4"));
+	m_MenuBar->Append(fileMenu, _("&File"));
 
 	// Emulation menu
 	wxMenu* emulationMenu = new wxMenu;
 	emulationMenu->Append(IDM_PLAY, GetMenuLabel(HK_PLAY_PAUSE));
 	emulationMenu->Append(IDM_STOP, GetMenuLabel(HK_STOP));
-	emulationMenu->Append(IDM_RESET, _T("&Reset"));
+	emulationMenu->Append(IDM_RESET, _("&Reset"));
 	emulationMenu->AppendSeparator();
 	emulationMenu->Append(IDM_TOGGLE_FULLSCREEN, GetMenuLabel(HK_FULLSCREEN));	
 	emulationMenu->AppendSeparator();
-	emulationMenu->Append(IDM_RECORD, _T("Start Re&cording"));
-	emulationMenu->Append(IDM_PLAYRECORD, _T("P&lay Recording..."));
-	emulationMenu->Append(IDM_RECORDEXPORT, _T("Export Recording..."));
+	emulationMenu->Append(IDM_RECORD, _("Start Re&cording"));
+	emulationMenu->Append(IDM_PLAYRECORD, _("P&lay Recording..."));
+	emulationMenu->Append(IDM_RECORDEXPORT, _("Export Recording..."));
 	emulationMenu->AppendSeparator();
 	
-	emulationMenu->Append(IDM_FRAMESTEP, _T("&Frame Stepping"), wxEmptyString, wxITEM_CHECK);
+	emulationMenu->Append(IDM_FRAMESTEP, _("&Frame Stepping"), wxEmptyString, wxITEM_CHECK);
 
 	wxMenu *skippingMenu = new wxMenu;
-	emulationMenu->AppendSubMenu(skippingMenu, _T("Frame S&kipping"));
+	emulationMenu->AppendSubMenu(skippingMenu, _("Frame S&kipping"));
 	for(int i = 0; i < 10; i++)
-		skippingMenu->Append(IDM_FRAMESKIP0 + i, wxString::Format(_T("%i"), i), wxEmptyString, wxITEM_RADIO);
+		skippingMenu->Append(IDM_FRAMESKIP0 + i, wxString::Format(wxT("%i"), i), wxEmptyString, wxITEM_RADIO);
 
 	emulationMenu->AppendSeparator();
 	emulationMenu->Append(IDM_SCREENSHOT, GetMenuLabel(HK_SCREENSHOT));
@@ -152,64 +152,64 @@ void CFrame::CreateMenu()
 	emulationMenu->AppendSeparator();
 	wxMenu *saveMenu = new wxMenu;
 	wxMenu *loadMenu = new wxMenu;
-	emulationMenu->Append(IDM_LOADSTATE, _T("&Load State"), loadMenu);
-	emulationMenu->Append(IDM_SAVESTATE, _T("Sa&ve State"), saveMenu);
+	emulationMenu->Append(IDM_LOADSTATE, _("&Load State"), loadMenu);
+	emulationMenu->Append(IDM_SAVESTATE, _("Sa&ve State"), saveMenu);
 
-	saveMenu->Append(IDM_SAVESTATEFILE, _T("Save State..."));
-	loadMenu->Append(IDM_UNDOSAVESTATE, _T("Last Overwritten State\tShift+F12"));
+	saveMenu->Append(IDM_SAVESTATEFILE, _("Save State..."));
+	loadMenu->Append(IDM_UNDOSAVESTATE, _("Last Overwritten State\tShift+F12"));
 	saveMenu->AppendSeparator();
 
-	loadMenu->Append(IDM_LOADSTATEFILE, _T("Load State..."));
+	loadMenu->Append(IDM_LOADSTATEFILE, _("Load State..."));
 
 	// Reserve F11 for the "step into" function in the debugger
 	if (g_pCodeWindow)
-		loadMenu->Append(IDM_LOADLASTSTATE, _T("Last Saved State"));
+		loadMenu->Append(IDM_LOADLASTSTATE, _("Last Saved State"));
 	else
-		loadMenu->Append(IDM_LOADLASTSTATE, _T("Last Saved State\tF11"));
+		loadMenu->Append(IDM_LOADLASTSTATE, _("Last Saved State\tF11"));
 	
-	loadMenu->Append(IDM_UNDOLOADSTATE, _T("Undo Load State\tF12"));
+	loadMenu->Append(IDM_UNDOLOADSTATE, _("Undo Load State\tF12"));
 	loadMenu->AppendSeparator();
 
 	for (int i = 1; i <= 8; i++) {
-		loadMenu->Append(IDM_LOADSLOT1 + i - 1, wxString::Format(_T("Slot %i\tF%i"), i, i));
-		saveMenu->Append(IDM_SAVESLOT1 + i - 1, wxString::Format(_T("Slot %i\tShift+F%i"), i, i));
+		loadMenu->Append(IDM_LOADSLOT1 + i - 1, wxString::Format(wxT("Slot %i\tF%i"), i, i));
+		saveMenu->Append(IDM_SAVESLOT1 + i - 1, wxString::Format(wxT("Slot %i\tShift+F%i"), i, i));
 	}
-	m_MenuBar->Append(emulationMenu, _T("&Emulation"));
+	m_MenuBar->Append(emulationMenu, _("&Emulation"));
 
 	// Options menu
 	wxMenu* pOptionsMenu = new wxMenu;
-	pOptionsMenu->Append(wxID_PREFERENCES, _T("Co&nfigure..."));
+	pOptionsMenu->Append(wxID_PREFERENCES, _("Co&nfigure..."));
 	pOptionsMenu->AppendSeparator();
-	pOptionsMenu->Append(IDM_CONFIG_GFX_PLUGIN, _T("&Graphics Settings"));
-	pOptionsMenu->Append(IDM_CONFIG_DSP_PLUGIN, _T("&DSP Settings"));
-	pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _T("&Gamecube Pad Settings"));
-	pOptionsMenu->Append(IDM_CONFIG_WIIMOTE_PLUGIN, _T("&Wiimote Settings"));
+	pOptionsMenu->Append(IDM_CONFIG_GFX_PLUGIN, _("&Graphics Settings"));
+	pOptionsMenu->Append(IDM_CONFIG_DSP_PLUGIN, _("&DSP Settings"));
+	pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _("&Gamecube Pad Settings"));
+	pOptionsMenu->Append(IDM_CONFIG_WIIMOTE_PLUGIN, _("&Wiimote Settings"));
 	if (g_pCodeWindow)
 	{
 		pOptionsMenu->AppendSeparator();
 		g_pCodeWindow->CreateMenuOptions(pOptionsMenu);	
 	}
-	m_MenuBar->Append(pOptionsMenu, _T("&Options"));
+	m_MenuBar->Append(pOptionsMenu, _("&Options"));
 
 	// Tools menu
 	wxMenu* toolsMenu = new wxMenu;
-	toolsMenu->Append(IDM_LUA, _T("New &Lua Console"));
-	toolsMenu->Append(IDM_MEMCARD, _T("&Memcard Manager (GC)"));
-	toolsMenu->Append(IDM_IMPORTSAVE, _T("Wii Save Import"));
-	toolsMenu->Append(IDM_CHEATS, _T("&Cheats Manager"));
+	toolsMenu->Append(IDM_LUA, _("New &Lua Console"));
+	toolsMenu->Append(IDM_MEMCARD, _("&Memcard Manager (GC)"));
+	toolsMenu->Append(IDM_IMPORTSAVE, _("Wii Save Import"));
+	toolsMenu->Append(IDM_CHEATS, _("&Cheats Manager"));
 
-	toolsMenu->Append(IDM_NETPLAY, _T("Start &NetPlay"));
+	toolsMenu->Append(IDM_NETPLAY, _("Start &NetPlay"));
 
 	if (DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).IsValid())
 	{
 		int sysmenuVersion = DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).GetTitleVersion();
 		char sysmenuRegion = DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).GetCountryChar();
 		
-		toolsMenu->Append(IDM_LOAD_WII_MENU, wxString::Format(_T("Load Wii System Menu (%d %c)"), sysmenuVersion, sysmenuRegion));
+		toolsMenu->Append(IDM_LOAD_WII_MENU, wxString::Format(wxT("Load Wii System Menu (%d %c)"), sysmenuVersion, sysmenuRegion));
 	}
 	else
 	{
-		toolsMenu->Append(IDM_INSTALL_WII_MENU, _T("Install Wii Menu"));
+		toolsMenu->Append(IDM_INSTALL_WII_MENU, _("Install Wii Menu"));
 	}
 	toolsMenu->AppendSeparator();
 	toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE1, GetMenuLabel(HK_WIIMOTE1_CONNECT));
@@ -217,16 +217,16 @@ void CFrame::CreateMenu()
 	toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE3, GetMenuLabel(HK_WIIMOTE3_CONNECT));
 	toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE4, GetMenuLabel(HK_WIIMOTE4_CONNECT));
 
-	m_MenuBar->Append(toolsMenu, _T("&Tools"));
+	m_MenuBar->Append(toolsMenu, _("&Tools"));
 
 	wxMenu* viewMenu = new wxMenu;
-	viewMenu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _T("Show &Toolbar"));
+	viewMenu->AppendCheckItem(IDM_TOGGLE_TOOLBAR, _("Show &Toolbar"));
 	viewMenu->Check(IDM_TOGGLE_TOOLBAR, SConfig::GetInstance().m_InterfaceToolbar);
-	viewMenu->AppendCheckItem(IDM_TOGGLE_STATUSBAR, _T("Show &Statusbar"));
+	viewMenu->AppendCheckItem(IDM_TOGGLE_STATUSBAR, _("Show &Statusbar"));
 	viewMenu->Check(IDM_TOGGLE_STATUSBAR, SConfig::GetInstance().m_InterfaceStatusbar);
 	viewMenu->AppendSeparator();
-	viewMenu->AppendCheckItem(IDM_LOGWINDOW, _T("Show &Logwindow"));
-	viewMenu->AppendCheckItem(IDM_CONSOLEWINDOW, _T("Show &Console"));
+	viewMenu->AppendCheckItem(IDM_LOGWINDOW, _("Show &Logwindow"));
+	viewMenu->AppendCheckItem(IDM_CONSOLEWINDOW, _("Show &Console"));
 	viewMenu->AppendSeparator();
 
 	if (g_pCodeWindow)
@@ -235,12 +235,12 @@ void CFrame::CreateMenu()
 		viewMenu->Check(IDM_CONSOLEWINDOW, g_pCodeWindow->bShowOnStart[1]);
 
 		const wxString MenuText[] = {
-			wxT("&Registers"),
-			wxT("&Breakpoints"),
-			wxT("&Memory"),
-			wxT("&JIT"),
-			wxT("&Sound"),
-			wxT("&Video")
+			_("&Registers"),
+			_("&Breakpoints"),
+			_("&Memory"),
+			_("&JIT"),
+			_("&Sound"),
+			_("&Video")
 		};
 
 		for (int i = IDM_REGISTERWINDOW; i <= IDM_VIDEOWINDOW; i++)
@@ -258,49 +258,49 @@ void CFrame::CreateMenu()
 	}
 
 	wxMenu *platformMenu = new wxMenu;
-	viewMenu->AppendSubMenu(platformMenu, _T("Show Platforms"));
-	platformMenu->AppendCheckItem(IDM_LISTWII, _T("Show Wii"));
+	viewMenu->AppendSubMenu(platformMenu, _("Show Platforms"));
+	platformMenu->AppendCheckItem(IDM_LISTWII, _("Show Wii"));
 	platformMenu->Check(IDM_LISTWII, SConfig::GetInstance().m_ListWii);
-	platformMenu->AppendCheckItem(IDM_LISTGC, _T("Show GameCube"));
+	platformMenu->AppendCheckItem(IDM_LISTGC, _("Show GameCube"));
 	platformMenu->Check(IDM_LISTGC, SConfig::GetInstance().m_ListGC);
-	platformMenu->AppendCheckItem(IDM_LISTWAD, _T("Show Wad"));
+	platformMenu->AppendCheckItem(IDM_LISTWAD, _("Show Wad"));
 	platformMenu->Check(IDM_LISTWAD, SConfig::GetInstance().m_ListWad);
 
 	wxMenu *regionMenu = new wxMenu;
-	viewMenu->AppendSubMenu(regionMenu, _T("Show Regions"));
-	regionMenu->AppendCheckItem(IDM_LISTJAP, _T("Show JAP"));
+	viewMenu->AppendSubMenu(regionMenu, _("Show Regions"));
+	regionMenu->AppendCheckItem(IDM_LISTJAP, _("Show JAP"));
 	regionMenu->Check(IDM_LISTJAP, SConfig::GetInstance().m_ListJap);
-	regionMenu->AppendCheckItem(IDM_LISTPAL, _T("Show PAL"));
+	regionMenu->AppendCheckItem(IDM_LISTPAL, _("Show PAL"));
 	regionMenu->Check(IDM_LISTPAL, SConfig::GetInstance().m_ListPal);
-	regionMenu->AppendCheckItem(IDM_LISTUSA, _T("Show USA"));
+	regionMenu->AppendCheckItem(IDM_LISTUSA, _("Show USA"));
 	regionMenu->Check(IDM_LISTUSA, SConfig::GetInstance().m_ListUsa);
 	regionMenu->AppendSeparator();
-	regionMenu->AppendCheckItem(IDM_LISTFRANCE, _T("Show France"));
+	regionMenu->AppendCheckItem(IDM_LISTFRANCE, _("Show France"));
 	regionMenu->Check(IDM_LISTFRANCE, SConfig::GetInstance().m_ListFrance);
-	regionMenu->AppendCheckItem(IDM_LISTITALY, _T("Show Italy"));
+	regionMenu->AppendCheckItem(IDM_LISTITALY, _("Show Italy"));
 	regionMenu->Check(IDM_LISTITALY, SConfig::GetInstance().m_ListItaly);
-	regionMenu->AppendCheckItem(IDM_LISTKOREA, _T("Show Korea"));
+	regionMenu->AppendCheckItem(IDM_LISTKOREA, _("Show Korea"));
 	regionMenu->Check(IDM_LISTKOREA, SConfig::GetInstance().m_ListKorea);
-	regionMenu->AppendCheckItem(IDM_LISTTAIWAN, _T("Show Taiwan"));
+	regionMenu->AppendCheckItem(IDM_LISTTAIWAN, _("Show Taiwan"));
 	regionMenu->Check(IDM_LISTTAIWAN, SConfig::GetInstance().m_ListTaiwan);
-	regionMenu->AppendCheckItem(IDM_LIST_UNK, _T("Show unknown"));
+	regionMenu->AppendCheckItem(IDM_LIST_UNK, _("Show unknown"));
 	regionMenu->Check(IDM_LIST_UNK, SConfig::GetInstance().m_ListUnknown);
-	viewMenu->AppendCheckItem(IDM_LISTDRIVES, _T("Show Drives"));
+	viewMenu->AppendCheckItem(IDM_LISTDRIVES, _("Show Drives"));
 	viewMenu->Check(IDM_LISTDRIVES, SConfig::GetInstance().m_ListDrives);
-	viewMenu->Append(IDM_PURGECACHE, _T("Purge Cache"));
-	m_MenuBar->Append(viewMenu, _T("&View"));	
+	viewMenu->Append(IDM_PURGECACHE, _("Purge Cache"));
+	m_MenuBar->Append(viewMenu, _("&View"));	
 
 	if (g_pCodeWindow) g_pCodeWindow->CreateMenu(SConfig::GetInstance().m_LocalCoreStartupParameter, m_MenuBar);
 
 	// Help menu
 	wxMenu* helpMenu = new wxMenu;
 	// Re-enable when there's something useful to display */
-	// helpMenu->Append(wxID_HELP, _T("&Help"));
-	helpMenu->Append(IDM_HELPWEBSITE, _T("Dolphin &Web Site"));
-	helpMenu->Append(IDM_HELPGOOGLECODE, _T("Dolphin at &Google Code"));
+	// helpMenu->Append(wxID_HELP, _("&Help"));
+	helpMenu->Append(IDM_HELPWEBSITE, _("Dolphin &Web Site"));
+	helpMenu->Append(IDM_HELPGOOGLECODE, _("Dolphin at &Google Code"));
 	helpMenu->AppendSeparator();
-	helpMenu->Append(wxID_ABOUT, _T("&About..."));
-	m_MenuBar->Append(helpMenu, _T("&Help"));
+	helpMenu->Append(wxID_ABOUT, _("&About..."));
+	m_MenuBar->Append(helpMenu, _("&Help"));
 
 	// Associate the menu bar with the frame
 	SetMenuBar(m_MenuBar);
@@ -312,25 +312,25 @@ wxString CFrame::GetMenuLabel(int Id)
 	switch (Id)
 	{
 		case HK_FULLSCREEN:
-			Label = _T("&Fullscreen\t");
+			Label = _("&Fullscreen\t");
 			break;
 		case HK_PLAY_PAUSE:
 			if (Core::GetState() == Core::CORE_RUN)
-				Label = _T("&Pause\t");
+				Label = _("&Pause\t");
 			else
-				Label = _T("&Play\t");
+				Label = _("&Play\t");
 			break;
 		case HK_STOP:
-			Label = _T("&Stop\t");
+			Label = _("&Stop\t");
 			break;
 		case HK_SCREENSHOT:
-			Label = _T("Take Screenshot\t");
+			Label = _("Take Screenshot\t");
 			break;
 		case HK_WIIMOTE1_CONNECT:
 		case HK_WIIMOTE2_CONNECT:
 		case HK_WIIMOTE3_CONNECT:
 		case HK_WIIMOTE4_CONNECT:
-			Label = wxString::Format(_T("Connect Wiimote %i\t"),
+			Label = wxString::Format(wxT("Connect Wiimote %i\t"),
 					Id - HK_WIIMOTE1_CONNECT + 1);
 			break;
 	}
@@ -353,20 +353,20 @@ void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar)
 		ToolBar->SetToolBitmapSize(wxSize(w, h));
 		
 
-	ToolBar->AddTool(wxID_OPEN,    _T("Open"),    m_Bitmaps[Toolbar_FileOpen], _T("Open file..."));
-	ToolBar->AddTool(wxID_REFRESH, _T("Refresh"), m_Bitmaps[Toolbar_Refresh], _T("Refresh game list"));
-	ToolBar->AddTool(IDM_BROWSE, _T("Browse"),   m_Bitmaps[Toolbar_Browse], _T("Browse for an ISO directory..."));
+	ToolBar->AddTool(wxID_OPEN,    _("Open"),    m_Bitmaps[Toolbar_FileOpen], _("Open file..."));
+	ToolBar->AddTool(wxID_REFRESH, _("Refresh"), m_Bitmaps[Toolbar_Refresh], _("Refresh game list"));
+	ToolBar->AddTool(IDM_BROWSE, _("Browse"),   m_Bitmaps[Toolbar_Browse], _("Browse for an ISO directory..."));
 	ToolBar->AddSeparator();
-	ToolBar->AddTool(IDM_PLAY, wxT("Play"),   m_Bitmaps[Toolbar_Play], _T("Play"));
-	ToolBar->AddTool(IDM_STOP, _T("Stop"),   m_Bitmaps[Toolbar_Stop], _T("Stop"));
-	ToolBar->AddTool(IDM_TOGGLE_FULLSCREEN, _T("FullScr"),  m_Bitmaps[Toolbar_FullScreen], _T("Toggle Fullscreen"));
-	ToolBar->AddTool(IDM_SCREENSHOT, _T("ScrShot"),   m_Bitmaps[Toolbar_FullScreen], _T("Take Screenshot"));
+	ToolBar->AddTool(IDM_PLAY, _("Play"),   m_Bitmaps[Toolbar_Play], _("Play"));
+	ToolBar->AddTool(IDM_STOP, _("Stop"),   m_Bitmaps[Toolbar_Stop], _("Stop"));
+	ToolBar->AddTool(IDM_TOGGLE_FULLSCREEN, _("FullScr"),  m_Bitmaps[Toolbar_FullScreen], _("Toggle Fullscreen"));
+	ToolBar->AddTool(IDM_SCREENSHOT, _("ScrShot"),   m_Bitmaps[Toolbar_FullScreen], _("Take Screenshot"));
 	ToolBar->AddSeparator();
-	ToolBar->AddTool(wxID_PREFERENCES, _T("Config"), m_Bitmaps[Toolbar_PluginOptions], _T("Configure..."));
-	ToolBar->AddTool(IDM_CONFIG_GFX_PLUGIN, _T("Graphics"),  m_Bitmaps[Toolbar_PluginGFX], _T("Graphics settings"));
-	ToolBar->AddTool(IDM_CONFIG_DSP_PLUGIN, _T("DSP"),  m_Bitmaps[Toolbar_PluginDSP], _T("DSP settings"));
-	ToolBar->AddTool(IDM_CONFIG_PAD_PLUGIN, _T("GCPad"),  m_Bitmaps[Toolbar_PluginPAD], _T("Gamecube Pad settings"));
-	ToolBar->AddTool(IDM_CONFIG_WIIMOTE_PLUGIN, _T("Wiimote"),  m_Bitmaps[Toolbar_Wiimote], _T("Wiimote settings"));
+	ToolBar->AddTool(wxID_PREFERENCES, _("Config"), m_Bitmaps[Toolbar_PluginOptions], _("Configure..."));
+	ToolBar->AddTool(IDM_CONFIG_GFX_PLUGIN, _("Graphics"),  m_Bitmaps[Toolbar_PluginGFX], _("Graphics settings"));
+	ToolBar->AddTool(IDM_CONFIG_DSP_PLUGIN, _("DSP"),  m_Bitmaps[Toolbar_PluginDSP], _("DSP settings"));
+	ToolBar->AddTool(IDM_CONFIG_PAD_PLUGIN, _("GCPad"),  m_Bitmaps[Toolbar_PluginPAD], _("Gamecube Pad settings"));
+	ToolBar->AddTool(IDM_CONFIG_WIIMOTE_PLUGIN, _("Wiimote"),  m_Bitmaps[Toolbar_Wiimote], _("Wiimote settings"));
 
 	// after adding the buttons to the toolbar, must call Realize() to reflect
 	// the changes
@@ -379,8 +379,8 @@ void CFrame::PopulateToolbarAui(wxAuiToolBar* ToolBar)
 		h = m_Bitmaps[Toolbar_FileOpen].GetHeight();
 	ToolBar->SetToolBitmapSize(wxSize(w, h));
 
-	ToolBar->AddTool(IDM_SAVE_PERSPECTIVE,	wxT("Save"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], wxT("Save current perspective"));
-	ToolBar->AddTool(IDM_EDIT_PERSPECTIVES,	wxT("Edit"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], wxT("Edit current perspective"));
+	ToolBar->AddTool(IDM_SAVE_PERSPECTIVE,	_("Save"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], _("Save current perspective"));
+	ToolBar->AddTool(IDM_EDIT_PERSPECTIVES,	_("Edit"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], _("Edit current perspective"));
 
 	ToolBar->SetToolDropDown(IDM_SAVE_PERSPECTIVE, true);
 	ToolBar->SetToolDropDown(IDM_EDIT_PERSPECTIVES, true);	
@@ -584,7 +584,7 @@ void CFrame::DoOpen(bool Boot)
 	std::string currentDir = File::GetCurrentDir();
 
 	wxString path = wxFileSelector(
-			_T("Select the file to load"),
+			_("Select the file to load"),
 			wxEmptyString, wxEmptyString, wxEmptyString,
 			wxString::Format
 			(
@@ -648,7 +648,7 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event))
 void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED (event))
 {
 	wxString path = wxFileSelector(
-			_T("Select The Recording File"),
+			_("Select The Recording File"),
 			wxEmptyString, wxEmptyString, wxEmptyString,
 			wxString::Format
 			(
@@ -912,8 +912,8 @@ void CFrame::DoStop()
 		{
 			wxMessageDialog *m_StopDlg = new wxMessageDialog(
 				this,
-				wxT("Do you want to stop the current emulation?"),
-				wxT("Please confirm..."),
+				_("Do you want to stop the current emulation?"),
+				_("Please confirm..."),
 				wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION,
 				wxDefaultPosition);
 
@@ -998,7 +998,7 @@ void CFrame::DoRecordingSave()
 		DoPause();
 	
 	wxString path = wxFileSelector(
-			_T("Select The Recording File"),
+			_("Select The Recording File"),
 			wxEmptyString, wxEmptyString, wxEmptyString,
 			wxString::Format
 			(
@@ -1170,9 +1170,9 @@ void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))
 
 void CFrame::OnImportSave(wxCommandEvent& WXUNUSED (event)) 
 {
-	wxString path = wxFileSelector(_T("Select the save file"),
+	wxString path = wxFileSelector(_("Select the save file"),
 			wxEmptyString, wxEmptyString, wxEmptyString,
-			_T("Wii save files (*.bin)|*.bin"),
+			_("Wii save files (*.bin)|*.bin"),
 			wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
 			this);
 
@@ -1203,7 +1203,7 @@ void CFrame::OnLoadWiiMenu(wxCommandEvent& event)
 	{
 		
 		wxString path = wxFileSelector(
-			_T("Select the System Menu wad extracted from the update partition of a disc"),
+			_("Select the System Menu wad extracted from the update partition of a disc"),
 			wxEmptyString, wxEmptyString, wxEmptyString,
 			_T("System Menu (*.wad)|*.wad"),
 			wxFD_OPEN | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST,
@@ -1223,7 +1223,7 @@ void CFrame::OnConnectWiimote(wxCommandEvent& event)
 		int Id = event.GetId() - IDM_CONNECT_WIIMOTE1;
 		bNoWiimoteMsg = !event.IsChecked();
 		GetUsbPointer()->AccessWiiMote(Id | 0x100)->Activate(event.IsChecked());
-		wxString msg(wxString::Format(wxT("Wiimote %i %s"), Id + 1, (event.IsChecked()) ? wxT("Connected") : wxT("Disconnected")));
+		wxString msg(wxString::Format(wxT("Wiimote %i %s"), Id + 1, (event.IsChecked()) ? _("Connected") : _("Disconnected")));
 		Core::DisplayMessage(msg.ToAscii(), 3000);
 	}
 }
@@ -1250,7 +1250,7 @@ void CFrame::OnToggleSkipIdle(wxCommandEvent& WXUNUSED (event))
 void CFrame::OnLoadStateFromFile(wxCommandEvent& WXUNUSED (event))
 {
 	wxString path = wxFileSelector(
-		_T("Select the state to load"),
+		_("Select the state to load"),
 		wxEmptyString, wxEmptyString, wxEmptyString,
 		wxString::Format
 		(
@@ -1268,7 +1268,7 @@ void CFrame::OnLoadStateFromFile(wxCommandEvent& WXUNUSED (event))
 void CFrame::OnSaveStateToFile(wxCommandEvent& WXUNUSED (event))
 {
 	wxString path = wxFileSelector(
-		_T("Select the state to save"),
+		_("Select the state to save"),
 		wxEmptyString, wxEmptyString, wxEmptyString,
 		wxString::Format
 		(

Source/Core/DolphinWX/Src/GameListCtrl.cpp

@@ -250,7 +250,7 @@ void CGameListCtrl::Update()
 		InitBitmaps();
 
 		// add columns
-		InsertColumn(COLUMN_PLATFORM, _(""));
+		InsertColumn(COLUMN_PLATFORM, _T(""));
 		InsertColumn(COLUMN_BANNER, _("Banner"));
 		InsertColumn(COLUMN_TITLE, _("Title"));
 
@@ -258,7 +258,7 @@ void CGameListCtrl::Update()
 		// wii titles We show in the same column : company for GC games and
 		// description for wii/wad games
 		InsertColumn(COLUMN_NOTES, _("Notes"));
-		InsertColumn(COLUMN_COUNTRY, _(""));
+		InsertColumn(COLUMN_COUNTRY, _T(""));
 		InsertColumn(COLUMN_SIZE, _("Size"));
 		InsertColumn(COLUMN_EMULATION_STATE, _("State"));
 
@@ -300,12 +300,12 @@ void CGameListCtrl::Update()
 			SConfig::GetInstance().m_ListPal))
 		{
 			errorString = wxT("Dolphin could not find any GC/Wii ISOs. ")
-					wxT("Doubleclick here to browse for files...");
+					      wxT("Doubleclick here to browse for files...");
 		}
 		else
 		{
 			errorString = wxT("Dolphin is currently set to hide all games. ")
-				wxT("Doubleclick here to show all games...");
+				          wxT("Doubleclick here to show all games...");
 		}
 		InsertColumn(0, _("No ISOs or WADS found"));
 		long index = InsertItem(0, errorString);
@@ -577,8 +577,8 @@ void CGameListCtrl::ScanForISOs()
 
 	if (rFilenames.size() > 0)
 	{
-		wxProgressDialog dialog(_T("Scanning for ISOs"),
-					_T("Scanning..."),
+		wxProgressDialog dialog(_("Scanning for ISOs"),
+					_("Scanning..."),
 					(int)rFilenames.size(), // range
 					this, // parent
 					wxPD_APP_MODAL |
@@ -914,7 +914,7 @@ void CGameListCtrl::OnMouseMotion(wxMouseEvent& event)
 				toolTip = new wxEmuStateTip(this, wxString(temp, *wxConvCurrent), &toolTip);
 			}
 			else
-				toolTip = new wxEmuStateTip(this, wxT("Not Set"), &toolTip);
+				toolTip = new wxEmuStateTip(this, _("Not Set"), &toolTip);
 
 			toolTip->SetBoundingRect(wxRect(mx - GetColumnWidth(subitem),
 						my, GetColumnWidth(subitem), Rect.GetHeight()));
@@ -1099,7 +1099,7 @@ void CGameListCtrl::OnDeleteGCM(wxCommandEvent& WXUNUSED (event))
 		if (!iso)
 			return;
 		if (wxMessageBox(wxT("Are you sure you want to delete this file?\n")
-					wxT("It will be gone forever!"),
+					     wxT("It will be gone forever!"),
 					wxMessageBoxCaptionStr, wxYES_NO | wxICON_EXCLAMATION) == wxYES)
 		{
 			File::Delete(iso->GetFileName().c_str());
@@ -1109,7 +1109,7 @@ void CGameListCtrl::OnDeleteGCM(wxCommandEvent& WXUNUSED (event))
 	else
 	{
 		if (wxMessageBox(wxT("Are you sure you want to delete these files?\n")
-					wxT("They will be gone forever!"),
+					     wxT("They will be gone forever!"),
 					wxMessageBoxCaptionStr, wxYES_NO | wxICON_EXCLAMATION) == wxYES)
 		{
 			int selected = GetSelectedItemCount();
@@ -1141,8 +1141,8 @@ void CGameListCtrl::OnInstallWAD(wxCommandEvent& WXUNUSED (event))
 	if (!iso)
 		return;
 
-	wxProgressDialog dialog(_T("Installing WAD to Wii Menu..."),
-		_T("Working..."),
+	wxProgressDialog dialog(_("Installing WAD to Wii Menu..."),
+		_("Working..."),
 		1000, // range
 		this, // parent
 		wxPD_APP_MODAL |
@@ -1287,12 +1287,12 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event))
 		{
 			wxString FileType;
 			if (iso->GetPlatform() == GameListItem::WII_DISC)
-				FileType = wxT("All Wii ISO files (iso)|*.iso");
+				FileType = _("All Wii ISO files (iso)|*.iso");
 			else
-				FileType = wxT("All Gamecube GCM files (gcm)|*.gcm");
+				FileType = _("All Gamecube GCM files (gcm)|*.gcm");
 
 			path = wxFileSelector(
-					_T("Save decompressed GCM/ISO"),
+					_("Save decompressed GCM/ISO"),
 					wxString(FilePath.c_str(), *wxConvCurrent),
 					wxString(FileName.c_str(), *wxConvCurrent) + FileType.After('*'),
 					wxEmptyString,
@@ -1309,7 +1309,7 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event))
 		else
 		{
 			path = wxFileSelector(
-					_T("Save compressed GCM/ISO"),
+					_("Save compressed GCM/ISO"),
 					wxString(FilePath.c_str(), *wxConvCurrent),
 					wxString(FileName.c_str(), *wxConvCurrent) + _T(".gcz"),
 					wxEmptyString,
@@ -1331,8 +1331,8 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event))
 				wxYES_NO) == wxNO);
 
 	wxProgressDialog dialog(iso->IsCompressed() ?
-			_T("Decompressing ISO") : _T("Compressing ISO"),
-			_T("Working..."),
+			_("Decompressing ISO") : _("Compressing ISO"),
+			_("Working..."),
 			1000, // range
 			this, // parent
 			wxPD_APP_MODAL |

Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp

@@ -13,9 +13,9 @@
 namespace Gecko
 {
 
-static const wxString wxstr_name(wxT("Name: ")),
-	wxstr_notes(wxT("Notes: ")),
-	wxstr_creator(wxT("Creator: "));
+static const wxString wxstr_name(_("Name: ")),
+	wxstr_notes(_("Notes: ")),
+	wxstr_creator(_("Creator: "));
 
 CodeConfigPanel::CodeConfigPanel(wxWindow* const parent)
 	: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
@@ -42,7 +42,7 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent)
 
 	// button sizer
 	wxBoxSizer* const sizer_buttons = new wxBoxSizer(wxHORIZONTAL);
-	wxButton* const btn_download = new wxButton(this, -1, wxT("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1));
+	wxButton* const btn_download = new wxButton(this, -1, _("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1));
 	_connect_macro_(btn_download, CodeConfigPanel::DownloadCodes, wxEVT_COMMAND_BUTTON_CLICKED, this);
 	sizer_buttons->AddStretchSpacer(1);
 	sizer_buttons->Add(btn_download, 1, wxEXPAND);

Source/Core/DolphinWX/Src/HotkeyDlg.cpp

@@ -188,14 +188,14 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
 {
 	static const wxChar* hkText[] =
 	{
-		wxT("Toggle Fullscreen"),
-		wxT("Play/Pause"),
-		wxT("Stop"),
-		wxT("Take Screenshot"),
-		wxT("Connect Wiimote 1"),
-		wxT("Connect Wiimote 2"),
-		wxT("Connect Wiimote 3"),
-		wxT("Connect Wiimote 4")
+		_("Toggle Fullscreen"),
+		_("Play/Pause"),
+		_("Stop"),
+		_("Take Screenshot"),
+		_("Connect Wiimote 1"),
+		_("Connect Wiimote 2"),
+		_("Connect Wiimote 3"),
+		_("Connect Wiimote 4")
 	};
 
 	// Configuration controls sizes
@@ -203,14 +203,14 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
 	// A small type font
 	wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
 
-	wxStaticBoxSizer *sHotkeys = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Hotkeys"));
+	wxStaticBoxSizer *sHotkeys = new wxStaticBoxSizer(wxVERTICAL, this, _("Hotkeys"));
 
 	// Header line
 	wxBoxSizer *HeaderSizer = new wxBoxSizer(wxHORIZONTAL);
-	wxStaticText *StaticTextHeader = new wxStaticText(this, wxID_ANY, wxT("Action"));
+	wxStaticText *StaticTextHeader = new wxStaticText(this, wxID_ANY, _("Action"));
 	HeaderSizer->Add(StaticTextHeader, 1, wxALL, 2);
 	HeaderSizer->AddStretchSpacer();
-	StaticTextHeader = new wxStaticText(this, wxID_ANY, wxT("Key"), wxDefaultPosition, size);
+	StaticTextHeader = new wxStaticText(this, wxID_ANY, _("Key"), wxDefaultPosition, size);
 	HeaderSizer->Add(StaticTextHeader, 0, wxALL, 2);
 	sHotkeys->Add(HeaderSizer, 0, wxEXPAND | wxALL, 1);
 
@@ -234,7 +234,7 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
 		sHotkeys->Add(sHotkey, 0, wxEXPAND | wxALL, 1);
 	}
 
-	m_Close = new wxButton(this, ID_CLOSE, wxT("Close"));
+	m_Close = new wxButton(this, ID_CLOSE, _("Close"));
 	wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL);
 	sButtons->AddStretchSpacer();
 	sButtons->Add(m_Close, 0, (wxLEFT), 5);	

Source/Core/DolphinWX/Src/HotkeyDlg.h

@@ -41,7 +41,7 @@ class HotkeyConfigDialog : public wxDialog
 	public:
 		HotkeyConfigDialog(wxWindow *parent,
 				wxWindowID id = 1,
-				const wxString &title = wxT("Hotkey Configuration"),
+				const wxString &title = _("Hotkey Configuration"),
 				const wxPoint& pos = wxDefaultPosition,
 				const wxSize& size = wxDefaultSize,
 				long style = wxDEFAULT_DIALOG_STYLE | wxWANTS_CHARS);

Source/Core/DolphinWX/Src/ISOProperties.cpp

@@ -140,7 +140,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 		if (GameIni.Load(GameIniFile.c_str()))
 			LoadGameConfig();
 		else
-			wxMessageBox(wxString::Format(_("Could not create %s"), wxString::From8BitData(GameIniFile.c_str()).c_str()), _("Error"), wxOK|wxICON_ERROR, this);
+			wxMessageBox(wxString::Format(wxT("Could not create %s"), wxString::From8BitData(GameIniFile.c_str()).c_str()), _("Error"), wxOK|wxICON_ERROR, this);
 	}
 
 	// Disk header and apploader
@@ -149,46 +149,46 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 	switch (OpenISO->GetCountry())
 	{
 	case DiscIO::IVolume::COUNTRY_EUROPE:
-		m_Country->SetValue(wxT("EUROPE"));
+		m_Country->SetValue(_("EUROPE"));
 		break;
 	case DiscIO::IVolume::COUNTRY_FRANCE:
-		m_Country->SetValue(wxT("FRANCE"));
+		m_Country->SetValue(_("FRANCE"));
 		break;
 	case DiscIO::IVolume::COUNTRY_ITALY:
-		m_Country->SetValue(wxT("ITALY"));
+		m_Country->SetValue(_("ITALY"));
 		break;
 	case DiscIO::IVolume::COUNTRY_RUSSIA:
-		m_Country->SetValue(wxT("RUSSIA"));
+		m_Country->SetValue(_("RUSSIA"));
 		break;
 	case DiscIO::IVolume::COUNTRY_USA:
-		m_Country->SetValue(wxT("USA"));
+		m_Country->SetValue(_("USA"));
 		m_Lang->SetSelection(0);
 		m_Lang->Disable(); // For NTSC Games, there's no multi lang
 		break;
 	case DiscIO::IVolume::COUNTRY_JAPAN:
-		m_Country->SetValue(wxT("JAPAN"));
+		m_Country->SetValue(_("JAPAN"));
 		m_Lang->SetSelection(-1);
 		m_Lang->Disable(); // For NTSC Games, there's no multi lang
 		break;
 	case DiscIO::IVolume::COUNTRY_KOREA:
-		m_Country->SetValue(wxT("KOREA"));
+		m_Country->SetValue(_("KOREA"));
 		break;
 	case DiscIO::IVolume::COUNTRY_TAIWAN:
-		m_Country->SetValue(wxT("TAIWAN"));
+		m_Country->SetValue(_("TAIWAN"));
 		m_Lang->SetSelection(-1);
 		m_Lang->Disable(); // For NTSC Games, there's no multi lang
 		break;
 	case DiscIO::IVolume::COUNTRY_SDK:
-		m_Country->SetValue(wxT("No Country (SDK)"));
+		m_Country->SetValue(_("No Country (SDK)"));
 		break;
 	default:
-		m_Country->SetValue(wxT("UNKNOWN"));
+		m_Country->SetValue(_("UNKNOWN"));
 		break;
 	}
 	wxString temp = _T("0x") + wxString::From8BitData(OpenISO->GetMakerID().c_str());
 	m_MakerID->SetValue(temp);
 	m_Date->SetValue(wxString::From8BitData(OpenISO->GetApploaderDate().c_str()));
-	m_FST->SetValue(wxString::Format(_T("%u"), OpenISO->GetFSTSize()));
+	m_FST->SetValue(wxString::Format(wxT("%u"), OpenISO->GetFSTSize()));
 
 	// Here we set all the info to be shown (be it SJIS or Ascii) + we set the window title
 	ChangeBannerDetails((int)SConfig::GetInstance().m_InterfaceLanguage);
@@ -284,7 +284,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 	m_CheatPage = new wxPanel(m_Notebook, ID_ARCODE_PAGE, wxDefaultPosition, wxDefaultSize);
 	m_Notebook->AddPage(m_CheatPage, _("AR Codes"));
 	m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook);
-	m_Notebook->AddPage(m_geckocode_panel, wxT("Gecko Codes"));
+	m_Notebook->AddPage(m_geckocode_panel, _("Gecko Codes"));
 	m_Information = new wxPanel(m_Notebook, ID_INFORMATION, wxDefaultPosition, wxDefaultSize);
 	m_Notebook->AddPage(m_Information, _("Info"));
 	m_Filesystem = new wxPanel(m_Notebook, ID_FILESYSTEM, wxDefaultPosition, wxDefaultSize);
@@ -305,15 +305,15 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 	CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
 	SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
 	MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
-	MMU->SetToolTip(wxT("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)"));
+	MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)"));
 	MMUBAT = new wxCheckBox(m_GameConfig, ID_MMUBAT, _("Enable BAT"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
-	MMUBAT->SetToolTip(wxT("Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)"));
+	MMUBAT->SetToolTip(_("Enables Block Address Translation (BAT); a function of the Memory Management Unit. Accurate to the hardware, but slow to emulate. (ON = Compatible, OFF = Fast)"));
 	TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
-	TLBHack->SetToolTip(wxT("Fast version of the MMU.  Does not work for every game."));
+	TLBHack->SetToolTip(_("Fast version of the MMU.  Does not work for every game."));
 	AlternateRFI = new wxCheckBox(m_GameConfig, ID_RFI, _("Alternate RFI"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
-	AlternateRFI->SetToolTip(wxT("If a game hangs, works only in the Interpreter or Dolphin crashes, this option may fix the game."));
+	AlternateRFI->SetToolTip(_("If a game hangs, works only in the Interpreter or Dolphin crashes, this option may fix the game."));
 	FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
-	FastDiscSpeed->SetToolTip(wxT("Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = Compatible)"));
+	FastDiscSpeed->SetToolTip(_("Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = Compatible)"));
 	BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
 
 	// Wii Console
@@ -343,7 +343,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 	DstAlphaPass = new wxCheckBox(m_GameConfig, ID_DSTALPHAPASS, _("Distance Alpha Pass"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
 	UseXFB = new wxCheckBox(m_GameConfig, ID_USEXFB, _("Use XFB"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
 	UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
-	UseZTPSpeedupHack->SetToolTip(wxT("Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game."));
+	UseZTPSpeedupHack->SetToolTip(_("Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game."));
 	DListCache = new wxCheckBox(m_GameConfig, ID_DLISTCACHE, _("DList Cache"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
 	// Hack
 	Hacktext = new wxStaticText(m_GameConfig, ID_HACK_TEXT, _("Projection Hack for: "), wxDefaultPosition, wxDefaultSize);
@@ -527,7 +527,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 	// Filesystem tree
 	m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE, wxDefaultValidator);
 	m_Treectrl->AssignImageList(m_iconList);
-	RootId = m_Treectrl->AddRoot(wxT("Disc"), 0, 0, 0);
+	RootId = m_Treectrl->AddRoot(_("Disc"), 0, 0, 0);
 
 	wxBoxSizer* sTreePage;
 	sTreePage = new wxBoxSizer(wxVERTICAL);
@@ -576,7 +576,7 @@ void CISOProperties::OnBannerImageSave(wxCommandEvent& WXUNUSED (event))
 {
 	wxString dirHome;
 
-	wxFileDialog dialog(this, _("Save as..."), wxGetHomeDir(&dirHome), wxString::Format(_("%s.png"), m_GameID->GetLabel().c_str()),
+	wxFileDialog dialog(this, _("Save as..."), wxGetHomeDir(&dirHome), wxString::Format(wxT("%s.png"), m_GameID->GetLabel().c_str()),
 		_("*.*"), wxFD_SAVE|wxFD_OVERWRITE_PROMPT, wxDefaultPosition, wxDefaultSize);
 	if (dialog.ShowModal() == wxID_OK)
 	{
@@ -616,7 +616,7 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
 	File = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
 	
 	Path = wxFileSelector(
-		wxT("Export File"),
+		_("Export File"),
 		wxEmptyString, File, wxEmptyString,
 		wxString::Format
 		(
@@ -690,9 +690,9 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
 		DEBUG_LOG(DISCIO,"Dir found from %u to %u\nextracting to:\n%s",index[0],index[1],_rExportFolder);
 	}
 
-	wxString dialogTitle = index[0] ? _T("Extracting Directory") : _T("Extracting All Files");
+	wxString dialogTitle = index[0] ? _("Extracting Directory") : _("Extracting All Files");
 	wxProgressDialog dialog(dialogTitle,
-					_T("Extracting..."),
+					_("Extracting..."),
 					index[1], // range
 					this, // parent
 					wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_CAN_ABORT |
@@ -704,9 +704,9 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
 	// Extraction
 	for (u32 i = index[0]; i < index[1]; i++)
 	{
-		dialog.SetTitle(wxString::Format(_T("%s : %d%%"), dialogTitle.c_str(),
+		dialog.SetTitle(wxString::Format(wxT("%s : %d%%"), dialogTitle.c_str(),
 			(u32)(((float)(i - index[0]) / (float)(index[1] - index[0])) * 100)));
-		if (!dialog.Update(i, wxString::Format(_T("Extracting %s"), wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str())))
+		if (!dialog.Update(i, wxString::Format(wxT("Extracting %s"), wxString(fst[i]->m_FullPath, *wxConvCurrent).c_str())))
 			break;
 
 		if (fst[i]->IsDirectory())
@@ -746,7 +746,7 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
 void CISOProperties::OnExtractDir(wxCommandEvent& event)
 {
 	wxString Directory = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
-	wxString Path = wxDirSelector(wxT("Choose the folder where to extract to"));
+	wxString Path = wxDirSelector(_("Choose the folder where to extract to"));
 
 	if (!Path || !Directory)
 		return;
@@ -785,7 +785,7 @@ void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
 {
 	std::vector<const DiscIO::SFileInfo *> fst;
 	DiscIO::IFileSystem *FS = 0;
-	wxString Path = wxDirSelector(wxT("Choose the folder to extract to"));
+	wxString Path = wxDirSelector(_("Choose the folder to extract to"));
 
 	if (Path.empty())
 		return;

Source/Core/DolphinWX/Src/ISOProperties.h

@@ -44,7 +44,7 @@ class CISOProperties : public wxDialog
 		CISOProperties(const std::string fileName,
 			wxWindow* parent,
 			wxWindowID id = 1,
-			const wxString& title = wxT("Properties"),
+			const wxString& title = _("Properties"),
 			const wxPoint& pos = wxDefaultPosition,
 			const wxSize& size = wxDefaultSize,
 			long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);

Source/Core/DolphinWX/Src/InputConfigDiag.cpp

@@ -114,7 +114,7 @@ void PadSettingSpin::UpdateValue()
 }
 
 ControlDialog::ControlDialog(GamepadPage* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref)
-	: wxDialog(parent, -1, wxT("Configure Control"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+	: wxDialog(parent, -1, _("Configure Control"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 	, control_reference(ref)
 	, m_plugin(plugin)
 	, m_parent(parent)
@@ -130,7 +130,7 @@ ControlDialog::ControlDialog(GamepadPage* const parent, InputPlugin& plugin, Con
 
 	wxStaticBoxSizer* const control_chooser = CreateControlChooser( this, parent );
 
-	wxStaticBoxSizer* const d_szr = new wxStaticBoxSizer( wxVERTICAL, this, wxT("Device") );
+	wxStaticBoxSizer* const d_szr = new wxStaticBoxSizer( wxVERTICAL, this, _("Device") );
 	d_szr->Add( device_cbox, 0, wxEXPAND|wxALL, 5 );
 
 	wxBoxSizer* const szr = new wxBoxSizer( wxVERTICAL );
@@ -451,7 +451,7 @@ void ControlDialog::DetectControl(wxCommandEvent& event)
 	ControllerInterface::Device* const dev = g_controller_interface.FindDevice(m_devq);
 	if (dev)
 	{
-		btn->SetLabel(wxT("[ waiting ]"));
+		btn->SetLabel(_("[ waiting ]"));
 
 		// apparently, this makes the "waiting" text work on Linux
 		wxTheApp->Yield();
@@ -476,7 +476,7 @@ void GamepadPage::DetectControl( wxCommandEvent& event )
 	ControllerInterface::Device* const dev = g_controller_interface.FindDevice(controller->default_device);
 	if (dev)
 	{
-		btn->SetLabel(wxT("[ waiting ]"));
+		btn->SetLabel(_("[ waiting ]"));
 
 		// apparently, this makes the "waiting" text work on Linux
 		wxTheApp->Yield();
@@ -499,16 +499,16 @@ void GamepadPage::DetectControl( wxCommandEvent& event )
 
 wxStaticBoxSizer* ControlDialog::CreateControlChooser( wxWindow* const parent, wxWindow* const eventsink )
 {
-	wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, parent, control_reference->is_input ? wxT("Input") : wxT("Output"));
+	wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, parent, control_reference->is_input ? _("Input") : _("Output"));
 
 	textctrl = new wxTextCtrl(parent, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE);
 
-	wxButton* const detect_button = new wxButton( parent, -1, control_reference->is_input ? wxT("Detect") : wxT("Test") );
+	wxButton* const detect_button = new wxButton( parent, -1, control_reference->is_input ? _("Detect") : _("Test") );
 
-	wxButton* const clear_button = new  wxButton( parent, -1, wxT("Clear"));
-	wxButton* const set_button = new wxButton( parent, -1, wxT("Set"));
+	wxButton* const clear_button = new  wxButton( parent, -1, _("Clear"));
+	wxButton* const set_button = new wxButton( parent, -1, _("Set"));
 
-	wxButton* const select_button = new wxButton( parent, -1, wxT("Select"));
+	wxButton* const select_button = new wxButton( parent, -1, _("Select"));
 	_connect_macro_(select_button, ControlDialog::SetSelectedControl, wxEVT_COMMAND_BUTTON_CLICKED, parent);
 
 	wxButton* const or_button = new  wxButton( parent, -1, wxT("| OR"), wxDefaultPosition );
@@ -546,7 +546,7 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser( wxWindow* const parent, w
 	_connect_macro_( set_button, ControlDialog::SetControl, wxEVT_COMMAND_BUTTON_CLICKED, parent);
 
 	_connect_macro_( range_slider, GamepadPage::AdjustControlOption, wxEVT_SCROLL_CHANGED, eventsink);
-	wxStaticText* const range_label = new wxStaticText( parent, -1, wxT("Range"));
+	wxStaticText* const range_label = new wxStaticText( parent, -1, _("Range"));
 	m_bound_label = new wxStaticText( parent, -1, wxT("") );
 
 	wxBoxSizer* const range_sizer = new wxBoxSizer( wxHORIZONTAL );
@@ -711,12 +711,12 @@ ControlGroupBox::ControlGroupBox( ControllerEmu::ControlGroup* const group, wxWi
 
 		if ((*ci)->control_ref->is_input)
 		{
-			control_button->SetToolTip(wxT("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options."));
+			control_button->SetToolTip(_("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options."));
 			_connect_macro_( control_button, GamepadPage::DetectControl, wxEVT_COMMAND_BUTTON_CLICKED, eventsink );
 		}
 		else
 		{
-			control_button->SetToolTip(wxT("Left/Right-click for more options.\nMiddle-click to clear."));
+			control_button->SetToolTip(_("Left/Right-click for more options.\nMiddle-click to clear."));
 			_connect_macro_( control_button, GamepadPage::ConfigControl, wxEVT_COMMAND_BUTTON_CLICKED, eventsink );
 		}
 
@@ -777,7 +777,7 @@ ControlGroupBox::ControlGroupBox( ControllerEmu::ControlGroup* const group, wxWi
 			PadSettingSpin* const threshold_cbox = new PadSettingSpin(parent, group->settings[0]);
 			_connect_macro_(threshold_cbox->wxcontrol, GamepadPage::AdjustSetting, wxEVT_COMMAND_SPINCTRL_UPDATED, eventsink);
 
-			threshold_cbox->wxcontrol->SetToolTip(wxT("Adjust the analog control pressure required to activate buttons."));
+			threshold_cbox->wxcontrol->SetToolTip(_("Adjust the analog control pressure required to activate buttons."));
 
 			options.push_back(threshold_cbox);
 
@@ -912,11 +912,11 @@ GamepadPage::GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned
 
 	wxBoxSizer* control_group_sizer = new ControlGroupsSizer( m_plugin.controllers[pad_num], this, this, &control_groups );
 
-	wxStaticBoxSizer* profile_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, wxT("Profile") );
+	wxStaticBoxSizer* profile_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, _("Profile") );
 
 	// device chooser
 
-	wxStaticBoxSizer* const device_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, wxT("Device") );
+	wxStaticBoxSizer* const device_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, _("Device") );
 
 	device_cbox = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxSize(64,-1));
 #ifndef __APPLE__
@@ -924,7 +924,7 @@ GamepadPage::GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned
 	device_cbox->ToggleWindowStyle(wxTE_PROCESS_ENTER);
 #endif
 
-	wxButton* refresh_button = new wxButton( this, -1, wxT("Refresh"), wxDefaultPosition, wxSize(60,-1) );
+	wxButton* refresh_button = new wxButton( this, -1, _("Refresh"), wxDefaultPosition, wxSize(60,-1) );
 
 	_connect_macro_( device_cbox, GamepadPage::SetDevice, wxEVT_COMMAND_COMBOBOX_SELECTED, this );
 	_connect_macro_( device_cbox, GamepadPage::SetDevice, wxEVT_COMMAND_TEXT_ENTER, this );
@@ -933,10 +933,10 @@ GamepadPage::GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned
 	device_sbox->Add( device_cbox, 1, wxLEFT|wxRIGHT, 3 );
 	device_sbox->Add( refresh_button, 0, wxRIGHT|wxBOTTOM, 3 );
 
-	wxButton* const default_button = new wxButton(this, -1, wxT("Default"), wxDefaultPosition, wxSize(48,-1));
-	wxButton* const clearall_button = new wxButton(this, -1, wxT("Clear"), wxDefaultPosition, wxSize(58,-1));
+	wxButton* const default_button = new wxButton(this, -1, _("Default"), wxDefaultPosition, wxSize(48,-1));
+	wxButton* const clearall_button = new wxButton(this, -1, _("Clear"), wxDefaultPosition, wxSize(58,-1));
 
-	wxStaticBoxSizer* const clear_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, wxT("Reset") );
+	wxStaticBoxSizer* const clear_sbox = new wxStaticBoxSizer( wxHORIZONTAL, this, _("Reset") );
 	clear_sbox->Add(default_button, 1, wxLEFT, 3);
 	clear_sbox->Add(clearall_button, 1, wxRIGHT, 3);
 
@@ -945,9 +945,9 @@ GamepadPage::GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned
 
 	profile_cbox = new wxComboBox( this, -1, wxT(""), wxDefaultPosition, wxSize(64,-1) );
 
-	wxButton* const pload_btn = new wxButton( this, -1, wxT("Load"), wxDefaultPosition, wxSize(48,-1) );
-	wxButton* const psave_btn = new wxButton( this, -1, wxT("Save"), wxDefaultPosition, wxSize(48,-1) );
-	wxButton* const pdelete_btn = new wxButton( this, -1, wxT("Delete"), wxDefaultPosition, wxSize(60,-1) );
+	wxButton* const pload_btn = new wxButton( this, -1, _("Load"), wxDefaultPosition, wxSize(48,-1) );
+	wxButton* const psave_btn = new wxButton( this, -1, _("Save"), wxDefaultPosition, wxSize(48,-1) );
+	wxButton* const pdelete_btn = new wxButton( this, -1, _("Delete"), wxDefaultPosition, wxSize(60,-1) );
 
 	_connect_macro_(pload_btn, GamepadPage::LoadProfile, wxEVT_COMMAND_BUTTON_CLICKED, this);
 	_connect_macro_(psave_btn, GamepadPage::SaveProfile, wxEVT_COMMAND_BUTTON_CLICKED, this);
@@ -992,7 +992,7 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin
 	UpdateDeviceComboBox();
 	UpdateProfileComboBox();
 
-	wxButton* const close_button = new wxButton( this, -1, wxT("Save"));
+	wxButton* const close_button = new wxButton( this, -1, _("Save"));
 	_connect_macro_(close_button, InputConfigDialog::ClickSave, wxEVT_COMMAND_BUTTON_CLICKED, this);
 	_connect_macro_(close_button, InputConfigDialog::ClickSave, wxEVT_COMMAND_BUTTON_CLICKED, this);
 

Source/Core/DolphinWX/Src/InputConfigDiag.h

@@ -132,7 +132,7 @@ class ExtensionButton : public wxButton
 {
 public:
 	ExtensionButton( wxWindow* const parent, ControllerEmu::Extension* const ext )
-		: wxButton( parent, -1, wxT("Configure"), wxDefaultPosition )
+		: wxButton( parent, -1, _("Configure"), wxDefaultPosition )
 		, extension(ext) {}
 
 	ControllerEmu::Extension* const	extension;
@@ -151,7 +151,7 @@ class UDPConfigButton : public wxButton
 public:
 	UDPWrapper* const wrapper;
 	UDPConfigButton( wxWindow* const parent, UDPWrapper * udp)
-		: wxButton( parent, -1, wxT("Configure"), wxDefaultPosition )
+		: wxButton( parent, -1, _("Configure"), wxDefaultPosition )
 		, wrapper(udp)
 	{}
 };

Source/Core/DolphinWX/Src/LogWindow.cpp

@@ -72,14 +72,14 @@ void CLogWindow::CreateGUIControls()
 {
 	// Verbosity
 	wxArrayString wxLevels, wxLevelsUse;
-	wxLevels.Add(wxT("Notice"));
-	wxLevels.Add(wxT("Error"));
-	wxLevels.Add(wxT("Warning"));
-	wxLevels.Add(wxT("Info"));
-	wxLevels.Add(wxT("Debug"));
+	wxLevels.Add(_("Notice"));
+	wxLevels.Add(_("Error"));
+	wxLevels.Add(_("Warning"));
+	wxLevels.Add(_("Info"));
+	wxLevels.Add(_("Debug"));
 	for (int i = 0; i < MAX_LOGLEVEL; ++i)
 	   	wxLevelsUse.Add(wxString::Format(wxT("%s"), wxLevels.Item(i).c_str()));
-	m_verbosity = new wxRadioBox(this, IDM_VERBOSITY, wxT("Verbosity"),
+	m_verbosity = new wxRadioBox(this, IDM_VERBOSITY, _("Verbosity"),
 		   	wxDefaultPosition, wxDefaultSize, wxLevelsUse, 0,
 		   	wxRA_SPECIFY_ROWS, wxDefaultValidator);
 	// Don't take up so much space
@@ -89,24 +89,24 @@ void CLogWindow::CreateGUIControls()
 	m_FontChoice = new wxChoice(this, IDM_FONT,
 		   	wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
 
-	m_FontChoice->Append(wxT("Default font"));
-	m_FontChoice->Append(wxT("Monospaced font"));
-	m_FontChoice->Append(wxT("Selected font"));
+	m_FontChoice->Append(_("Default font"));
+	m_FontChoice->Append(_("Monospaced font"));
+	m_FontChoice->Append(_("Selected font"));
 	m_FontChoice->SetSelection(0);
 	DefaultFont = GetFont();
-	MonoSpaceFont.SetNativeFontInfoUserDesc(wxT("lucida console windows-1252"));
+	MonoSpaceFont.SetNativeFontInfoUserDesc(_("lucida console windows-1252"));
 	LogFont.push_back(DefaultFont);
 	LogFont.push_back(MonoSpaceFont);
 	LogFont.push_back(DebuggerFont);
 
 	// Options
-	wxCheckBox * m_WrapLine = new wxCheckBox(this, IDM_WRAPLINE, wxT("Word Wrap"));
+	wxCheckBox * m_WrapLine = new wxCheckBox(this, IDM_WRAPLINE, _("Word Wrap"));
 	m_writeFileCB = new wxCheckBox(this, IDM_WRITEFILE,
-		   	wxT("Write to File"), wxDefaultPosition, wxDefaultSize, 0);
+		   	_("Write to File"), wxDefaultPosition, wxDefaultSize, 0);
 	m_writeConsoleCB = new wxCheckBox(this, IDM_WRITECONSOLE,
-		   	wxT("Write to Console"), wxDefaultPosition, wxDefaultSize, 0);
+		   	_("Write to Console"), wxDefaultPosition, wxDefaultSize, 0);
 	m_writeWindowCB = new wxCheckBox(this, IDM_WRITEWINDOW,
-		   	wxT("Write to Window ->"), wxDefaultPosition, wxDefaultSize, 0);
+		   	_("Write to Window ->"), wxDefaultPosition, wxDefaultSize, 0);
 
 	m_checks = new wxCheckListBox(this, IDM_LOGCHECKS, wxDefaultPosition, wxDefaultSize);
 
@@ -121,12 +121,12 @@ void CLogWindow::CreateGUIControls()
 	sRight = new wxBoxSizer(wxVERTICAL);			// right sizer
 	sRightBottom = new wxBoxSizer(wxHORIZONTAL);	// submit row
 	// Left side: buttons (-submit), options, and log type selection
-	wxStaticBoxSizer* sbLeftOptions = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Options"));
+	wxStaticBoxSizer* sbLeftOptions = new wxStaticBoxSizer(wxVERTICAL, this, _("Options"));
 
 	wxBoxSizer* sLogCtrl = new wxBoxSizer(wxHORIZONTAL);
-	sLogCtrl->Add(new wxButton(this, IDM_TOGGLEALL, wxT("Toggle all"),
+	sLogCtrl->Add(new wxButton(this, IDM_TOGGLEALL, _("Toggle all"),
 			   	wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT), 1);
-	sLogCtrl->Add(new wxButton(this, IDM_CLEARLOG, wxT("Clear"),
+	sLogCtrl->Add(new wxButton(this, IDM_CLEARLOG, _("Clear"),
 			   	wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT), 1);
 
 	sbLeftOptions->Add(m_FontChoice, 0, (wxDOWN), 1);
@@ -168,11 +168,11 @@ void CLogWindow::OnClose(wxCloseEvent& event)
 void CLogWindow::OnSize(wxSizeEvent& event)
 {
 	if (!Parent->g_pCodeWindow &&
-		   	Parent->m_Mgr->GetPane(wxT("Pane 1")).IsShown())
+		   	Parent->m_Mgr->GetPane(_("Pane 1")).IsShown())
 	{
-		x = Parent->m_Mgr->GetPane(wxT("Pane 1")).rect.GetWidth();
-		y = Parent->m_Mgr->GetPane(wxT("Pane 1")).rect.GetHeight();
-		winpos = Parent->m_Mgr->GetPane(wxT("Pane 1")).dock_direction;
+		x = Parent->m_Mgr->GetPane(_("Pane 1")).rect.GetWidth();
+		y = Parent->m_Mgr->GetPane(_("Pane 1")).rect.GetHeight();
+		winpos = Parent->m_Mgr->GetPane(_("Pane 1")).dock_direction;
 	}
 	event.Skip();
 }
@@ -493,27 +493,27 @@ void CLogWindow::UpdateLog()
 	{
 		switch (msgQueue.front().first)
 		{
-			// red
+			
 			case ERROR_LEVEL:
 				m_Log->SetDefaultStyle(wxTextAttr(*wxRED));
 				break;
-				// yellow
+				
 			case WARNING_LEVEL:
-				m_Log->SetDefaultStyle(wxTextAttr(wxColour(255, 255, 0)));
+				m_Log->SetDefaultStyle(wxTextAttr(wxColour(255, 255, 0))); // YELLOW
 				break;
-				// green
+				
 			case NOTICE_LEVEL:
 				m_Log->SetDefaultStyle(wxTextAttr(*wxGREEN));
 				break;
-				// cyan
+				
 			case INFO_LEVEL:
 				m_Log->SetDefaultStyle(wxTextAttr(*wxCYAN));
 				break;
-				// light gray
+				
 			case DEBUG_LEVEL:
-				m_Log->SetDefaultStyle(wxTextAttr(wxColour(211, 211, 211)));
+				m_Log->SetDefaultStyle(wxTextAttr(*wxLIGHT_GREY));
 				break;
-				// white
+				
 			default:
 				m_Log->SetDefaultStyle(wxTextAttr(*wxWHITE));
 				break;

Source/Core/DolphinWX/Src/LogWindow.h

@@ -54,7 +54,7 @@ public:
 		const wxPoint& pos = wxDefaultPosition,
 		const wxSize& size = wxDefaultSize,
 		long style = wxTAB_TRAVERSAL,
-		const wxString& name = wxT("Log")
+		const wxString& name = _("Log")
 		);
 	~CLogWindow();
 

Source/Core/DolphinWX/Src/LuaWindow.cpp

@@ -58,7 +58,7 @@ void LuaStop(int uid, bool ok)
 }
 
 wxLuaWindow::wxLuaWindow(wxFrame* parent, const wxPoint& pos, const wxSize& size) :
-	wxFrame(parent, wxID_ANY, _T("Lua Script Console"), pos, size, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
+	wxFrame(parent, wxID_ANY, _("Lua Script Console"), pos, size, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
 	LuaWindow_InitFirstTime();
 
@@ -107,11 +107,11 @@ void wxLuaWindow::InitGUIControls()
 	m_Tab_Log->Layout();
 
 	// Button Strip
-	m_Button_Close = new wxButton(this, ID_BUTTON_CLOSE, _T("Close"), wxDefaultPosition, wxDefaultSize);
-	m_Button_LoadScript = new wxButton(this, ID_BUTTON_LOAD, _T("Load Script..."), wxDefaultPosition, wxDefaultSize);
-	m_Button_Run = new wxButton(this, ID_BUTTON_RUN, _T("Run"), wxDefaultPosition, wxDefaultSize);
-	m_Button_Stop = new wxButton(this, ID_BUTTON_STOP, _T("Stop"), wxDefaultPosition, wxDefaultSize);
-	m_Button_Clear = new wxButton(this, ID_BUTTON_CLEAR, _T("Clear"), wxDefaultPosition, wxDefaultSize);
+	m_Button_Close = new wxButton(this, ID_BUTTON_CLOSE, _("Close"), wxDefaultPosition, wxDefaultSize);
+	m_Button_LoadScript = new wxButton(this, ID_BUTTON_LOAD, _("Load Script..."), wxDefaultPosition, wxDefaultSize);
+	m_Button_Run = new wxButton(this, ID_BUTTON_RUN, _("Run"), wxDefaultPosition, wxDefaultSize);
+	m_Button_Stop = new wxButton(this, ID_BUTTON_STOP, _("Stop"), wxDefaultPosition, wxDefaultSize);
+	m_Button_Clear = new wxButton(this, ID_BUTTON_CLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize);
 	wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL);
 
 	m_Button_Run->Disable();
@@ -135,7 +135,7 @@ void wxLuaWindow::InitGUIControls()
 void wxLuaWindow::OnEvent_ScriptLoad_Press(wxCommandEvent&  WXUNUSED(event)) 
 {
 	wxString path = wxFileSelector(
-		_T("Select the script to load"),
+		_("Select the script to load"),
 		wxEmptyString, wxEmptyString, wxEmptyString,
 		wxString::Format
 		(
@@ -160,7 +160,7 @@ void wxLuaWindow::OnEvent_ScriptLoad_Press(wxCommandEvent&  WXUNUSED(event))
 
 void wxLuaWindow::OnEvent_ScriptRun_Press(wxCommandEvent&  WXUNUSED(event)) 
 {
-	m_TextCtrl_Log->AppendText(wxT("Running script...\n"));
+	m_TextCtrl_Log->AppendText(_("Running script...\n"));
 	bScriptRunning = true;
 	m_Button_LoadScript->Disable();
 	m_Button_Run->Disable();

Source/Core/DolphinWX/Src/Main.cpp

@@ -43,6 +43,8 @@
 #include "BootManager.h"
 #include "Frame.h"
 
+#include <wx/intl.h>
+
 // ------------
 //  Main window
 
@@ -89,6 +91,8 @@ LONG WINAPI MyUnhandledExceptionFilter(LPEXCEPTION_POINTERS e) {
 
 bool DolphinApp::OnInit()
 {
+	InitLanguageSupport();
+
 	// Declarations and definitions
 	bool UseDebugger = false;
 	bool BatchMode = false;
@@ -137,28 +141,28 @@ bool DolphinApp::OnInit()
 	{
 		{
 			wxCMD_LINE_SWITCH, _("h"), _("help"), 
-			wxT("Show this help message"),
+			_("Show this help message"),
 			wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
 		},
 		{
-			wxCMD_LINE_SWITCH, _("d"), _("debugger"), wxT("Opens the debugger")
+			wxCMD_LINE_SWITCH, _("d"), _("debugger"), _("Opens the debugger")
 		},
 		{
-			wxCMD_LINE_SWITCH, _("l"), _("logger"), wxT("Opens the logger")
+			wxCMD_LINE_SWITCH, _("l"), _("logger"), _("Opens the logger")
 		},
 		{
-			wxCMD_LINE_OPTION, _("e"), _("exec"), wxT("Loads the specified file (DOL, ELF, WAD, GCM, ISO)"),
+			wxCMD_LINE_OPTION, _("e"), _("exec"), _("Loads the specified file (DOL, ELF, WAD, GCM, ISO)"),
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
 		},
 		{
-			wxCMD_LINE_SWITCH, _("b"), _("batch"), wxT("Exit Dolphin with emulator")
+			wxCMD_LINE_SWITCH, _("b"), _("batch"), _("Exit Dolphin with emulator")
 		},
 		{
-			wxCMD_LINE_OPTION, _("V"), _("video_plugin"), wxT("Specify a video plugin"),
+			wxCMD_LINE_OPTION, _("V"), _("video_plugin"), _("Specify a video plugin"),
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
 		},
 		{
-			wxCMD_LINE_OPTION, _("A"), _("audio_plugin"), wxT("Specify an audio plugin"),
+			wxCMD_LINE_OPTION, _("A"), _("audio_plugin"), _("Specify an audio plugin"),
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
 		},
 		{
@@ -179,18 +183,18 @@ bool DolphinApp::OnInit()
 	LoadFile = parser.Found("exec", &FileToLoad);
 	BatchMode = parser.Found("batch");
 #else
-	UseDebugger = parser.Found(wxT("debugger"));
-	UseLogger = parser.Found(wxT("logger"));
-	LoadFile = parser.Found(wxT("exec"), &FileToLoad);
-	BatchMode = parser.Found(wxT("batch"));
+	UseDebugger = parser.Found(_("debugger"));
+	UseLogger = parser.Found(_("logger"));
+	LoadFile = parser.Found(_("exec"), &FileToLoad);
+	BatchMode = parser.Found(_("batch"));
 #endif
 
 #if wxCHECK_VERSION(2, 9, 0)
 	selectVideoPlugin = parser.Found("video_plugin", &videoPluginFilename);
 	selectAudioPlugin = parser.Found("audio_plugin", &audioPluginFilename);
 #else
-	selectVideoPlugin = parser.Found(wxT("video_plugin"), &videoPluginFilename);
-	selectAudioPlugin = parser.Found(wxT("audio_plugin"), &audioPluginFilename);
+	selectVideoPlugin = parser.Found(_("video_plugin"), &videoPluginFilename);
+	selectAudioPlugin = parser.Found(_("audio_plugin"), &audioPluginFilename);
 #endif
 #endif // wxUSE_CMDLINE_PARSER
 
@@ -403,6 +407,49 @@ void DolphinApp::AfterInit(wxTimerEvent& WXUNUSED(event))
 	}
 }
 
+void DolphinApp::InitLanguageSupport()
+{
+	int language = 0;
+
+	const wxLanguage langIds[] =
+	{
+		wxLANGUAGE_DEFAULT,
+		wxLANGUAGE_GERMAN,
+		wxLANGUAGE_FRENCH,
+		wxLANGUAGE_SPANISH,
+		wxLANGUAGE_ITALIAN,
+		wxLANGUAGE_DUTCH,
+	};
+
+	IniFile ini;
+	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	ini.Get("Interface", "Language", &language, 0);
+
+	// Load language if possible, fall back to system default otherwise
+	if(wxLocale::IsAvailable(langIds[language]))
+	{
+		m_locale = new wxLocale(langIds[language]);
+
+#ifdef _WIN32
+		m_locale->AddCatalogLookupPathPrefix(wxT("Languages"));
+#endif
+
+		m_locale->AddCatalog(wxT("dolphin-emu"));
+
+		if(!m_locale->IsOk())
+		{
+			PanicAlert("Error loading selected language.  Falling back to system default.\n");
+			delete m_locale;
+			m_locale = new wxLocale(wxLANGUAGE_DEFAULT);
+		}
+	}
+	else
+	{
+		PanicAlert("The selected language is not supported by your system.  Falling back to system default.\n");
+		m_locale = new wxLocale(wxLANGUAGE_DEFAULT);
+	}
+}
+
 void DolphinApp::OnEndSession()
 {
 	SConfig::GetInstance().SaveSettings();
@@ -419,6 +466,8 @@ int DolphinApp::OnExit()
 	SConfig::Shutdown();
 	LogManager::Shutdown();
 
+	delete m_locale;
+
 	return wxApp::OnExit();
 }
 

Source/Core/DolphinWX/Src/Main.h

@@ -29,6 +29,7 @@ public:
 	void OnEndSession();
 	int OnExit();
 	CFrame* GetCFrame();
+	void InitLanguageSupport();
 
 private:
 	DECLARE_EVENT_TABLE()
@@ -36,6 +37,7 @@ private:
 	wxTimer *m_afterinit;
 	bool LoadFile;
 	wxString FileToLoad;
+	wxLocale *m_locale;
 
 	void AfterInit(wxTimerEvent& WXUNUSED(event));
 };

Source/Core/DolphinWX/Src/MemcardManager.cpp

@@ -189,7 +189,7 @@ void CMemcardManager::CreateGUIControls()
 
 	const wxChar* ARROW[2] = {_T("<-"), _T("->")};
 
-	m_ConvertToGci = new wxButton(this, ID_CONVERTTOGCI, wxT("Convert to GCI"));
+	m_ConvertToGci = new wxButton(this, ID_CONVERTTOGCI, _("Convert to GCI"));
 	
 	for (int slot = SLOT_A; slot < SLOT_B + 1; slot++)
 	{
@@ -203,8 +203,8 @@ void CMemcardManager::CreateGUIControls()
 			wxString::Format(wxT("%sDelete%s"), ARROWS));
 
 
-		m_PrevPage[slot] = new wxButton(this, ID_PREVPAGE_A + slot, wxT("Prev Page"));
-		m_NextPage[slot] = new wxButton(this, ID_NEXTPAGE_A + slot, wxT("Next Page"));
+		m_PrevPage[slot] = new wxButton(this, ID_PREVPAGE_A + slot, _("Prev Page"));
+		m_NextPage[slot] = new wxButton(this, ID_NEXTPAGE_A + slot, _("Next Page"));
 
 		t_Status[slot] = new wxStaticText(this, 0, wxEmptyString, wxDefaultPosition,wxDefaultSize, 0, wxEmptyString);
 
@@ -215,8 +215,8 @@ void CMemcardManager::CreateGUIControls()
 		sPages[slot]->Add(m_NextPage[slot], 0, wxEXPAND|wxALL, 1);
 
 		m_MemcardPath[slot] = new wxFilePickerCtrl(this, ID_MEMCARDPATH_A + slot,
-			 wxString::From8BitData(File::GetUserPath(D_GCUSER_IDX)), wxT("Choose a memory card:"),
-		wxT("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp"), wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
+			 wxString::From8BitData(File::GetUserPath(D_GCUSER_IDX)), _("Choose a memory card:"),
+		_("Gamecube Memory Cards (*.raw,*.gcp)|*.raw;*.gcp"), wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
 	
 		m_MemcardList[slot] = new CMemcardListCtrl(this, ID_MEMCARDLIST_A + slot, wxDefaultPosition, wxSize(350,400),
 		wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL, mcmSettings);
@@ -526,18 +526,18 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 	case ID_SAVEIMPORT_B:
 	{
 		wxString fileName = wxFileSelector(
-			wxT("Select a save file to import"),
+			_("Select a save file to import"),
 			(strcmp(DefaultIOPath.c_str(), "/Users/GC") == 0)
 				? wxString::FromAscii("")
 				: wxString::From8BitData(DefaultIOPath.c_str()),
 			wxEmptyString, wxEmptyString,
-			wxT("Native GCI files(*.gci)|*.gci|")
-			wxT("MadCatz Gameshark files(*.gcs)|*.gcs|")
-			wxT("Datel MaxDrive/Pro files(*.sav)|*.sav"),
+			_T("Native GCI files(*.gci)|*.gci|")
+			_T("MadCatz Gameshark files(*.gcs)|*.gcs|")
+			_T("Datel MaxDrive/Pro files(*.sav)|*.sav"),
 			wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 		if (!fileName.empty() && !fileName2.empty())
 		{
-			wxString temp2 = wxFileSelector(wxT("Save GCI as.."),
+			wxString temp2 = wxFileSelector(_("Save GCI as.."),
 				wxEmptyString, wxEmptyString, wxT(".gci"),
 				wxT("GCI File(*.gci)|*.gci"),
 				wxFD_OVERWRITE_PROMPT|wxFD_SAVE);
@@ -562,7 +562,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
 			memoryCard[slot]->DEntry_FileName(index,tempC2);
 			sprintf(tempC, "%s_%s.gci", tempC, tempC2);
 			wxString fileName = wxFileSelector(
-				wxT("Export save as.."),
+				_("Export save as.."),
 				wxString::From8BitData(DefaultIOPath.c_str()),
 				wxString::From8BitData(tempC), wxT(".gci"),
 				wxT("Native GCI files(*.gci)|*.gci|")
@@ -631,12 +631,12 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
 	m_MemcardList[card]->Hide();
 	m_MemcardList[card]->ClearAll();
 
-	m_MemcardList[card]->InsertColumn(COLUMN_BANNER, _T("Banner"));
-	m_MemcardList[card]->InsertColumn(COLUMN_TITLE, _T("Title"));
-	m_MemcardList[card]->InsertColumn(COLUMN_COMMENT, _T("Comment"));
-	m_MemcardList[card]->InsertColumn(COLUMN_ICON, _T("Icon"));
-	m_MemcardList[card]->InsertColumn(COLUMN_BLOCKS, _T("Blocks"));
-	m_MemcardList[card]->InsertColumn(COLUMN_FIRSTBLOCK, _T("First Block"));
+	m_MemcardList[card]->InsertColumn(COLUMN_BANNER, _("Banner"));
+	m_MemcardList[card]->InsertColumn(COLUMN_TITLE, _("Title"));
+	m_MemcardList[card]->InsertColumn(COLUMN_COMMENT, _("Comment"));
+	m_MemcardList[card]->InsertColumn(COLUMN_ICON, _("Icon"));
+	m_MemcardList[card]->InsertColumn(COLUMN_BLOCKS, _("Blocks"));
+	m_MemcardList[card]->InsertColumn(COLUMN_FIRSTBLOCK, _("First Block"));
 
 	wxImageList *list = m_MemcardList[card]->GetImageList(wxIMAGE_LIST_SMALL);
 	list->RemoveAll();
@@ -793,20 +793,20 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
 
 		int slot = GetId() - ID_MEMCARDLIST_A;
 		popupMenu->Append(ID_COPYFROM_A + slot, wxString::Format(wxT("Copy to Memcard %c"), 'B' - slot));
-		popupMenu->Append(ID_DELETE_A + slot, wxT("Delete Save"));
-		popupMenu->Append(ID_SAVEIMPORT_A + slot, wxT("Import Save"));
-		popupMenu->Append(ID_SAVEEXPORT_A + slot, wxT("Export Save"));
-		popupMenu->Append(ID_EXPORTALL_A + slot, wxT("Export all saves"));
+		popupMenu->Append(ID_DELETE_A + slot, _("Delete Save"));
+		popupMenu->Append(ID_SAVEIMPORT_A + slot, _("Import Save"));
+		popupMenu->Append(ID_SAVEEXPORT_A + slot, _("Export Save"));
+		popupMenu->Append(ID_EXPORTALL_A + slot, _("Export all saves"));
 				
 		popupMenu->FindItem(ID_COPYFROM_A + slot)->Enable(__mcmSettings.twoCardsLoaded);
 
 		popupMenu->AppendSeparator();
 
-		popupMenu->Append(ID_FIXCHECKSUM_A + slot, wxT("Fix Checksums"));
-		popupMenu->Append(ID_PREVPAGE_A + slot, wxT("Previous Page"));
-		popupMenu->Append(ID_NEXTPAGE_A + slot, wxT("Next Page"));
+		popupMenu->Append(ID_FIXCHECKSUM_A + slot, _("Fix Checksums"));
+		popupMenu->Append(ID_PREVPAGE_A + slot, _("Previous Page"));
+		popupMenu->Append(ID_NEXTPAGE_A + slot, _("Next Page"));
 		popupMenu->Append(ID_MEMCARDPATH_A + slot, wxString::Format(wxT("Set as default Memcard %c"), 'A' + slot));
-		popupMenu->AppendCheckItem(ID_USEPAGES, wxT("Enable pages"));
+		popupMenu->AppendCheckItem(ID_USEPAGES, _("Enable pages"));
 	
 		popupMenu->FindItem(ID_PREVPAGE_A + slot)->Enable(prevPage && __mcmSettings.usePages);
 		popupMenu->FindItem(ID_NEXTPAGE_A + slot)->Enable(nextPage && __mcmSettings.usePages);
@@ -814,11 +814,11 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
 		
 		popupMenu->AppendSeparator();
 
-		popupMenu->AppendCheckItem(COLUMN_BANNER, wxT("Show save banner"));
-		popupMenu->AppendCheckItem(COLUMN_TITLE, wxT("Show save title"));
-		popupMenu->AppendCheckItem(COLUMN_COMMENT, wxT("Show save comment"));
-		popupMenu->AppendCheckItem(COLUMN_ICON, wxT("Show save icon"));
-		popupMenu->AppendCheckItem(COLUMN_BLOCKS, wxT("Show save blocks"));
+		popupMenu->AppendCheckItem(COLUMN_BANNER, _("Show save banner"));
+		popupMenu->AppendCheckItem(COLUMN_TITLE, _("Show save title"));
+		popupMenu->AppendCheckItem(COLUMN_COMMENT, _("Show save comment"));
+		popupMenu->AppendCheckItem(COLUMN_ICON, _("Show save icon"));
+		popupMenu->AppendCheckItem(COLUMN_BLOCKS, _("Show save blocks"));
 
 		for (int i = COLUMN_BANNER; i <= COLUMN_BLOCKS; i++)
 		{

Source/Core/DolphinWX/Src/NetWindow.cpp

@@ -44,7 +44,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
 	wxPanel* const panel = new wxPanel(this);
 
 	// top row
-	wxStaticText* const nick_lbl = new wxStaticText(panel, wxID_ANY, wxT("Nickname :"), wxDefaultPosition, wxDefaultSize);
+	wxStaticText* const nick_lbl = new wxStaticText(panel, wxID_ANY, _("Nickname :"), wxDefaultPosition, wxDefaultSize);
 	
 	std::string nickname;
 	netplay_section.Get("Nickname", &nickname, "Player");
@@ -58,14 +58,14 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
 	// tabs
 	wxNotebook* const notebook = new wxNotebook(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize);
 	wxPanel* const connect_tab = new wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-	notebook->AddPage(connect_tab, wxT("Connect"));
+	notebook->AddPage(connect_tab, _("Connect"));
 	wxPanel* const host_tab = new wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-	notebook->AddPage(host_tab, wxT("Host"));
+	notebook->AddPage(host_tab, _("Host"));
 
 
 	// connect tab
 	{
-	wxStaticText* const ip_lbl = new wxStaticText(connect_tab, wxID_ANY, wxT("Address :"), wxDefaultPosition, wxDefaultSize);
+	wxStaticText* const ip_lbl = new wxStaticText(connect_tab, wxID_ANY, _("Address :"), wxDefaultPosition, wxDefaultSize);
 	
 	std::string address;
 	netplay_section.Get("Address", &address, "localhost");
@@ -78,7 +78,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
 	netplay_section.Get("ConnectPort", &port, "2626");	
 	m_connect_port_text = new wxTextCtrl(connect_tab, wxID_ANY, wxString::FromAscii(port.c_str()));
 
-	wxButton* const connect_btn = new wxButton(connect_tab, wxID_ANY, wxT("Connect"));
+	wxButton* const connect_btn = new wxButton(connect_tab, wxID_ANY, _("Connect"));
 	_connect_macro_(connect_btn, NetPlaySetupDiag::OnJoin, wxEVT_COMMAND_BUTTON_CLICKED, this);
 
 	wxStaticText* const alert_lbl = new wxStaticText(connect_tab, wxID_ANY
@@ -142,7 +142,7 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
 	}
 
 	// bottom row
-	wxButton* const quit_btn = new wxButton(panel, wxID_ANY, wxT("Quit"));
+	wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit"));
 	_connect_macro_(quit_btn, NetPlaySetupDiag::OnQuit, wxEVT_COMMAND_BUTTON_CLICKED, this);
 
 	// main sizer
@@ -257,7 +257,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
 
 	// top crap
 	m_game_btn = new wxButton(panel, wxID_ANY
-		, wxString(m_selected_game.c_str(), *wxConvCurrent).Prepend(wxT(" Game : ")), wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
+		, wxString(m_selected_game.c_str(), *wxConvCurrent).Prepend(_(" Game : ")), wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
 	
 	if (is_hosting)
 		_connect_macro_(m_game_btn, NetPlayDiag::OnChangeGame, wxEVT_COMMAND_BUTTON_CLICKED, this);
@@ -274,7 +274,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
 		, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
 	_connect_macro_(m_chat_msg_text, NetPlayDiag::OnChat, wxEVT_COMMAND_TEXT_ENTER, this);
 
-	wxButton* const chat_msg_btn = new wxButton(panel, wxID_ANY, wxT("Send"));
+	wxButton* const chat_msg_btn = new wxButton(panel, wxID_ANY, _("Send"));
 	_connect_macro_(chat_msg_btn, NetPlayDiag::OnChat, wxEVT_COMMAND_BUTTON_CLICKED, this);
 
 	wxBoxSizer* const chat_msg_szr = new wxBoxSizer(wxHORIZONTAL);
@@ -287,12 +287,12 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
 
 	m_player_lbox = new wxListBox(panel, wxID_ANY, wxDefaultPosition, wxSize(192,-1));
 
-	wxStaticBoxSizer* const player_szr = new wxStaticBoxSizer(wxVERTICAL, panel, wxT("Players"));
+	wxStaticBoxSizer* const player_szr = new wxStaticBoxSizer(wxVERTICAL, panel, _("Players"));
 	player_szr->Add(m_player_lbox, 1, wxEXPAND);
 	// player list
 	if (is_hosting)
 	{
-		wxButton* const player_config_btn = new wxButton(panel, wxID_ANY, wxT("Configure Pads"));
+		wxButton* const player_config_btn = new wxButton(panel, wxID_ANY, _("Configure Pads"));
 		_connect_macro_(player_config_btn, NetPlayDiag::OnConfigPads, wxEVT_COMMAND_BUTTON_CLICKED, this);
 		player_szr->Add(player_config_btn, 0, wxEXPAND | wxTOP, 5);
 	}
@@ -302,19 +302,19 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
 	mid_szr->Add(player_szr, 0, wxEXPAND);
 
 	// bottom crap
-	wxButton* const quit_btn = new wxButton(panel, wxID_ANY, wxT("Quit"));
+	wxButton* const quit_btn = new wxButton(panel, wxID_ANY, _("Quit"));
 	_connect_macro_(quit_btn, NetPlayDiag::OnQuit, wxEVT_COMMAND_BUTTON_CLICKED, this);
 
 	wxBoxSizer* const bottom_szr = new wxBoxSizer(wxHORIZONTAL);
 	if (is_hosting)
 	{
-		wxButton* const start_btn = new wxButton(panel, wxID_ANY, wxT("Start"));
+		wxButton* const start_btn = new wxButton(panel, wxID_ANY, _("Start"));
 		_connect_macro_(start_btn, NetPlayDiag::OnStart, wxEVT_COMMAND_BUTTON_CLICKED, this);
 		bottom_szr->Add(start_btn);
-		wxButton* const stop_btn = new wxButton(panel, wxID_ANY, wxT("Stop"));
+		wxButton* const stop_btn = new wxButton(panel, wxID_ANY, _("Stop"));
 		_connect_macro_(stop_btn, NetPlayDiag::OnStop, wxEVT_COMMAND_BUTTON_CLICKED, this);
 		bottom_szr->Add(stop_btn);
-		bottom_szr->Add(new wxStaticText(panel, wxID_ANY, wxT("Buffer:")), 0, wxLEFT | wxCENTER, 5 );
+		bottom_szr->Add(new wxStaticText(panel, wxID_ANY, _("Buffer:")), 0, wxLEFT | wxCENTER, 5 );
 		wxSpinCtrl* const padbuf_spin = new wxSpinCtrl(panel, wxID_ANY, wxT("20")
 			, wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 0, 200, 20);
 		_connect_macro_(padbuf_spin, NetPlayDiag::OnAdjustBuffer, wxEVT_COMMAND_SPINCTRL_UPDATED, this);
@@ -439,7 +439,7 @@ void NetPlayDiag::OnThread(wxCommandEvent& event)
 		// update selected game :/
 		{
 		m_selected_game.assign(event.GetString().mb_str());
-		m_game_btn->SetLabel(event.GetString().Prepend(wxT(" Game : ")));
+		m_game_btn->SetLabel(event.GetString().Prepend(_(" Game : ")));
 		}
 		break;
 	case NP_GUI_EVT_START_GAME :
@@ -504,7 +504,7 @@ void NetPlayDiag::OnConfigPads(wxCommandEvent&)
 }
 
 ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* const game_list, wxString& game_name)
-	: wxDialog(parent, wxID_ANY, wxT("Change Game"), wxDefaultPosition, wxDefaultSize)
+	: wxDialog(parent, wxID_ANY, _("Change Game"), wxDefaultPosition, wxDefaultSize)
 	, m_game_name(game_name)
 {
 	wxPanel* const panel = new wxPanel(this);
@@ -518,7 +518,7 @@ ChangeGameDiag::ChangeGameDiag(wxWindow* const parent, const CGameListCtrl* cons
 	while (std::getline(ss,game))
 		m_game_lbox->Append(wxString(game.c_str(), *wxConvCurrent));
 
-	wxButton* const ok_btn = new wxButton(panel, wxID_ANY, wxT("Change"));
+	wxButton* const ok_btn = new wxButton(panel, wxID_ANY, _("Change"));
 	_connect_macro_(ok_btn, ChangeGameDiag::OnPick, wxEVT_COMMAND_BUTTON_CLICKED, this);
 
 	wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
@@ -540,7 +540,7 @@ void ChangeGameDiag::OnPick(wxCommandEvent&)
 }
 
 PadMapDiag::PadMapDiag(wxWindow* const parent, int map[])
-	: wxDialog(parent, wxID_ANY, wxT("Configure Pads"), wxDefaultPosition, wxDefaultSize)
+	: wxDialog(parent, wxID_ANY, _("Configure Pads"), wxDefaultPosition, wxDefaultSize)
 	, m_mapping(map)
 {
 	wxPanel* const panel = new wxPanel(this);
@@ -551,17 +551,17 @@ PadMapDiag::PadMapDiag(wxWindow* const parent, int map[])
 
 	// labels
 	wxBoxSizer* const label_szr = new wxBoxSizer(wxVERTICAL);
-	label_szr->Add(new wxStaticText(panel,wxID_ANY, wxT("Local")), 0, wxALIGN_TOP);
+	label_szr->Add(new wxStaticText(panel,wxID_ANY, _("Local")), 0, wxALIGN_TOP);
 	label_szr->AddStretchSpacer(1);
-	label_szr->Add(new wxStaticText(panel,wxID_ANY, wxT("In-Game")), 0, wxALIGN_BOTTOM);
+	label_szr->Add(new wxStaticText(panel,wxID_ANY, _("In-Game")), 0, wxALIGN_BOTTOM);
 
 	h_szr->Add(label_szr, 1, wxTOP | wxBOTTOM | wxEXPAND, 20);
 
 	// set up choices
 	wxString pad_names[5];
-	pad_names[0] = wxT("None");
+	pad_names[0] = _("None");
 	for (unsigned int i=1; i<5; ++i)
-		pad_names[i] = wxString(wxT("Pad ")) + (wxChar)(wxT('0')+i);
+		pad_names[i] = wxString(_("Pad ")) + (wxChar)(wxT('0')+i);
 
 	for (unsigned int i=0; i<4; ++i)
 	{

Source/Core/DolphinWX/Src/PatchAddEdit.cpp

@@ -99,7 +99,7 @@ void CPatchAddEdit::CreateGUIControls(int _selection)
 	sbEntry->Add(sEntryAddRemove, 0, wxEXPAND);
 	sEditPatch->Add(sbEntry, 0, wxEXPAND|wxALL, 5);
 	wxBoxSizer* sEditPatchButtons = new wxBoxSizer(wxHORIZONTAL);
-	wxButton* bOK = new wxButton(this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	wxButton* bOK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	wxButton* bCancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	sEditPatchButtons->Add(0, 0, 1, wxEXPAND, 5);
 	sEditPatchButtons->Add(bOK, 0, wxALL, 5);

Source/Core/DolphinWX/Src/PatchAddEdit.h

@@ -27,7 +27,7 @@ class CPatchAddEdit : public wxDialog
 	public:
 		CPatchAddEdit(int _selection, wxWindow* parent,
 			wxWindowID id = 1,
-			const wxString& title = wxT("Edit Patch"),
+			const wxString& title = _("Edit Patch"),
 			const wxPoint& pos = wxDefaultPosition,
 			const wxSize& size = wxDefaultSize,
 			long style = wxDEFAULT_DIALOG_STYLE);

Source/Core/DolphinWX/Src/UDPConfigDiag.cpp

@@ -9,27 +9,27 @@
 #define _connect_macro_(b, f, c, s)	(b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s)
 
 UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) :
-	wxDialog(parent, -1, wxT("UDP Wiimote"), wxDefaultPosition, wxDefaultSize),
+	wxDialog(parent, -1, _("UDP Wiimote"), wxDefaultPosition, wxDefaultSize),
 	wrp(_wrp)
 {
 	wxBoxSizer *const outer_sizer = new wxBoxSizer(wxVERTICAL);
 	wxBoxSizer *const sizer1 = new wxBoxSizer(wxVERTICAL);
-	wxStaticBoxSizer *const sizer2 = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Update"));
+	wxStaticBoxSizer *const sizer2 = new wxStaticBoxSizer(wxVERTICAL, this, _("Update"));
 
 	outer_sizer->Add(sizer1, 0, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, 5);
 	outer_sizer->Add(sizer2, 1, wxLEFT | wxRIGHT | wxEXPAND, 10);
 
-	enable = new wxCheckBox(this,wxID_ANY,wxT("Enable"));
-	butt = new wxCheckBox(this,wxID_ANY,wxT("Buttons"));
-	accel = new wxCheckBox(this,wxID_ANY,wxT("Acceleration"));
-	point = new wxCheckBox(this,wxID_ANY,wxT("IR Pointer"));
-	nun = new wxCheckBox(this,wxID_ANY,wxT("Nunchuk"));
-	nunaccel = new wxCheckBox(this,wxID_ANY,wxT("Nunchuk Acceleration"));
+	enable = new wxCheckBox(this,wxID_ANY,_("Enable"));
+	butt = new wxCheckBox(this,wxID_ANY,_("Buttons"));
+	accel = new wxCheckBox(this,wxID_ANY,_("Acceleration"));
+	point = new wxCheckBox(this,wxID_ANY,_("IR Pointer"));
+	nun = new wxCheckBox(this,wxID_ANY,_("Nunchuk"));
+	nunaccel = new wxCheckBox(this,wxID_ANY,_("Nunchuk Acceleration"));
 
 	wxButton *const ok_butt = new wxButton(this,wxID_ANY,wxT("OK"));
 	
 	wxBoxSizer *const port_sizer = new wxBoxSizer(wxHORIZONTAL);
-	port_sizer->Add(new wxStaticText(this, wxID_ANY, wxT("UDP Port:")), 0, wxALIGN_CENTER);
+	port_sizer->Add(new wxStaticText(this, wxID_ANY, _("UDP Port:")), 0, wxALIGN_CENTER);
 	port_tbox = new wxTextCtrl(this, wxID_ANY, wxString::FromUTF8(wrp->port.c_str()));
 	port_sizer->Add(port_tbox, 1, wxLEFT | wxEXPAND , 5);
 

Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp

@@ -6,7 +6,7 @@
 
 const wxString& ConnectedWiimotesString()
 {
-	static wxString str = wxT("Connected to . Wiimotes");
+	static wxString str = _("Connected to . Wiimotes");
 	str[13] = wxChar(wxT('0') + WiimoteReal::Initialize());
 	return str;
 }
@@ -16,34 +16,34 @@ WiimoteConfigPage::WiimoteConfigPage(wxWindow* const parent, const int index)
 	, m_index(index)
 {
 	// input source
-	const wxString src_choices[] = { wxT("None"),
-		wxT("Emulated Wiimote"), wxT("Real Wiimote"), wxT("Hybrid Wiimote") };
+	const wxString src_choices[] = { _("None"),
+		_("Emulated Wiimote"), _("Real Wiimote"), _("Hybrid Wiimote") };
 
 	wxChoice* const input_src_choice = new wxChoice(this, -1, wxDefaultPosition, wxDefaultSize,
 		sizeof(src_choices)/sizeof(*src_choices), src_choices);
 	input_src_choice->Select(g_wiimote_sources[m_index]);
 	_connect_macro_(input_src_choice, WiimoteConfigPage::SelectSource, wxEVT_COMMAND_CHOICE_SELECTED, this);
 
-	wxStaticBoxSizer* const input_src_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("Input Source"));
+	wxStaticBoxSizer* const input_src_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Input Source"));
 	input_src_sizer->Add(input_src_choice, 1, wxEXPAND | wxALL, 5);
 
 	// emulated wiimote
-	wxButton* const configure_wiimote_emu_btn = new wxButton(this, -1, wxT("Configure"));
-	wxStaticBoxSizer* const wiimote_emu_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("Emulated Wiimote"));
+	wxButton* const configure_wiimote_emu_btn = new wxButton(this, -1, _("Configure"));
+	wxStaticBoxSizer* const wiimote_emu_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Emulated Wiimote"));
 	wiimote_emu_sizer->Add(configure_wiimote_emu_btn, 1, wxEXPAND | wxALL, 5);
 	_connect_macro_(configure_wiimote_emu_btn, WiimoteConfigDiag::ConfigEmulatedWiimote, wxEVT_COMMAND_BUTTON_CLICKED, parent->GetParent());
 
 	// real wiimote
 	connected_wiimotes_txt = new wxStaticText(this, -1, ConnectedWiimotesString());
 
-	wxButton* const refresh_btn = new wxButton(this, -1, wxT("Refresh"), wxDefaultPosition);
+	wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"), wxDefaultPosition);
 	_connect_macro_(refresh_btn, WiimoteConfigDiag::RefreshRealWiimotes, wxEVT_COMMAND_BUTTON_CLICKED, parent->GetParent());
 
-	wxStaticBoxSizer* const wiimote_real_sizer = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Real Wiimote"));
+	wxStaticBoxSizer* const wiimote_real_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Real Wiimote"));
 	wiimote_real_sizer->AddStretchSpacer(1);
 	wiimote_real_sizer->Add(connected_wiimotes_txt, 0, wxALIGN_CENTER | wxBOTTOM | wxLEFT | wxRIGHT, 5);
 #ifdef _WIN32
-	wxButton* const pairup_btn = new wxButton(this, -1, wxT("Pair Up"), wxDefaultPosition);
+	wxButton* const pairup_btn = new wxButton(this, -1, _("Pair Up"), wxDefaultPosition);
 	_connect_macro_(pairup_btn, WiimoteConfigDiag::PairUpRealWiimotes, wxEVT_COMMAND_BUTTON_CLICKED, parent->GetParent());
 	wiimote_real_sizer->Add(pairup_btn, 0, wxALIGN_CENTER | wxBOTTOM, 5);
 #endif
@@ -64,7 +64,7 @@ WiimoteConfigPage::WiimoteConfigPage(wxWindow* const parent, const int index)
 }
 
 WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin)
-	: wxDialog(parent, -1, wxT("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize)
+	: wxDialog(parent, -1, _("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize)
 	, m_plugin(plugin)
 {
 	m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT);