Skip to content

Commit

Permalink
Merge pull request dolphin-emu#7401 from JosJuice/translation-fixes
Browse files Browse the repository at this point in the history
Translation fixes
  • Loading branch information
leoetlino authored Sep 16, 2018
2 parents e3a52b3 + fb6b31b commit 3a16c0d
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 19 deletions.
10 changes: 10 additions & 0 deletions Source/Core/Core/HotkeyManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,20 @@ constexpr std::array<const char*, 131> 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"),
Expand Down Expand Up @@ -277,7 +285,9 @@ constexpr std::array<HotkeyGroupInfo, NUM_HOTKEY_GROUPS> 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},
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/NetPlayClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 1 addition & 0 deletions Source/Core/DolphinQt/CheatsManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
10 changes: 0 additions & 10 deletions Source/Core/DolphinQt/Config/ControllersWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -459,16 +459,6 @@ void ControllersWindow::OnWiimoteConfigure()
MappingWindow(this, type, static_cast<int>(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++)
Expand Down
1 change: 0 additions & 1 deletion Source/Core/DolphinQt/Config/ControllersWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class ControllersWindow final : public QDialog
void OnWiimoteTypeChanged(int state);
void OnGCTypeChanged(int state);
void SaveSettings();
void UnimplementedButton();
void OnBluetoothPassthroughSyncPressed();
void OnBluetoothPassthroughResetPressed();
void OnWiimoteRefreshPressed();
Expand Down
2 changes: 2 additions & 0 deletions Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -312,13 +313,16 @@ 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));

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));
Expand Down
2 changes: 2 additions & 0 deletions Source/Core/DolphinQt/Debugger/RegisterWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ void RegisterWidget::ShowContextMenu()
auto type = static_cast<RegisterType>(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"));
Expand Down
9 changes: 6 additions & 3 deletions Source/Core/DolphinQt/Debugger/WatchWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinQt/Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions Source/Core/DolphinQt/MenuBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down
1 change: 1 addition & 0 deletions Source/Core/DolphinQt/Settings/WiiPane.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 8 additions & 0 deletions Source/Core/DolphinQt/ToolBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions Source/Core/InputCommon/InputConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 3a16c0d

Please sign in to comment.