mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-30 17:49:48 -06:00
Change "Wiimote" to "Wii Remote" in Interface
The usage of "Wii Remote" and "Wiimote" in the interface is inconsistent. "Wiimote" is also not a real word nor is it an official product name. Therefore I have changed instances of "Wiimote" in the UI to instead say "Wii Remote". I also made a couple of minor grammatical changes as well. This is mostly a resubmission of #4338 but there are some minor other changes as well.
This commit is contained in:
Pringo
@ -54,7 +54,7 @@ void WiiConfigPane::InitializeGUI()
|
||||
new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_bt_sensor_bar_pos_strings);
|
||||
m_bt_sensor_bar_sens = new DolphinSlider(this, wxID_ANY, 0, 0, 4);
|
||||
m_bt_speaker_volume = new DolphinSlider(this, wxID_ANY, 0, 0, 127);
|
||||
m_bt_wiimote_motor = new wxCheckBox(this, wxID_ANY, _("Wiimote Motor"));
|
||||
m_bt_wiimote_motor = new wxCheckBox(this, wxID_ANY, _("Wii Remote Motor"));
|
||||
|
||||
m_screensaver_checkbox->Bind(wxEVT_CHECKBOX, &WiiConfigPane::OnScreenSaverCheckBoxChanged, this);
|
||||
m_pal60_mode_checkbox->Bind(wxEVT_CHECKBOX, &WiiConfigPane::OnPAL60CheckBoxChanged, this);
|
||||
|
||||
@ -222,7 +222,7 @@ wxSizer* ControllerConfigDiag::CreateWiimoteConfigSizer()
|
||||
const int space5 = FromDIP(5);
|
||||
const int space20 = FromDIP(20);
|
||||
|
||||
auto* const box = new wxStaticBoxSizer(wxVERTICAL, this, _("Wiimotes"));
|
||||
auto* const box = new wxStaticBoxSizer(wxVERTICAL, this, _("Wii Remotes"));
|
||||
|
||||
m_passthrough_bt_radio = new wxRadioButton(this, wxID_ANY, _("Passthrough a Bluetooth adapter"),
|
||||
wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
|
||||
@ -253,13 +253,14 @@ wxSizer* ControllerConfigDiag::CreateWiimoteConfigSizer()
|
||||
|
||||
wxSizer* ControllerConfigDiag::CreatePassthroughBTConfigSizer()
|
||||
{
|
||||
m_passthrough_sync_text = new wxStaticText(this, wxID_ANY, _("Sync real Wiimotes and pair them"));
|
||||
m_passthrough_sync_text =
|
||||
new wxStaticText(this, wxID_ANY, _("Sync real Wii Remotes and pair them"));
|
||||
m_passthrough_sync_btn =
|
||||
new wxButton(this, wxID_ANY, _("Sync"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(60, -1)));
|
||||
m_passthrough_sync_btn->Bind(wxEVT_BUTTON, &ControllerConfigDiag::OnPassthroughScanButton, this);
|
||||
|
||||
m_passthrough_reset_text =
|
||||
new wxStaticText(this, wxID_ANY, _("Reset all saved Wiimote pairings"));
|
||||
new wxStaticText(this, wxID_ANY, _("Reset all saved Wii Remote pairings"));
|
||||
m_passthrough_reset_btn =
|
||||
new wxButton(this, wxID_ANY, _("Reset"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(60, -1)));
|
||||
m_passthrough_reset_btn->Bind(wxEVT_BUTTON, &ControllerConfigDiag::OnPassthroughResetButton,
|
||||
@ -284,7 +285,7 @@ wxSizer* ControllerConfigDiag::CreatePassthroughBTConfigSizer()
|
||||
wxSizer* ControllerConfigDiag::CreateEmulatedBTConfigSizer()
|
||||
{
|
||||
const std::array<wxString, 4> src_choices{
|
||||
{_("None"), _("Emulated Wiimote"), _("Real Wiimote"), _("Hybrid Wiimote")}};
|
||||
{_("None"), _("Emulated Wii Remote"), _("Real Wii Remote"), _("Hybrid Wii Remote")}};
|
||||
|
||||
const int space5 = FromDIP(5);
|
||||
|
||||
@ -304,7 +305,7 @@ wxSizer* ControllerConfigDiag::CreateEmulatedBTConfigSizer()
|
||||
m_wiimote_index_from_config_id.emplace(config_bt_id, i);
|
||||
|
||||
m_wiimote_labels[i] =
|
||||
new wxStaticText(this, wxID_ANY, wxString::Format(_("Wiimote %i"), i + 1));
|
||||
new wxStaticText(this, wxID_ANY, wxString::Format(_("Wii Remote %i"), i + 1));
|
||||
m_wiimote_sources[i] = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize,
|
||||
src_choices.size(), src_choices.data());
|
||||
m_wiimote_sources[i]->Bind(wxEVT_CHOICE, &ControllerConfigDiag::OnWiimoteSourceChanged, this);
|
||||
@ -330,7 +331,7 @@ wxSizer* ControllerConfigDiag::CreateEmulatedBTConfigSizer()
|
||||
|
||||
m_unsupported_bt_text =
|
||||
new wxStaticText(this, wxID_ANY, _("A supported Bluetooth device could not be found,\n"
|
||||
"so you must connect Wiimotes manually."));
|
||||
"so you must connect Wii Remotes manually."));
|
||||
m_unsupported_bt_text->Show(!WiimoteReal::g_wiimote_scanner.IsReady());
|
||||
|
||||
// Balance Board
|
||||
@ -452,7 +453,7 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event)
|
||||
}
|
||||
else if (SConfig::GetInstance().m_SIDevice[port_num] == SIDEVICE_WIIU_ADAPTER)
|
||||
{
|
||||
GCAdapterConfigDiag config_diag(this, _("Wii U Gamecube Controller Adapter Configuration"),
|
||||
GCAdapterConfigDiag config_diag(this, _("Wii U GameCube Controller Adapter Configuration"),
|
||||
port_num);
|
||||
config_diag.ShowModal();
|
||||
}
|
||||
@ -494,7 +495,7 @@ void ControllerConfigDiag::OnWiimoteConfigButton(wxCommandEvent& ev)
|
||||
HotkeyManagerEmu::Enable(false);
|
||||
|
||||
InputConfigDialog m_ConfigFrame(this, *wiimote_plugin,
|
||||
_("Dolphin Emulated Wiimote Configuration"),
|
||||
_("Dolphin Emulated Wii Remote Configuration"),
|
||||
m_wiimote_index_from_config_id[ev.GetId()]);
|
||||
m_ConfigFrame.ShowModal();
|
||||
|
||||
@ -512,8 +513,8 @@ void ControllerConfigDiag::OnPassthroughScanButton(wxCommandEvent& event)
|
||||
{
|
||||
if (!Core::IsRunning())
|
||||
{
|
||||
wxMessageBox(_("A sync can only be triggered when a Wii game is running."), _("Sync Wiimotes"),
|
||||
wxICON_WARNING);
|
||||
wxMessageBox(_("A sync can only be triggered when a Wii game is running."),
|
||||
_("Sync Wii Remotes"), wxICON_WARNING);
|
||||
return;
|
||||
}
|
||||
auto device = WII_IPC_HLE_Interface::GetDeviceByName("/dev/usb/oh1/57e/305");
|
||||
@ -526,8 +527,8 @@ void ControllerConfigDiag::OnPassthroughResetButton(wxCommandEvent& event)
|
||||
{
|
||||
if (!Core::IsRunning())
|
||||
{
|
||||
wxMessageBox(_("Saved Wiimote pairings can only be reset when a Wii game is running."),
|
||||
_("Reset Wiimote pairings"), wxICON_WARNING);
|
||||
wxMessageBox(_("Saved Wii Remote pairings can only be reset when a Wii game is running."),
|
||||
_("Reset Wii Remote pairings"), wxICON_WARNING);
|
||||
return;
|
||||
}
|
||||
auto device = WII_IPC_HLE_Interface::GetDeviceByName("/dev/usb/oh1/57e/305");
|
||||
|
||||
@ -398,7 +398,7 @@ void CFrame::OnTASInput(wxCommandEvent& event)
|
||||
{
|
||||
g_TASInputDlg[i + 4]->CreateWiiLayout(i);
|
||||
g_TASInputDlg[i + 4]->Show();
|
||||
g_TASInputDlg[i + 4]->SetTitle(wxString::Format(_("TAS Input - Wiimote %d"), i + 1));
|
||||
g_TASInputDlg[i + 4]->SetTitle(wxString::Format(_("TAS Input - Wii Remote %d"), i + 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -930,7 +930,7 @@ void CFrame::OnStopped()
|
||||
// Clean framerate indications from the status bar.
|
||||
GetStatusBar()->SetStatusText(" ", 0);
|
||||
|
||||
// Clear wiimote connection status from the status bar.
|
||||
// Clear Wii Remote connection status from the status bar.
|
||||
GetStatusBar()->SetStatusText(" ", 1);
|
||||
|
||||
// If batch mode was specified on the command-line or we were already closing, exit now.
|
||||
@ -1227,7 +1227,7 @@ void CFrame::ConnectWiimote(int wm_idx, bool connect)
|
||||
{
|
||||
bool was_unpaused = Core::PauseAndLock(true);
|
||||
GetUsbPointer()->AccessWiiMote(wm_idx | 0x100)->Activate(connect);
|
||||
const char* message = connect ? "Wiimote %i connected" : "Wiimote %i disconnected";
|
||||
const char* message = connect ? "Wii Remote %i connected" : "Wii Remote %i disconnected";
|
||||
Core::DisplayMessage(StringFromFormat(message, wm_idx + 1), 3000);
|
||||
Host_UpdateMainFrame();
|
||||
Core::PauseAndLock(false, was_unpaused);
|
||||
|
||||
@ -206,7 +206,7 @@ wxMenu* MainMenuBar::CreateToolsMenu() const
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
wiimote_menu->AppendCheckItem(IDM_CONNECT_WIIMOTE1 + i,
|
||||
wxString::Format(_("Connect Wiimote %i"), i + 1));
|
||||
wxString::Format(_("Connect Wii Remote %i"), i + 1));
|
||||
}
|
||||
wiimote_menu->AppendSeparator();
|
||||
wiimote_menu->AppendCheckItem(IDM_CONNECT_BALANCEBOARD, _("Connect Balance Board"));
|
||||
@ -221,7 +221,7 @@ wxMenu* MainMenuBar::CreateToolsMenu() const
|
||||
tools_menu->Append(IDM_LOAD_WII_MENU, dummy_string);
|
||||
tools_menu->Append(IDM_FIFOPLAYER, _("FIFO Player"));
|
||||
tools_menu->AppendSeparator();
|
||||
tools_menu->AppendSubMenu(wiimote_menu, _("Connect Wiimotes"));
|
||||
tools_menu->AppendSubMenu(wiimote_menu, _("Connect Wii Remotes"));
|
||||
|
||||
return tools_menu;
|
||||
}
|
||||
|
||||
@ -196,7 +196,7 @@ wxNotebook* NetPlaySetupFrame::CreateNotebookGUI(wxWindow* parent)
|
||||
"If DSP LLE is used, DSP ROMs must be identical between players.\n"
|
||||
"If connecting directly, the host must have the chosen UDP port open/forwarded!\n"
|
||||
"\n"
|
||||
"Wiimote netplay is experimental and should not be expected to work.\n"));
|
||||
"Wii Remote support in netplay is experimental and should not be expected to work.\n"));
|
||||
|
||||
wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL);
|
||||
top_szr->Add(m_ip_lbl, 0, wxALIGN_CENTER_VERTICAL);
|
||||
|
||||
Reference in New Issue
Block a user