From a4f950ee8689fe3bf8886e48554f6acaa9cc0716 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 8 Sep 2018 15:16:39 +0200 Subject: [PATCH 1/4] Fix a string not getting translated --- Source/Core/InputCommon/InputConfig.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index ac74c0ea7e..dfc677d70a 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -62,10 +62,8 @@ bool InputConfig::LoadConfig(bool isGC) if (profiles.empty()) { - const std::string error = - "No profiles found for game setting '" + profile_setting + "'"; // TODO: PanicAlert shouldn't be used for this. - PanicAlertT("%s", error.c_str()); + PanicAlertT("No profiles found for game setting '%s'", profile_setting.c_str()); continue; } From 5f35edf5059384b3cff5b291d098cab10657c56e Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 8 Sep 2018 15:18:31 +0200 Subject: [PATCH 2/4] Remove unused function and translatable strings --- Source/Core/DolphinQt/Config/ControllersWindow.cpp | 10 ---------- Source/Core/DolphinQt/Config/ControllersWindow.h | 1 - 2 files changed, 11 deletions(-) diff --git a/Source/Core/DolphinQt/Config/ControllersWindow.cpp b/Source/Core/DolphinQt/Config/ControllersWindow.cpp index 981d8bf3b8..b14284f916 100644 --- a/Source/Core/DolphinQt/Config/ControllersWindow.cpp +++ b/Source/Core/DolphinQt/Config/ControllersWindow.cpp @@ -459,16 +459,6 @@ void ControllersWindow::OnWiimoteConfigure() MappingWindow(this, type, static_cast(index)).exec(); } -void ControllersWindow::UnimplementedButton() -{ - QMessageBox error_dialog(this); - - error_dialog.setIcon(QMessageBox::Warning); - error_dialog.setWindowTitle(tr("Unimplemented")); - error_dialog.setText(tr("Not implemented yet.")); - error_dialog.exec(); -} - void ControllersWindow::LoadSettings() { for (size_t i = 0; i < m_wiimote_groups.size(); i++) diff --git a/Source/Core/DolphinQt/Config/ControllersWindow.h b/Source/Core/DolphinQt/Config/ControllersWindow.h index dc8cde7cc6..ae03b79491 100644 --- a/Source/Core/DolphinQt/Config/ControllersWindow.h +++ b/Source/Core/DolphinQt/Config/ControllersWindow.h @@ -32,7 +32,6 @@ private: void OnWiimoteTypeChanged(int state); void OnGCTypeChanged(int state); void SaveSettings(); - void UnimplementedButton(); void OnBluetoothPassthroughSyncPressed(); void OnBluetoothPassthroughResetPressed(); void OnWiimoteRefreshPressed(); From e0cb56edb969238cb451c9a459f1fe16c505a01a Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 8 Sep 2018 15:19:01 +0200 Subject: [PATCH 3/4] Reword some translatable strings We've decided to use the term "Usage Statistics Reporting" instead of "Analytics" in user-facing strings. --- Source/Core/Core/NetPlayClient.cpp | 2 +- Source/Core/DolphinQt/Main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 06f5be0d85..6bce16d36d 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -150,7 +150,7 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay if (address.size() > NETPLAY_CODE_SIZE) { m_dialog->OnConnectionError( - _trans("Host code size is too large.\nPlease recheck that you have the correct code.")); + _trans("The host code is too long.\nPlease recheck that you have the correct code.")); return; } diff --git a/Source/Core/DolphinQt/Main.cpp b/Source/Core/DolphinQt/Main.cpp index 997c17dce8..4c7aa086ff 100644 --- a/Source/Core/DolphinQt/Main.cpp +++ b/Source/Core/DolphinQt/Main.cpp @@ -184,7 +184,7 @@ int main(int argc, char* argv[]) analytics_prompt.setIcon(QMessageBox::Question); analytics_prompt.setStandardButtons(QMessageBox::Yes | QMessageBox::No); - analytics_prompt.setWindowTitle(QObject::tr("Allow analytics")); + analytics_prompt.setWindowTitle(QObject::tr("Allow Usage Statistics Reporting")); analytics_prompt.setText( QObject::tr("Do you authorize Dolphin to report information to Dolphin's developers?")); analytics_prompt.setInformativeText( From fb6b31bba8f0b542e2968ccc5160c913fd40ad7e Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 8 Sep 2018 15:58:15 +0200 Subject: [PATCH 4/4] Re-add i18n comments that were lost in the DolphinWX removal --- Source/Core/Core/HotkeyManager.cpp | 10 ++++++++++ Source/Core/DolphinQt/CheatsManager.cpp | 1 + Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp | 2 ++ Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp | 4 ++++ Source/Core/DolphinQt/Debugger/RegisterWidget.cpp | 2 ++ Source/Core/DolphinQt/Debugger/WatchWidget.cpp | 9 ++++++--- Source/Core/DolphinQt/MenuBar.cpp | 2 ++ .../Settings/USBDeviceAddToWhitelistDialog.cpp | 2 ++ Source/Core/DolphinQt/Settings/WiiPane.cpp | 1 + Source/Core/DolphinQt/ToolBar.cpp | 8 ++++++++ 10 files changed, 38 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index d8d6be0672..96a0d37526 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -50,12 +50,20 @@ constexpr std::array s_hotkey_labels{{ _trans("Export Recording"), _trans("Read-Only Mode"), + // i18n: Here, "Step" is a verb. This feature is used for + // going through code step by step. _trans("Step Into"), + // i18n: Here, "Step" is a verb. This feature is used for + // going through code step by step. _trans("Step Over"), + // i18n: Here, "Step" is a verb. This feature is used for + // going through code step by step. _trans("Step Out"), _trans("Skip"), + // i18n: Here, PC is an acronym for program counter, not personal computer. _trans("Show PC"), + // i18n: Here, PC is an acronym for program counter, not personal computer. _trans("Set PC"), _trans("Toggle Breakpoint"), @@ -277,7 +285,9 @@ constexpr std::array s_groups_info = { {_trans("Graphics Toggles"), HK_TOGGLE_CROP, HK_TOGGLE_TEXTURES}, {_trans("Internal Resolution"), HK_INCREASE_IR, HK_DECREASE_IR}, {_trans("Freelook"), HK_FREELOOK_DECREASE_SPEED, HK_FREELOOK_RESET}, + // i18n: Stereoscopic 3D {_trans("3D"), HK_TOGGLE_STEREO_SBS, HK_TOGGLE_STEREO_3DVISION}, + // i18n: Stereoscopic 3D {_trans("3D Depth"), HK_DECREASE_DEPTH, HK_INCREASE_CONVERGENCE}, {_trans("Load State"), HK_LOAD_STATE_SLOT_1, HK_LOAD_STATE_SLOT_SELECTED}, {_trans("Save State"), HK_SAVE_STATE_SLOT_1, HK_SAVE_STATE_SLOT_SELECTED}, diff --git a/Source/Core/DolphinQt/CheatsManager.cpp b/Source/Core/DolphinQt/CheatsManager.cpp index c782001430..3fbdbd4076 100644 --- a/Source/Core/DolphinQt/CheatsManager.cpp +++ b/Source/Core/DolphinQt/CheatsManager.cpp @@ -334,6 +334,7 @@ QWidget* CheatsManager::CreateCheatSearch() auto* group_layout = new QHBoxLayout; group_box->setLayout(group_layout); + // i18n: The base 10 numeral system. Not related to non-integer numbers m_match_decimal = new QRadioButton(tr("Decimal")); m_match_hexadecimal = new QRadioButton(tr("Hexadecimal")); m_match_octal = new QRadioButton(tr("Octal")); diff --git a/Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp b/Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp index 9364fb8acd..892dc6eb68 100644 --- a/Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp @@ -19,8 +19,10 @@ void Hotkey3D::CreateMainLayout() m_main_layout = new QHBoxLayout(); m_main_layout->addWidget( + // i18n: Stereoscopic 3D CreateGroupBox(tr("3D"), HotkeyManagerEmu::GetHotkeyGroup(HKGP_3D_TOGGLE))); m_main_layout->addWidget( + // i18n: Stereoscopic 3D CreateGroupBox(tr("3D Depth"), HotkeyManagerEmu::GetHotkeyGroup(HKGP_3D_DEPTH))); setLayout(m_main_layout); diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp index f6de39be6c..5b1386c5e2 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp @@ -304,6 +304,7 @@ void MappingWindow::SetMappingType(MappingWindow::Type type) widget = new WiimoteEmuGeneral(this, extension); setWindowTitle(tr("Wii Remote %1").arg(GetPort() + 1)); AddWidget(tr("General and Options"), widget); + // i18n: IR stands for infrared and refers to the pointer functionality of Wii Remotes AddWidget(tr("Motion Controls and IR"), new WiimoteEmuMotionControl(this)); AddWidget(tr("Extension"), extension); break; @@ -312,6 +313,8 @@ void MappingWindow::SetMappingType(MappingWindow::Type type) { widget = new HotkeyGeneral(this); AddWidget(tr("General"), widget); + // i18n: TAS is short for tool-assisted speedrun. Read http://tasvideos.org/ for details. + // Frame advance is an example of a typical TAS tool. AddWidget(tr("TAS Tools"), new HotkeyTAS(this)); AddWidget(tr("Debugging"), new HotkeyDebugging(this)); @@ -319,6 +322,7 @@ void MappingWindow::SetMappingType(MappingWindow::Type type) AddWidget(tr("Wii and Wii Remote"), new HotkeyWii(this)); AddWidget(tr("Controller Profile"), new HotkeyControllerProfile(this)); AddWidget(tr("Graphics"), new HotkeyGraphics(this)); + // i18n: Stereoscopic 3D AddWidget(tr("3D"), new Hotkey3D(this)); AddWidget(tr("Save and Load State"), new HotkeyStates(this)); AddWidget(tr("Other State Management"), new HotkeyStatesOther(this)); diff --git a/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp b/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp index 7a5c8e985d..f1e06bdfb4 100644 --- a/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp @@ -118,6 +118,8 @@ void RegisterWidget::ShowContextMenu() auto type = static_cast(item->data(DATA_TYPE).toInt()); auto display = item->GetDisplay(); + // i18n: This kind of "watch" is used for watching emulated memory. + // It's not related to timekeeping devices. menu->addAction(tr("Add to &watch"), this, [this, item] { emit RequestMemoryBreakpoint(item->GetValue()); }); menu->addAction(tr("View &memory")); diff --git a/Source/Core/DolphinQt/Debugger/WatchWidget.cpp b/Source/Core/DolphinQt/Debugger/WatchWidget.cpp index 4ef26f68e7..69057f0dbb 100644 --- a/Source/Core/DolphinQt/Debugger/WatchWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/WatchWidget.cpp @@ -125,9 +125,12 @@ void WatchWidget::Update() m_table->setRowCount(size + 1); - m_table->setHorizontalHeaderLabels({tr("Label"), tr("Address"), tr("Hexadecimal"), tr("Decimal"), - // i18n: Data type used in computing - tr("String")}); + m_table->setHorizontalHeaderLabels( + {tr("Label"), tr("Address"), tr("Hexadecimal"), + // i18n: The base 10 numeral system. Not related to non-integer numbers + tr("Decimal"), + // i18n: Data type used in computing + tr("String")}); for (int i = 0; i < size; i++) { diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp index 5f2b54d6d8..2dbb83a936 100644 --- a/Source/Core/DolphinQt/MenuBar.cpp +++ b/Source/Core/DolphinQt/MenuBar.cpp @@ -415,6 +415,8 @@ void MenuBar::AddViewMenu() connect(&Settings::Instance(), &Settings::RegistersVisibilityChanged, m_show_registers, &QAction::setChecked); + // i18n: This kind of "watch" is used for watching emulated memory. + // It's not related to timekeeping devices. m_show_watch = view_menu->addAction(tr("&Watch")); m_show_watch->setCheckable(true); m_show_watch->setChecked(Settings::Instance().IsWatchVisible()); diff --git a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp index 2f4983c00a..bec822d7fd 100644 --- a/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp +++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp @@ -127,6 +127,7 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist() QMessageBox vid_warning_box; vid_warning_box.setIcon(QMessageBox::Warning); vid_warning_box.setWindowTitle(tr("USB Whitelist Error")); + // i18n: Here, VID means Vendor ID (for a USB device). vid_warning_box.setText(tr("The entered VID is invalid.")); vid_warning_box.setStandardButtons(QMessageBox::Ok); vid_warning_box.exec(); @@ -138,6 +139,7 @@ void USBDeviceAddToWhitelistDialog::AddUSBDeviceToWhitelist() QMessageBox pid_warning_box; pid_warning_box.setIcon(QMessageBox::Warning); pid_warning_box.setWindowTitle(tr("USB Whitelist Error")); + // i18n: Here, PID means Product ID (for a USB device). pid_warning_box.setText(tr("The entered PID is invalid.")); pid_warning_box.setStandardButtons(QMessageBox::Ok); pid_warning_box.exec(); diff --git a/Source/Core/DolphinQt/Settings/WiiPane.cpp b/Source/Core/DolphinQt/Settings/WiiPane.cpp index aadce435cb..60998c7d81 100644 --- a/Source/Core/DolphinQt/Settings/WiiPane.cpp +++ b/Source/Core/DolphinQt/Settings/WiiPane.cpp @@ -168,6 +168,7 @@ void WiiPane::CreateWiiRemoteSettings() m_wiimote_ir_sensor_position->addItem(tr("Bottom")); // IR Sensitivity Slider + // i18n: IR stands for infrared and refers to the pointer functionality of Wii Remotes m_wiimote_ir_sensitivity_label = new QLabel(tr("IR Sensitivity:")); m_wiimote_ir_sensitivity = new QSlider(Qt::Horizontal); m_wiimote_ir_sensitivity->setMinimum(4); diff --git a/Source/Core/DolphinQt/ToolBar.cpp b/Source/Core/DolphinQt/ToolBar.cpp index d9f282e607..860da920df 100644 --- a/Source/Core/DolphinQt/ToolBar.cpp +++ b/Source/Core/DolphinQt/ToolBar.cpp @@ -90,11 +90,19 @@ void ToolBar::OnDebugModeToggled(bool enabled) void ToolBar::MakeActions() { + // i18n: Here, "Step" is a verb. This feature is used for + // going through code step by step. m_step_action = addAction(tr("Step"), this, &ToolBar::StepPressed); + // i18n: Here, "Step" is a verb. This feature is used for + // going through code step by step. m_step_over_action = addAction(tr("Step Over"), this, &ToolBar::StepOverPressed); + // i18n: Here, "Step" is a verb. This feature is used for + // going through code step by step. m_step_out_action = addAction(tr("Step Out"), this, &ToolBar::StepOutPressed); m_skip_action = addAction(tr("Skip"), this, &ToolBar::SkipPressed); + // i18n: Here, PC is an acronym for program counter, not personal computer. m_show_pc_action = addAction(tr("Show PC"), this, &ToolBar::ShowPCPressed); + // i18n: Here, PC is an acronym for program counter, not personal computer. m_set_pc_action = addAction(tr("Set PC"), this, &ToolBar::SetPCPressed); m_open_action = addAction(tr("Open"), this, &ToolBar::OpenPressed);