From b8721b68391927bab4c7f6dafa619b93012e72cf Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 6 May 2017 15:38:53 +0200 Subject: [PATCH 1/2] Unify memory breakpoint strings The MemoryWindow.cpp strings should be the same as the MemoryCheckDlg.cpp strings so that translators don't have to translate very similar strings twice. Also adding i18n comments. These strings are *very* easy to misinterpret in my opinion. --- Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp | 15 ++++++++++++--- Source/Core/DolphinWX/Debugger/MemoryWindow.cpp | 11 ++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp index 5078d7a2d3..6d6b1450e7 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp @@ -38,9 +38,18 @@ MemoryCheckDlg::MemoryCheckDlg(wxWindow* parent) m_radioAddress = new wxRadioButton(this, wxID_ANY, _("With an address"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); m_radioRange = new wxRadioButton(this, wxID_ANY, _("Within a range")); - m_radioRead = - new wxRadioButton(this, wxID_ANY, _("Read"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - m_radioWrite = new wxRadioButton(this, wxID_ANY, _("Write")); + // i18n: This string is used for a radio button that represents the type of + // memory breakpoint that gets triggered when a read operation occurs. + // The string does not mean "read-only" in the sense that something cannot be written to. + m_radioRead = new wxRadioButton(this, wxID_ANY, _("Read only"), wxDefaultPosition, wxDefaultSize, + wxRB_GROUP); + // i18n: This string is used for a radio button that represents the type of + // memory breakpoint that gets triggered when a write operation occurs. + // The string does not mean "write-only" in the sense that something cannot be read from. + m_radioWrite = new wxRadioButton(this, wxID_ANY, _("Write only")); + // i18n: This string is used for a radio button that represents the type of + // memory breakpoint that gets triggered when a read operation or write operation occurs. + // The string is not a command to read and write something or to allow reading and writing. m_radioReadWrite = new wxRadioButton(this, wxID_ANY, _("Read and write")); m_radioLog = new wxRadioButton(this, wxID_ANY, _("Log"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp index dffb04069b..16b8a2c1e4 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -179,13 +179,22 @@ wxSizer* CMemoryWindow::CreateSearchTypeSizer() wxSizer* CMemoryWindow::CreateMemcheckOptionSizer() { - m_read_write_radio_btn = new wxRadioButton(this, IDM_MEMCHECK_OPTIONS_CHANGE, _("Read and Write"), + // i18n: This string is used for a radio button that represents the type of + // memory breakpoint that gets triggered when a read operation or write operation occurs. + // The string is not a command to read and write something or to allow reading and writing. + m_read_write_radio_btn = new wxRadioButton(this, IDM_MEMCHECK_OPTIONS_CHANGE, _("Read and write"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); m_read_write_radio_btn->Bind(wxEVT_RADIOBUTTON, &CMemoryWindow::OnMemCheckOptionChange, this); + // i18n: This string is used for a radio button that represents the type of + // memory breakpoint that gets triggered when a read operation occurs. + // The string does not mean "read-only" in the sense that something cannot be written to. m_read_radio_btn = new wxRadioButton(this, IDM_MEMCHECK_OPTIONS_CHANGE, _("Read only")); m_read_radio_btn->Bind(wxEVT_RADIOBUTTON, &CMemoryWindow::OnMemCheckOptionChange, this); + // i18n: This string is used for a radio button that represents the type of + // memory breakpoint that gets triggered when a write operation occurs. + // The string does not mean "write-only" in the sense that something cannot be read from. m_write_radio_btn = new wxRadioButton(this, IDM_MEMCHECK_OPTIONS_CHANGE, _("Write only")); m_write_radio_btn->Bind(wxEVT_RADIOBUTTON, &CMemoryWindow::OnMemCheckOptionChange, this); From 994b4040bf97e85cd5bfd9dcd227e73179c518e3 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 6 May 2017 15:40:36 +0200 Subject: [PATCH 2/2] NetPlaySetupFrame: Remove spaces that shouldn't be present --- Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp b/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp index 4a43321268..14967fad76 100644 --- a/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp @@ -223,11 +223,11 @@ wxNotebook* NetPlaySetupFrame::CreateNotebookGUI(wxWindow* parent) // host tab { - m_host_port_lbl = new wxStaticText(host_tab, wxID_ANY, _("Port :")); + m_host_port_lbl = new wxStaticText(host_tab, wxID_ANY, _("Port:")); m_host_port_text = new wxTextCtrl(host_tab, wxID_ANY, std::to_string(NetPlayHostConfig::DEFAULT_LISTEN_PORT)); - m_traversal_listen_port_enabled = new wxCheckBox(host_tab, wxID_ANY, _("Force Listen Port: ")); + m_traversal_listen_port_enabled = new wxCheckBox(host_tab, wxID_ANY, _("Force Listen Port:")); m_traversal_listen_port = new wxSpinCtrl(host_tab, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 65535); m_traversal_listen_port->SetMinSize(WxUtils::GetTextWidgetMinSize(m_traversal_listen_port));