From 3c6742f66f4a165edc0e6e03e132aed4cce29cec Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 31 Oct 2016 15:06:27 +0100 Subject: [PATCH] More debug text fixes Also a few small non-debug text changes. --- .../Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp | 2 +- Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp | 2 ++ Source/Core/DolphinWX/Debugger/CodeView.cpp | 2 +- Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp | 3 +++ Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp | 10 ++++++---- Source/Core/DolphinWX/Debugger/JitWindow.cpp | 5 +++++ Source/Core/DolphinWX/Debugger/MemoryView.cpp | 2 ++ Source/Core/DolphinWX/Debugger/RegisterView.cpp | 4 ++++ Source/Core/DolphinWX/Debugger/WatchView.cpp | 5 +++++ Source/Core/DolphinWX/Debugger/WatchWindow.h | 2 ++ Source/Core/DolphinWX/MainMenuBar.cpp | 2 ++ Source/Core/DolphinWX/MainToolBar.cpp | 6 ++++++ Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp | 2 +- Source/Core/DolphinWX/WXInputBase.cpp | 3 +++ 14 files changed, 43 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp index 4ac2e6ab23..053fc4c474 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp @@ -52,7 +52,7 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::CWII_IPC_HLE_Device_usb_oh1_57e_305_emu SetUsbPointer(this); if (!sysconf.GetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads))) { - PanicAlertT("Trying to read from invalid SYSCONF\nWii Remote bt ids are not available"); + PanicAlertT("Trying to read from invalid SYSCONF\nWii Remote Bluetooth IDs are not available"); } else { diff --git a/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp b/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp index 494f818c3f..72125f0817 100644 --- a/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp +++ b/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp @@ -65,7 +65,9 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) : wxPanel(parent) wxLC_REPORT | wxLC_SINGLE_SEL); m_lview_search_results->AppendColumn(_("Address")); m_lview_search_results->AppendColumn(_("Value")); + // i18n: Float means floating point number m_lview_search_results->AppendColumn(_("Value (float)")); + // i18n: Double means double-precision floating point number m_lview_search_results->AppendColumn(_("Value (double)")); m_lview_search_results->Bind(wxEVT_LIST_ITEM_ACTIVATED, &CheatSearchTab::OnListViewItemActivated, this); diff --git a/Source/Core/DolphinWX/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Debugger/CodeView.cpp index 6d605b48a4..fe3c583403 100644 --- a/Source/Core/DolphinWX/Debugger/CodeView.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeView.cpp @@ -369,7 +369,7 @@ void CCodeView::OnMouseUpR(wxMouseEvent& event) menu.AppendSeparator(); menu.Append(IDM_RUNTOHERE, _("&Run To Here"))->Enable(Core::IsRunning()); menu.Append(IDM_ADDFUNCTION, _("&Add function"))->Enable(Core::IsRunning()); - menu.Append(IDM_JITRESULTS, _("PPC vs X86"))->Enable(Core::IsRunning()); + menu.Append(IDM_JITRESULTS, _("PPC vs x86"))->Enable(Core::IsRunning()); menu.Append(IDM_INSERTBLR, _("Insert &blr"))->Enable(Core::IsRunning()); menu.Append(IDM_INSERTNOP, _("Insert &nop"))->Enable(Core::IsRunning()); // menu.Append(IDM_PATCHALERT, _("Patch alert"))->Enable(Core::IsRunning()); diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp index 69301fc233..94ba8bbd39 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp @@ -46,9 +46,12 @@ DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id) new DolphinAuiToolBar(this, ID_TOOLBAR, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_TEXT); m_Toolbar->AddTool(ID_RUNTOOL, _("Pause"), wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, m_toolbar_item_size)); + // i18n: Here, "Step" is a verb. This function is used for + // going through code step by step. m_Toolbar->AddTool(ID_STEPTOOL, _("Step"), wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, m_toolbar_item_size)); m_Toolbar->AddTool( + // i18n: Here, PC is an acronym for program counter, not personal computer. ID_SHOWPCTOOL, _("Show PC"), wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_OTHER, m_toolbar_item_size)); m_Toolbar->AddSeparator(); diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp index 0503d778a9..5326212275 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp @@ -116,15 +116,17 @@ void GFXDebuggerPanel::CreateGUIControls() m_pButtonClearTextureCache->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnClearTextureCacheButton, this); + const wxString clear_vertex_shaders = _("Clear Vertex Shaders"); m_pButtonClearVertexShaderCache = - new wxButton(this, wxID_ANY, _("Clear V Shaders"), wxDefaultPosition, wxDefaultSize, 0, - wxDefaultValidator, _("Clear V Shaders")); + new wxButton(this, wxID_ANY, clear_vertex_shaders, wxDefaultPosition, wxDefaultSize, 0, + wxDefaultValidator, clear_vertex_shaders); m_pButtonClearVertexShaderCache->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnClearVertexShaderCacheButton, this); + const wxString clear_pixel_shaders = _("Clear Pixel Shaders"); m_pButtonClearPixelShaderCache = - new wxButton(this, wxID_ANY, _("Clear P Shaders"), wxDefaultPosition, wxDefaultSize, 0, - wxDefaultValidator, _("Clear P Shaders")); + new wxButton(this, wxID_ANY, clear_pixel_shaders, wxDefaultPosition, wxDefaultSize, 0, + wxDefaultValidator, clear_pixel_shaders); m_pButtonClearPixelShaderCache->Bind(wxEVT_BUTTON, &GFXDebuggerPanel::OnClearPixelShaderCacheButton, this); diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp index 79f1daffe4..1ca19b2195 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -173,9 +173,14 @@ void JitBlockList::Init() InsertColumn(COLUMN_ADDRESS, _("Address")); InsertColumn(COLUMN_PPCSIZE, _("PPC Size")); InsertColumn(COLUMN_X86SIZE, _("x86 Size")); + // i18n: The symbolic name of a code block InsertColumn(COLUMN_NAME, _("Symbol")); + // i18n: These are the kinds of flags that a CPU uses (e.g. carry), + // not the kinds of flags that represent e.g. countries InsertColumn(COLUMN_FLAGS, _("Flags")); + // i18n: The number of times a code block has been executed InsertColumn(COLUMN_NUMEXEC, _("NumExec")); + // i18n: Performance cost, not monetary cost InsertColumn(COLUMN_COST, _("Cost")); } diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index e847e0e855..2dc7d6243f 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -250,6 +250,8 @@ void CMemoryView::OnMouseDownR(wxMouseEvent& event) menu.Append(IDM_COPYADDRESS, _("Copy &address")); menu.Append(IDM_COPYHEX, _("Copy &hex")); #endif + // i18n: This kind of "watch" is used for watching emulated memory. + // It's not related to timekeeping devices. menu.Append(IDM_WATCHADDRESS, _("Add to &watch")); menu.AppendCheckItem(IDM_TOGGLEMEMORY, _("Toggle &memory"))->Check(memory != 0); diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp index 002e29e9e1..1451ecb184 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp @@ -483,6 +483,8 @@ void CRegisterView::OnMouseDownR(wxGridEvent& event) TryParse("0x" + WxStrToStr(strNewVal), &m_selectedAddress); wxMenu menu; + // i18n: This kind of "watch" is used for watching emulated memory. + // It's not related to timekeeping devices. menu.Append(IDM_WATCHADDRESS, _("Add to &watch")); menu.Append(IDM_VIEWMEMORY, _("View &memory")); menu.Append(IDM_VIEWCODE, _("View &code")); @@ -495,11 +497,13 @@ void CRegisterView::OnMouseDownR(wxGridEvent& event) menu.Append(IDM_VIEW_HEX8, _("View as hexadecimal")); menu.Append(IDM_VIEW_INT, _("View as signed integer")); menu.Append(IDM_VIEW_UINT, _("View as unsigned integer")); + // i18n: Float means floating point number menu.Append(IDM_VIEW_FLOAT, _("View as float")); } else { menu.Append(IDM_VIEW_HEX16, _("View as hexadecimal")); + // i18n: Double means double-precision floating point number menu.Append(IDM_VIEW_DOUBLE, _("View as double")); } } diff --git a/Source/Core/DolphinWX/Debugger/WatchView.cpp b/Source/Core/DolphinWX/Debugger/WatchView.cpp index 1eab82db35..ec280a4479 100644 --- a/Source/Core/DolphinWX/Debugger/WatchView.cpp +++ b/Source/Core/DolphinWX/Debugger/WatchView.cpp @@ -87,6 +87,7 @@ static wxString GetValueByRowCol(int row, int col) case 3: return _("Decimal"); case 4: + // i18n: Data type used in computing return _("String"); default: return wxEmptyString; @@ -258,7 +259,11 @@ void CWatchView::OnMouseDownR(wxGridEvent& event) wxMenu menu; if (row != 0 && row != (int)(PowerPC::watches.GetWatches().size() + 1)) + { + // i18n: This kind of "watch" is used for watching emulated memory. + // It's not related to timekeeping devices. menu.Append(IDM_DELETEWATCH, _("&Delete watch")); + } if (row != 0 && row != (int)(PowerPC::watches.GetWatches().size() + 1) && (col == 1 || col == 2)) { diff --git a/Source/Core/DolphinWX/Debugger/WatchWindow.h b/Source/Core/DolphinWX/Debugger/WatchWindow.h index 927f605c80..36cc6ae597 100644 --- a/Source/Core/DolphinWX/Debugger/WatchWindow.h +++ b/Source/Core/DolphinWX/Debugger/WatchWindow.h @@ -14,6 +14,8 @@ class CWatchWindow : public wxPanel public: CWatchWindow(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER, + // i18n: This kind of "watch" is used for watching emulated memory. + // It's not related to timekeeping devices. const wxString& name = _("Watch")); ~CWatchWindow(); diff --git a/Source/Core/DolphinWX/MainMenuBar.cpp b/Source/Core/DolphinWX/MainMenuBar.cpp index af64e2db36..679c6821b6 100644 --- a/Source/Core/DolphinWX/MainMenuBar.cpp +++ b/Source/Core/DolphinWX/MainMenuBar.cpp @@ -302,6 +302,8 @@ wxMenu* MainMenuBar::CreateViewMenu() const if (m_type == MenuType::Debug) { view_menu->AppendCheckItem(IDM_REGISTER_WINDOW, _("&Registers")); + // i18n: This kind of "watch" is used for watching emulated memory. + // It's not related to timekeeping devices. view_menu->AppendCheckItem(IDM_WATCH_WINDOW, _("&Watch")); view_menu->AppendCheckItem(IDM_BREAKPOINT_WINDOW, _("&Breakpoints")); view_menu->AppendCheckItem(IDM_MEMORY_WINDOW, _("&Memory")); diff --git a/Source/Core/DolphinWX/MainToolBar.cpp b/Source/Core/DolphinWX/MainToolBar.cpp index a849c6e460..8c0de6e848 100644 --- a/Source/Core/DolphinWX/MainToolBar.cpp +++ b/Source/Core/DolphinWX/MainToolBar.cpp @@ -214,9 +214,15 @@ void MainToolBar::AddMainToolBarButtons() void MainToolBar::AddDebuggerToolBarButtons() { + // i18n: Here, "Step" is a verb. This function is used for + // going through code step by step. AddToolBarButton(IDM_STEP, TOOLBAR_DEBUG_STEP, _("Step"), _("Step into the next instruction")); + // i18n: Here, "Step" is a verb. This function is used for + // going through code step by step. AddToolBarButton(IDM_STEPOVER, TOOLBAR_DEBUG_STEPOVER, _("Step Over"), _("Step over the next instruction")); + // i18n: Here, "Step" is a verb. This function is used for + // going through code step by step. AddToolBarButton(IDM_STEPOUT, TOOLBAR_DEBUG_STEPOUT, _("Step Out"), _("Step out of the current function")); AddToolBarButton(IDM_SKIP, TOOLBAR_DEBUG_SKIP, _("Skip"), diff --git a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp index d2bef9a687..dc0eec924f 100644 --- a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp +++ b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp @@ -59,7 +59,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClien // This looks a little weird but it's fine because we're using a grid bag sizer; // we can add columns in any order. build_choice(0, i, m_pad_mapping, _("GC Port")); - build_choice(4, i, m_wii_mapping, _("Wiimote")); + build_choice(4, i, m_wii_mapping, _("Wii Remote")); } wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL); diff --git a/Source/Core/DolphinWX/WXInputBase.cpp b/Source/Core/DolphinWX/WXInputBase.cpp index 20a7549377..f510ef6f0f 100644 --- a/Source/Core/DolphinWX/WXInputBase.cpp +++ b/Source/Core/DolphinWX/WXInputBase.cpp @@ -225,10 +225,13 @@ const wxString WXKeyToString(int keycode) case WXK_NUMPAD_DIVIDE: return _("NP Divide"); case WXK_WINDOWS_LEFT: + // i18n: The left Windows key on PC keyboards return _("Windows Left"); case WXK_WINDOWS_RIGHT: + // i18n: The right Windows key on PC keyboards return _("Windows Right"); case WXK_WINDOWS_MENU: + // i18n: The context menu key on the right of PC keyboards return _("Windows Menu"); }