From 960525859bf226445c75b96541e495c14b5e46ba Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 23 Jul 2017 13:11:06 +0200 Subject: [PATCH] Make DolphinWX strings more like DolphinQt2 strings Same as the previous commit, except I'm copying strings in the other direction because the DolphinWX variants of these strings could use some improvement. --- Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp | 7 +++++-- Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp | 6 +++--- Source/Core/DolphinWX/Config/GeneralConfigPane.cpp | 4 ++-- Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp | 4 ++-- Source/Core/DolphinWX/VideoConfigDiag.cpp | 2 +- .../Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp | 7 ++++++- .../Core/InputCommon/ControllerEmu/ControlGroup/Slider.h | 1 + 7 files changed, 20 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp index 48dea99ecd..a7295ebcdf 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp @@ -43,8 +43,11 @@ Turntable::Turntable(ExtensionReg& reg) : Attachment(_trans("Turntable"), reg) m_buttons->controls.emplace_back(new ControllerEmu::Input(turntable_button_name)); // turntables - groups.emplace_back(m_left_table = new ControllerEmu::Slider(_trans("Table Left"))); - groups.emplace_back(m_right_table = new ControllerEmu::Slider(_trans("Table Right"))); + // i18n: "Table" refers to a turntable + groups.emplace_back(m_left_table = new ControllerEmu::Slider("Table Left", _trans("Left Table"))); + groups.emplace_back(m_right_table = + // i18n: "Table" refers to a turntable + new ControllerEmu::Slider("Table Right", _trans("Right Table"))); // stick groups.emplace_back( diff --git a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp index b5a862461d..0e09b16455 100644 --- a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp +++ b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp @@ -19,7 +19,7 @@ GCAdapterConfigDiag::GCAdapterConfigDiag(wxWindow* const parent, const wxString& const int tab_num) : wxDialog(parent, wxID_ANY, name), m_pad_id(tab_num) { - wxCheckBox* const gamecube_rumble = new wxCheckBox(this, wxID_ANY, _("Rumble")); + wxCheckBox* const gamecube_rumble = new wxCheckBox(this, wxID_ANY, _("Enable Rumble")); gamecube_rumble->SetValue(SConfig::GetInstance().m_AdapterRumble[m_pad_id]); gamecube_rumble->Bind(wxEVT_CHECKBOX, &GCAdapterConfigDiag::OnAdapterRumble, this); @@ -27,7 +27,7 @@ GCAdapterConfigDiag::GCAdapterConfigDiag(wxWindow* const parent, const wxString& gamecube_konga->SetValue(SConfig::GetInstance().m_AdapterKonga[m_pad_id]); gamecube_konga->Bind(wxEVT_CHECKBOX, &GCAdapterConfigDiag::OnAdapterKonga, this); - m_adapter_status = new wxStaticText(this, wxID_ANY, _("Adapter Not Detected")); + m_adapter_status = new wxStaticText(this, wxID_ANY, _("No Adapter Detected")); if (!GCAdapter::IsDetected()) { @@ -75,7 +75,7 @@ void GCAdapterConfigDiag::OnUpdateAdapter(wxCommandEvent& WXUNUSED(event)) if (GCAdapter::IsDetected()) m_adapter_status->SetLabelText(_("Adapter Detected")); else - m_adapter_status->SetLabelText(_("Adapter Not Detected")); + m_adapter_status->SetLabelText(_("No Adapter Detected")); }); } diff --git a/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp b/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp index 5671fcc24c..77bfac0d90 100644 --- a/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp @@ -68,7 +68,7 @@ void GeneralConfigPane::InitializeGUI() m_throttler_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_throttler_array_string); m_cpu_engine_radiobox = - new wxRadioBox(this, wxID_ANY, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, + new wxRadioBox(this, wxID_ANY, _("CPU Emulation Engine"), wxDefaultPosition, wxDefaultSize, m_cpu_engine_array_string, 0, wxRA_SPECIFY_ROWS); m_dual_core_checkbox->SetToolTip( @@ -230,5 +230,5 @@ void GeneralConfigPane::OnAnalyticsCheckBoxChanged(wxCommandEvent& event) void GeneralConfigPane::OnAnalyticsNewIdButtonClick(wxCommandEvent& event) { DolphinAnalytics::Instance()->GenerateNewIdentity(); - wxMessageBox(_("New identity generated."), _("Identity generation"), wxICON_INFORMATION); + wxMessageBox(_("New identity generated."), _("Identity Generation"), wxICON_INFORMATION); } diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp index b1afc17c03..cef2b2a995 100644 --- a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp @@ -87,12 +87,12 @@ void InterfaceConfigPane::InitializeGUI() m_confirm_stop_checkbox = new wxCheckBox(this, wxID_ANY, _("Confirm on Stop")); m_panic_handlers_checkbox = new wxCheckBox(this, wxID_ANY, _("Use Panic Handlers")); - m_osd_messages_checkbox = new wxCheckBox(this, wxID_ANY, _("On-Screen Display Messages")); + m_osd_messages_checkbox = new wxCheckBox(this, wxID_ANY, _("Show On-Screen Messages")); m_show_active_title_checkbox = new wxCheckBox(this, wxID_ANY, _("Show Active Title in Window Title")); m_use_builtin_title_database_checkbox = new wxCheckBox(this, wxID_ANY, _("Use Built-In Database of Game Names")); - m_pause_focus_lost_checkbox = new wxCheckBox(this, wxID_ANY, _("Pause on Focus Lost")); + m_pause_focus_lost_checkbox = new wxCheckBox(this, wxID_ANY, _("Pause on Focus Loss")); m_interface_lang_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_interface_lang_strings); m_theme_choice = new wxChoice(this, wxID_ANY); diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index bcd12de28d..19af19461e 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -442,7 +442,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title) szr_other->Add(CreateCheckBox(page_general, _("Log Render Time to File"), wxGetTranslation(log_render_time_to_file_desc), Config::GFX_LOG_RENDER_TIME_TO_FILE)); - szr_other->Add(CreateCheckBoxRefBool(page_general, _("Auto Adjust Window Size"), + szr_other->Add(CreateCheckBoxRefBool(page_general, _("Auto-Adjust Window Size"), wxGetTranslation(auto_window_size_desc), SConfig::GetInstance().bRenderWindowAutoSize)); szr_other->Add(CreateCheckBox(page_general, _("Show NetPlay Messages"), diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp index 583038e142..024161d4e8 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp @@ -17,7 +17,8 @@ namespace ControllerEmu { -Slider::Slider(const std::string& name_) : ControlGroup(name_, GroupType::Slider) +Slider::Slider(const std::string& name, const std::string& ui_name) + : ControlGroup(name, ui_name, GroupType::Slider) { controls.emplace_back(std::make_unique("Left")); controls.emplace_back(std::make_unique("Right")); @@ -25,6 +26,10 @@ Slider::Slider(const std::string& name_) : ControlGroup(name_, GroupType::Slider numeric_settings.emplace_back(std::make_unique(_trans("Dead Zone"), 0, 0, 50)); } +Slider::Slider(const std::string& name) : Slider(name, name) +{ +} + void Slider::GetState(ControlState* const slider) { const ControlState deadzone = numeric_settings[0]->GetValue(); diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h index ea2cabc988..0d77b1662a 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h @@ -13,6 +13,7 @@ namespace ControllerEmu class Slider : public ControlGroup { public: + Slider(const std::string& name, const std::string& ui_name); explicit Slider(const std::string& name); void GetState(ControlState* slider);