summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2016-01-07 00:30:41 +0100
committerPierre Bourdon <delroth@gmail.com>2016-01-07 00:30:41 +0100
commitccd646dad0a2f3c1b3adcd28176164966622eb5b (patch)
tree90e033e9b5d79fc7778c724e6c7e45b2a316db4c
parent3c65a7dd7f665eaea093806cfc280e3692b70aec (diff)
parent85ab84935afd384d75d1ba045f4a915dc1b622c5 (diff)
Merge pull request #3468 from JosJuice/dk-bongos
Use the English name for DK Bongos in the English version of Dolphin
-rw-r--r--Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp2
-rw-r--r--Source/Core/DolphinWX/ControllerConfigDiag.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
index 06ef12dd80..c1090cae70 100644
--- a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
@@ -24,7 +24,7 @@ GCAdapterConfigDiag::GCAdapterConfigDiag(wxWindow* const parent, const wxString&
gamecube_rumble->SetValue(SConfig::GetInstance().m_AdapterRumble[m_pad_id]);
gamecube_rumble->Bind(wxEVT_CHECKBOX, &GCAdapterConfigDiag::OnAdapterRumble, this);
- wxCheckBox* const gamecube_konga = new wxCheckBox(this, wxID_ANY, _("Simulate DK TaruKonga"));
+ wxCheckBox* const gamecube_konga = new wxCheckBox(this, wxID_ANY, _("Simulate DK Bongos"));
gamecube_konga->SetValue(SConfig::GetInstance().m_AdapterKonga[m_pad_id]);
gamecube_konga->Bind(wxEVT_CHECKBOX, &GCAdapterConfigDiag::OnAdapterKonga, this);
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
index 8bc510f7a5..c8e80510d8 100644
--- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp
+++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp
@@ -46,7 +46,7 @@ ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
_("GameCube Adapter for Wii U"),
_("Steering Wheel"),
_("Dance Mat"),
- _("TaruKonga (Bongos)"),
+ _("DK Bongos"),
_("GBA"),
_("Keyboard"),
_("AM Baseboard")