diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index ecce747f81..f94408e536 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -218,28 +218,28 @@ void Shutdown() } const std::array groups_info = { - {{"General", HK_OPEN, HK_EXIT}, - {"Volume", HK_VOLUME_DOWN, HK_VOLUME_TOGGLE_MUTE}, - {"Emulation speed", HK_DECREASE_EMULATION_SPEED, HK_TOGGLE_THROTTLE}, - {"Frame advance", HK_FRAME_ADVANCE, HK_FRAME_ADVANCE_RESET_SPEED}, - {"Movie", HK_START_RECORDING, HK_READ_ONLY_MODE}, - {"Wii", HK_TRIGGER_SYNC_BUTTON, HK_BALANCEBOARD_CONNECT}, - {"Graphics toggles", HK_TOGGLE_CROP, HK_TOGGLE_TEXTURES}, - {"Internal Resolution", HK_INCREASE_IR, HK_DECREASE_IR}, - {"Freelook", HK_FREELOOK_DECREASE_SPEED, HK_FREELOOK_RESET}, - {"3D", HK_TOGGLE_STEREO_SBS, HK_TOGGLE_STEREO_3DVISION}, - {"3D depth", HK_DECREASE_DEPTH, HK_INCREASE_CONVERGENCE}, - {"Load state", HK_LOAD_STATE_SLOT_1, HK_LOAD_STATE_SLOT_SELECTED}, - {"Save state", HK_SAVE_STATE_SLOT_1, HK_SAVE_STATE_SLOT_SELECTED}, - {"Select state", HK_SELECT_STATE_SLOT_1, HK_SELECT_STATE_SLOT_10}, - {"Load last state", HK_LOAD_LAST_STATE_1, HK_LOAD_LAST_STATE_10}, - {"Other state hotkeys", HK_SAVE_FIRST_STATE, HK_LOAD_STATE_FILE}}}; + {{_trans("General"), HK_OPEN, HK_EXIT}, + {_trans("Volume"), HK_VOLUME_DOWN, HK_VOLUME_TOGGLE_MUTE}, + {_trans("Emulation speed"), HK_DECREASE_EMULATION_SPEED, HK_TOGGLE_THROTTLE}, + {_trans("Frame advance"), HK_FRAME_ADVANCE, HK_FRAME_ADVANCE_RESET_SPEED}, + {_trans("Movie"), HK_START_RECORDING, HK_READ_ONLY_MODE}, + {_trans("Wii"), HK_TRIGGER_SYNC_BUTTON, HK_BALANCEBOARD_CONNECT}, + {_trans("Graphics toggles"), HK_TOGGLE_CROP, HK_TOGGLE_TEXTURES}, + {_trans("Internal Resolution"), HK_INCREASE_IR, HK_DECREASE_IR}, + {_trans("Freelook"), HK_FREELOOK_DECREASE_SPEED, HK_FREELOOK_RESET}, + {_trans("3D"), HK_TOGGLE_STEREO_SBS, HK_TOGGLE_STEREO_3DVISION}, + {_trans("3D depth"), HK_DECREASE_DEPTH, HK_INCREASE_CONVERGENCE}, + {_trans("Load state"), HK_LOAD_STATE_SLOT_1, HK_LOAD_STATE_SLOT_SELECTED}, + {_trans("Save state"), HK_SAVE_STATE_SLOT_1, HK_SAVE_STATE_SLOT_SELECTED}, + {_trans("Select state"), HK_SELECT_STATE_SLOT_1, HK_SELECT_STATE_SLOT_10}, + {_trans("Load last state"), HK_LOAD_LAST_STATE_1, HK_LOAD_LAST_STATE_10}, + {_trans("Other state hotkeys"), HK_SAVE_FIRST_STATE, HK_LOAD_STATE_FILE}}}; HotkeyManager::HotkeyManager() { for (int group = 0; group < NUM_HOTKEY_GROUPS; group++) { - m_hotkey_groups[group] = (m_keys[group] = new Buttons("Keys", _trans(groups_info[group].name))); + m_hotkey_groups[group] = (m_keys[group] = new Buttons("Keys", groups_info[group].name)); groups.emplace_back(m_hotkey_groups[group]); for (int key = groups_info[group].first; key <= groups_info[group].last; key++) { diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h index d538c902eb..bd89cf44a8 100644 --- a/Source/Core/Core/HotkeyManager.h +++ b/Source/Core/Core/HotkeyManager.h @@ -137,7 +137,7 @@ enum HotkeyGroup : int HKGP_GENERAL, HKGP_VOLUME, HKGP_SPEED, - HKGP_FRANE_ADVANCE, + HKGP_FRAME_ADVANCE, HKGP_MOVIE, HKGP_WII, HKGP_GRAPHICS_TOGGLES, diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index 427e078449..30c6be8f77 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -452,14 +452,14 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event) { GCKeyboardInputConfigDialog config_diag( this, *key_plugin, - wxString::Format("GameCube Keyboard Configuration Port %i", port_num + 1), port_num); + wxString::Format(_("GameCube Keyboard Configuration Port %i"), port_num + 1), port_num); config_diag.ShowModal(); } else if (SConfig::GetInstance().m_SIDevice[port_num] == SIDEVICE_WIIU_ADAPTER) { GCAdapterConfigDiag config_diag( - this, - wxString::Format("Wii U GameCube Controller Adapter Configuration Port %i", port_num + 1), + this, wxString::Format(_("Wii U GameCube Controller Adapter Configuration Port %i"), + port_num + 1), port_num); config_diag.ShowModal(); } @@ -467,7 +467,7 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event) { GCPadInputConfigDialog config_diag( this, *pad_plugin, - wxString::Format("GameCube Controller Configuration Port %i", port_num + 1), port_num); + wxString::Format(_("GameCube Controller Configuration Port %i"), port_num + 1), port_num); config_diag.ShowModal(); } @@ -505,7 +505,7 @@ void ControllerConfigDiag::OnWiimoteConfigButton(wxCommandEvent& ev) WiimoteInputConfigDialog m_ConfigFrame( this, *wiimote_plugin, - wxString::Format("Dolphin Emulated Wii Remote Configuration Port %i", port_num + 1), + wxString::Format(_("Dolphin Emulated Wii Remote Configuration Port %i"), port_num + 1), port_num); m_ConfigFrame.ShowModal(); diff --git a/Source/Core/DolphinWX/Input/HotkeyInputConfigDiag.cpp b/Source/Core/DolphinWX/Input/HotkeyInputConfigDiag.cpp index 9a8b036904..419c1e28f0 100644 --- a/Source/Core/DolphinWX/Input/HotkeyInputConfigDiag.cpp +++ b/Source/Core/DolphinWX/Input/HotkeyInputConfigDiag.cpp @@ -46,13 +46,13 @@ HotkeyInputConfigDialog::HotkeyInputConfigDialog(wxWindow* const parent, InputCo tab_general->SetSizerAndFit(szr_general); - notebook->AddPage(tab_general, "General"); + notebook->AddPage(tab_general, _("General")); // TAS Tools auto* const tab_tas = new wxPanel(notebook); auto* const group_box_frame_advance = - new ControlGroupBox(HotkeyManagerEmu::GetHotkeyGroup(HKGP_FRANE_ADVANCE), tab_tas, this); + new ControlGroupBox(HotkeyManagerEmu::GetHotkeyGroup(HKGP_FRAME_ADVANCE), tab_tas, this); auto* const group_box_movie = new ControlGroupBox(HotkeyManagerEmu::GetHotkeyGroup(HKGP_MOVIE), tab_tas, this); @@ -64,7 +64,9 @@ HotkeyInputConfigDialog::HotkeyInputConfigDialog(wxWindow* const parent, InputCo tab_tas->SetSizerAndFit(szr_tas); - notebook->AddPage(tab_tas, "TAS Tools"); + // i18n: TAS is short for tool-assisted speedrun. Read http://tasvideos.org/ for details. + // Frame advance is an example of a typical TAS tool. + notebook->AddPage(tab_tas, _("TAS Tools")); // WII and Wii Remote auto* const tab_wii = new wxPanel(notebook); @@ -79,7 +81,7 @@ HotkeyInputConfigDialog::HotkeyInputConfigDialog(wxWindow* const parent, InputCo tab_wii->SetSizerAndFit(szr_wii); - notebook->AddPage(tab_wii, "Wii and Wii Remote"); + notebook->AddPage(tab_wii, _("Wii and Wii Remote")); // Graphics auto* const tab_graphics = new wxPanel(notebook); @@ -106,7 +108,7 @@ HotkeyInputConfigDialog::HotkeyInputConfigDialog(wxWindow* const parent, InputCo tab_graphics->SetSizerAndFit(szr_graphics_toggles); - notebook->AddPage(tab_graphics, "Graphics"); + notebook->AddPage(tab_graphics, _("Graphics")); // 3D auto* const tab_3D = new wxPanel(notebook); @@ -125,7 +127,8 @@ HotkeyInputConfigDialog::HotkeyInputConfigDialog(wxWindow* const parent, InputCo tab_3D->SetSizerAndFit(szr_3D); - notebook->AddPage(tab_3D, "3D"); + // i18n: Stereoscopic 3D + notebook->AddPage(tab_3D, _("3D")); // Save and Load State auto* const tab_save_load_state = new wxPanel(notebook); @@ -144,7 +147,7 @@ HotkeyInputConfigDialog::HotkeyInputConfigDialog(wxWindow* const parent, InputCo tab_save_load_state->SetSizerAndFit(szr_save_load_state); - notebook->AddPage(tab_save_load_state, "Save and Load State"); + notebook->AddPage(tab_save_load_state, _("Save and Load State")); // Other State Managament auto* const tab_other_state = new wxPanel(notebook); @@ -167,7 +170,7 @@ HotkeyInputConfigDialog::HotkeyInputConfigDialog(wxWindow* const parent, InputCo tab_other_state->SetSizerAndFit(szr_other_state); - notebook->AddPage(tab_other_state, "Other State Management"); + notebook->AddPage(tab_other_state, _("Other State Management")); notebook->SetSelection(0); diff --git a/Source/Core/DolphinWX/Input/WiimoteInputConfigDiag.cpp b/Source/Core/DolphinWX/Input/WiimoteInputConfigDiag.cpp index 32efa14451..86f5ecc72a 100644 --- a/Source/Core/DolphinWX/Input/WiimoteInputConfigDiag.cpp +++ b/Source/Core/DolphinWX/Input/WiimoteInputConfigDiag.cpp @@ -61,7 +61,7 @@ WiimoteInputConfigDialog::WiimoteInputConfigDialog(wxWindow* const parent, Input tab_general->SetSizerAndFit(general_options_sizer); - notebook->AddPage(tab_general, "General and Options"); + notebook->AddPage(tab_general, _("General and Options")); // Motion Controls and IR auto* const tab_motion_controls_ir = new wxPanel(notebook); @@ -95,7 +95,7 @@ WiimoteInputConfigDialog::WiimoteInputConfigDialog(wxWindow* const parent, Input tab_motion_controls_ir->SetSizerAndFit(motion_controls_ir_sizer); - notebook->AddPage(tab_motion_controls_ir, "Motion Controls and IR"); + notebook->AddPage(tab_motion_controls_ir, _("Motion Controls and IR")); notebook->SetSelection(0);