[Scummvm-git-logs] scummvm master -> 1737d9bd9d72707b839089752b8a50e5a87f9eb9

sev- noreply at scummvm.org
Sat Mar 25 19:54:25 UTC 2023


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1737d9bd9d I18N: Fix I18N comment placement


Commit: 1737d9bd9d72707b839089752b8a50e5a87f9eb9
    https://github.com/scummvm/scummvm/commit/1737d9bd9d72707b839089752b8a50e5a87f9eb9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-25T20:54:17+01:00

Commit Message:
I18N: Fix I18N comment placement

Changed paths:
    backends/platform/sdl/miyoo/miyoo.cpp
    backends/platform/sdl/opendingux/opendingux.cpp
    engines/icb/icb.cpp
    engines/mm/mm1/metaengine.cpp
    engines/scumm/dialog-sessionselector.cpp
    gui/options.cpp


diff --git a/backends/platform/sdl/miyoo/miyoo.cpp b/backends/platform/sdl/miyoo/miyoo.cpp
index a4244855479..bb56ceea5fa 100644
--- a/backends/platform/sdl/miyoo/miyoo.cpp
+++ b/backends/platform/sdl/miyoo/miyoo.cpp
@@ -55,39 +55,63 @@
 
 static const Common::KeyTableEntry odKeyboardButtons[] = {
 #ifdef MIYOOMINI
-	{ "JOY_A",		Common::KEYCODE_SPACE,		_s("A")			}, // I18N: Hardware key
-	{ "JOY_B",		Common::KEYCODE_LCTRL,		_s("B")			}, // I18N: Hardware key
-	{ "JOY_X",		Common::KEYCODE_LSHIFT,		_s("X")			}, // I18N: Hardware key
-	{ "JOY_Y",		Common::KEYCODE_LALT,		_s("Y")			}, // I18N: Hardware key
-	{ "JOY_BACK",		Common::KEYCODE_RCTRL,		_s("Select")		}, // I18N: Hardware key
-	{ "JOY_START",		Common::KEYCODE_RETURN,		_s("Start")		}, // I18N: Hardware key
-	{ "JOY_LEFT_SHOULDER",	Common::KEYCODE_e,		_s("L")			}, // I18N: Hardware key
-	{ "JOY_RIGHT_SHOULDER", Common::KEYCODE_t,		_s("R")			}, // I18N: Hardware key
+	// I18N: Hardware key
+	{ "JOY_A",		Common::KEYCODE_SPACE,		_s("A")			},
+	// I18N: Hardware key
+	{ "JOY_B",		Common::KEYCODE_LCTRL,		_s("B")			},
+	// I18N: Hardware key
+	{ "JOY_X",		Common::KEYCODE_LSHIFT,		_s("X")			},
+	// I18N: Hardware key
+	{ "JOY_Y",		Common::KEYCODE_LALT,		_s("Y")			},
+	// I18N: Hardware key
+	{ "JOY_BACK",		Common::KEYCODE_RCTRL,		_s("Select")		},
+	// I18N: Hardware key
+	{ "JOY_START",		Common::KEYCODE_RETURN,		_s("Start")		},
+	// I18N: Hardware key
+	{ "JOY_LEFT_SHOULDER",	Common::KEYCODE_e,		_s("L")			},
+	// I18N: Hardware key
+	{ "JOY_RIGHT_SHOULDER", Common::KEYCODE_t,		_s("R")			},
 	{ "JOY_UP",		Common::KEYCODE_UP,		_s("D-pad Up")	},
 	{ "JOY_DOWN",		Common::KEYCODE_DOWN,		_s("D-pad Down")	},
 	{ "JOY_LEFT",		Common::KEYCODE_LEFT,		_s("D-pad Left")	},
 	{ "JOY_RIGHT",		Common::KEYCODE_RIGHT,		_s("D-pad Right")	},
-	{ "JOY_LEFT_STICK",     Common::KEYCODE_TAB,		_s("L2")		}, // I18N: Hardware key
-	{ "JOY_RIGHT_STICK",    Common::KEYCODE_BACKSPACE,	_s("R2")		}, // I18N: Hardware key
-	{ "JOY_GUIDE",		Common::KEYCODE_ESCAPE,		_s("Menu")	 	}, // I18N: Hardware key
+	// I18N: Hardware key
+	{ "JOY_LEFT_STICK",     Common::KEYCODE_TAB,		_s("L2")		},
+	// I18N: Hardware key
+	{ "JOY_RIGHT_STICK",    Common::KEYCODE_BACKSPACE,	_s("R2")		},
+	// I18N: Hardware key
+	{ "JOY_GUIDE",		Common::KEYCODE_ESCAPE,		_s("Menu")	 	},
 #else
-	{ "JOY_A",		Common::KEYCODE_LALT,		_s("A")			}, // I18N: Hardware key
-	{ "JOY_B",		Common::KEYCODE_LCTRL,		_s("B")			}, // I18N: Hardware key
-	{ "JOY_X",		Common::KEYCODE_LSHIFT,		_s("X")			}, // I18N: Hardware key
-	{ "JOY_Y",		Common::KEYCODE_SPACE,		_s("Y")			}, // I18N: Hardware key
-	{ "JOY_BACK",		Common::KEYCODE_ESCAPE,		_s("Select")		}, // I18N: Hardware key
-	{ "JOY_START",		Common::KEYCODE_RETURN,		_s("Start")		}, // I18N: Hardware key
-	{ "JOY_LEFT_SHOULDER",	Common::KEYCODE_TAB,		_s("L")			}, // I18N: Hardware key
-	{ "JOY_RIGHT_SHOULDER", Common::KEYCODE_BACKSPACE,	_s("R")			}, // I18N: Hardware key
+	// I18N: Hardware key
+	{ "JOY_A",		Common::KEYCODE_LALT,		_s("A")			},
+	// I18N: Hardware key
+	{ "JOY_B",		Common::KEYCODE_LCTRL,		_s("B")			},
+	// I18N: Hardware key
+	{ "JOY_X",		Common::KEYCODE_LSHIFT,		_s("X")			},
+	// I18N: Hardware key
+	{ "JOY_Y",		Common::KEYCODE_SPACE,		_s("Y")			},
+	// I18N: Hardware key
+	{ "JOY_BACK",		Common::KEYCODE_ESCAPE,		_s("Select")		},
+	// I18N: Hardware key
+	{ "JOY_START",		Common::KEYCODE_RETURN,		_s("Start")		},
+	// I18N: Hardware key
+	{ "JOY_LEFT_SHOULDER",	Common::KEYCODE_TAB,		_s("L")			},
+	// I18N: Hardware key
+	{ "JOY_RIGHT_SHOULDER", Common::KEYCODE_BACKSPACE,	_s("R")			},
 	{ "JOY_UP",		Common::KEYCODE_UP,		_s("D-pad Up")	},
 	{ "JOY_DOWN",		Common::KEYCODE_DOWN,		_s("D-pad Down")	},
 	{ "JOY_LEFT",		Common::KEYCODE_LEFT,		_s("D-pad Left")	},
 	{ "JOY_RIGHT",		Common::KEYCODE_RIGHT,		_s("D-pad Right")	},
-	{ "JOY_LEFT_STICK",     Common::KEYCODE_PAGEUP,		_s("L2")		}, // I18N: Hardware key
-	{ "JOY_RIGHT_STICK",    Common::KEYCODE_PAGEDOWN,	_s("R2")		}, // I18N: Hardware key
-	{ "JOY_LEFT_TRIGGER",	Common::KEYCODE_RALT,		_s("L3")	 	}, // I18N: Hardware key
-	{ "JOY_RIGHT_TRIGGER",	Common::KEYCODE_RSHIFT,		_s("R3")	 	}, // I18N: Hardware key
-	{ "JOY_GUIDE",		Common::KEYCODE_RCTRL,		_s("Menu")	 	}, // I18N: Hardware key
+	// I18N: Hardware key
+	{ "JOY_LEFT_STICK",     Common::KEYCODE_PAGEUP,		_s("L2")		},
+	// I18N: Hardware key
+	{ "JOY_RIGHT_STICK",    Common::KEYCODE_PAGEDOWN,	_s("R2")		},
+	// I18N: Hardware key
+	{ "JOY_LEFT_TRIGGER",	Common::KEYCODE_RALT,		_s("L3")	 	},
+	// I18N: Hardware key
+	{ "JOY_RIGHT_TRIGGER",	Common::KEYCODE_RSHIFT,		_s("R3")	 	},
+	// I18N: Hardware key
+	{ "JOY_GUIDE",		Common::KEYCODE_RCTRL,		_s("Menu")	 	},
 #endif
 	{nullptr,			Common::KEYCODE_INVALID,	nullptr			}
 };
diff --git a/backends/platform/sdl/opendingux/opendingux.cpp b/backends/platform/sdl/opendingux/opendingux.cpp
index 0e525b9dee8..bdde0986db8 100644
--- a/backends/platform/sdl/opendingux/opendingux.cpp
+++ b/backends/platform/sdl/opendingux/opendingux.cpp
@@ -45,14 +45,22 @@
 #define JOYSTICK_DIR	"/sys/devices/platform/joystick"
 
 static const Common::KeyTableEntry odKeyboardButtons[] = {
-	{ "JOY_A",		Common::KEYCODE_LCTRL,		_s("A")			}, // I18N: Hardware key
-	{ "JOY_B",		Common::KEYCODE_LALT,		_s("B")			}, // I18N: Hardware key
-	{ "JOY_X",		Common::KEYCODE_SPACE,		_s("X")			}, // I18N: Hardware key
-	{ "JOY_Y",		Common::KEYCODE_LSHIFT,		_s("Y")			}, // I18N: Hardware key
-	{ "JOY_BACK",		Common::KEYCODE_ESCAPE,		_s("Select")		}, // I18N: Hardware key
-	{ "JOY_START",		Common::KEYCODE_RETURN,		_s("Start")		}, // I18N: Hardware key
-	{ "JOY_LEFT_SHOULDER",	Common::KEYCODE_TAB,		_s("L")			}, // I18N: Hardware key
-	{ "JOY_RIGHT_SHOULDER", Common::KEYCODE_BACKSPACE,	_s("R")			}, // I18N: Hardware key
+	// I18N: Hardware key
+	{ "JOY_A",		Common::KEYCODE_LCTRL,		_s("A")			},
+	// I18N: Hardware key
+	{ "JOY_B",		Common::KEYCODE_LALT,		_s("B")			},
+	// I18N: Hardware key
+	{ "JOY_X",		Common::KEYCODE_SPACE,		_s("X")			},
+	// I18N: Hardware key
+	{ "JOY_Y",		Common::KEYCODE_LSHIFT,		_s("Y")			},
+	// I18N: Hardware key
+	{ "JOY_BACK",		Common::KEYCODE_ESCAPE,		_s("Select")		},
+	// I18N: Hardware key
+	{ "JOY_START",		Common::KEYCODE_RETURN,		_s("Start")		},
+	// I18N: Hardware key
+	{ "JOY_LEFT_SHOULDER",	Common::KEYCODE_TAB,		_s("L")			},
+	// I18N: Hardware key
+	{ "JOY_RIGHT_SHOULDER", Common::KEYCODE_BACKSPACE,	_s("R")			},
 	{ "JOY_UP",		Common::KEYCODE_UP,		_s("D-pad Up")	},
 	{ "JOY_DOWN",		Common::KEYCODE_DOWN,		_s("D-pad Down")	},
 	{ "JOY_LEFT",		Common::KEYCODE_LEFT,		_s("D-pad Left")	},
@@ -61,7 +69,8 @@ static const Common::KeyTableEntry odKeyboardButtons[] = {
 };
 
 static const Common::HardwareInputTableEntry odJoystickButtons[] = {
-	{ "JOY_LEFT_TRIGGER",	Common::JOYSTICK_BUTTON_LEFT_STICK,	_s("L3")	 }, // I18N: Hardware key
+	// I18N: Hardware key
+	{ "JOY_LEFT_TRIGGER",	Common::JOYSTICK_BUTTON_LEFT_STICK,	_s("L3")	 },
 	{ nullptr,		0,					nullptr		 }
 };
 
diff --git a/engines/icb/icb.cpp b/engines/icb/icb.cpp
index eee231610d9..185747ea486 100644
--- a/engines/icb/icb.cpp
+++ b/engines/icb/icb.cpp
@@ -85,47 +85,56 @@ Common::KeymapArray IcbEngine::initKeymapsIcb(const char *target) {
 	act->addDefaultInputMapping("JOY_RIGHT");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BFIR", _("Fire")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BFIR", _("Fire"));
 	act->setKeyEvent(KeyState(KEYCODE_SPACE));
 	act->addDefaultInputMapping("JOY_RIGHT_SHOULDER");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BUSE", _("Interact")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BUSE", _("Interact"));
 	act->setKeyEvent(KeyState(KEYCODE_LCTRL));
 	act->addDefaultInputMapping("JOY_A");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BINV", _("Inventory")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BINV", _("Inventory"));
 	act->setKeyEvent(KeyState(KEYCODE_RETURN));
 	act->addDefaultInputMapping("JOY_B");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BARM", _("Arm")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BARM", _("Arm"));
 	act->setKeyEvent(KeyState(KEYCODE_LALT));
 	act->addDefaultInputMapping("JOY_LEFT_SHOULDER");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BREM", _("Remora")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BREM", _("Remora"));
 	act->setKeyEvent(KeyState(KEYCODE_r));
 	act->addDefaultInputMapping("JOY_X");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BCRU", _("Crouch")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BCRU", _("Crouch"));
 	act->setKeyEvent(KeyState(KEYCODE_x));
 	act->addDefaultInputMapping("JOY_Y");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BSID", _("Side Step")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BSID", _("Side Step"));
 	act->setKeyEvent(KeyState(KEYCODE_LSHIFT));
 	act->addDefaultInputMapping("JOY_RIGHT_TRIGGER");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BRUN", _("Run")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BRUN", _("Run"));
 	act->setKeyEvent(KeyState(KEYCODE_z));
 	act->addDefaultInputMapping("JOY_LEFT_TRIGGER");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BPAS", _("Pause")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BPAS", _("Pause"));
 	act->setKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE));
 	act->addDefaultInputMapping("ESCAPE");
 	act->addDefaultInputMapping("JOY_BACK");
@@ -160,32 +169,38 @@ Common::KeymapArray IcbEngine::initKeymapsEldorado(const char *target) {
 	act->addDefaultInputMapping("JOY_RIGHT");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BUSE", _("Interact")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BUSE", _("Interact"));
 	act->setKeyEvent(KeyState(KEYCODE_LCTRL));
 	act->addDefaultInputMapping("JOY_A");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BINV", _("Inventory")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BINV", _("Inventory"));
 	act->setKeyEvent(KeyState(KEYCODE_RETURN));
 	act->addDefaultInputMapping("JOY_B");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BCRU", _("Crouch")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BCRU", _("Crouch"));
 	act->setKeyEvent(KeyState(KEYCODE_x));
 	act->addDefaultInputMapping("JOY_Y");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BSID", _("Side Step")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BSID", _("Side Step"));
 	act->setKeyEvent(KeyState(KEYCODE_LSHIFT));
 	act->addDefaultInputMapping("JOY_RIGHT_TRIGGER");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BRUN", _("Run")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BRUN", _("Run"));
 	act->setKeyEvent(KeyState(KEYCODE_z));
 	act->addDefaultInputMapping("JOY_LEFT_TRIGGER");
 	engineKeyMap->addAction(act);
 
-	act = new Action("BPAS", _("Pause")); // I18N: Action in ICB
+	// I18N: Action in In Cold Blood
+	act = new Action("BPAS", _("Pause"));
 	act->setKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE));
 	act->addDefaultInputMapping("ESCAPE");
 	act->addDefaultInputMapping("JOY_BACK");
diff --git a/engines/mm/mm1/metaengine.cpp b/engines/mm/mm1/metaengine.cpp
index 1a1a98f9a23..cde657821d5 100644
--- a/engines/mm/mm1/metaengine.cpp
+++ b/engines/mm/mm1/metaengine.cpp
@@ -37,8 +37,10 @@ struct KeybindingRecord {
 };
 
 static const KeybindingRecord MENU_KEYS[] = {
-	{ KEYBIND_ESCAPE, "ESCAPE", _s("Escape"), "ESCAPE", nullptr }, // I18N: ESC key
-	{ KEYBIND_SELECT, "SELECT", _s("Select"), "RETURN", nullptr }, // I18N: Return key
+	// I18N: ESC key
+	{ KEYBIND_ESCAPE, "ESCAPE", _s("Escape"), "ESCAPE", nullptr },
+	// I18N: Return key
+	{ KEYBIND_SELECT, "SELECT", _s("Select"), "RETURN", nullptr },
 	{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
 };
 
@@ -53,25 +55,39 @@ static const KeybindingRecord PARTY_KEYS[] = {
 };
 
 static const KeybindingRecord COMBAT_KEYS[] = {
-	{ KEYBIND_COMBAT_ATTACK, "COMBAT_ATTACK", _s("Attack"), "a", nullptr }, // I18N: Combat command in MM1
-	{ KEYBIND_COMBAT_BLOCK, "COMBAT_BLOCK", _s("Block"), "b", nullptr }, // I18N: Combat command in MM1
-	{ KEYBIND_COMBAT_CAST, "COMBAT_CAST", _s("Cast"), "c", nullptr }, // I18N: Combat command in MM1
-	{ KEYBIND_COMBAT_EXCHANGE, "COMBAT_EXCHANGE", _s("Exchange"), "e", nullptr }, // I18N: Combat command in MM1
-	{ KEYBIND_COMBAT_FIGHT, "COMBAT_FIGHT", _s("Fight"), "f", nullptr }, // I18N: Combat command in MM1
-	{ KEYBIND_QUICKREF, "QUICKREF", _s("Quick Reference"), "q", nullptr }, // I18N: Combat command in MM1
-	{ KEYBIND_COMBAT_RETREAT, "COMBAT_RETREAT", _s("Retreat"), "r", nullptr }, // I18N: Combat command in MM1
-	{ KEYBIND_COMBAT_SHOOT, "COMBAT_SHOOT", _s("Shoot"), "s", nullptr }, // I18N: Combat command in MM1
-	{ KEYBIND_COMBAT_USE, "COMBAT_USE", _s("Use"), "u", nullptr }, // I18N: Combat command in MM1
-
-	{ KEYBIND_DELAY, "DELAY", _s("Delay"), "d", nullptr }, // I18N: Combat command in MM1
-	{ KEYBIND_PROTECT, "PROTECT", _s("Protect"), "p", nullptr }, // I18N: Combat command in MM1
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_COMBAT_ATTACK, "COMBAT_ATTACK", _s("Attack"), "a", nullptr },
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_COMBAT_BLOCK, "COMBAT_BLOCK", _s("Block"), "b", nullptr },
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_COMBAT_CAST, "COMBAT_CAST", _s("Cast"), "c", nullptr },
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_COMBAT_EXCHANGE, "COMBAT_EXCHANGE", _s("Exchange"), "e", nullptr },
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_COMBAT_FIGHT, "COMBAT_FIGHT", _s("Fight"), "f", nullptr },
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_QUICKREF, "QUICKREF", _s("Quick Reference"), "q", nullptr },
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_COMBAT_RETREAT, "COMBAT_RETREAT", _s("Retreat"), "r", nullptr },
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_COMBAT_SHOOT, "COMBAT_SHOOT", _s("Shoot"), "s", nullptr },
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_COMBAT_USE, "COMBAT_USE", _s("Use"), "u", nullptr },
+
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_DELAY, "DELAY", _s("Delay"), "d", nullptr },
+	// I18N: Combat command in Might & Magic 1
+	{ KEYBIND_PROTECT, "PROTECT", _s("Protect"), "p", nullptr },
 	{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
 };
 
 static const KeybindingRecord NORMAL_KEYS[] = {
-	{ KEYBIND_SELECT, "SELECT", _s("Select"), "RETURN", nullptr }, // I18N: Select party member command in MM1
-	{ KEYBIND_FORWARDS, "FORWARDS", _s("Forwards"), "UP", nullptr }, // I18N: Directionalcommand in MM1
-	{ KEYBIND_BACKWARDS, "BACKWARDS", _s("Backwards"), "DOWN", nullptr }, // I18N: Directionalcommand in MM1
+	// I18N: Select party member command in Might & Magic 1
+	{ KEYBIND_SELECT, "SELECT", _s("Select"), "RETURN", nullptr },
+	// I18N: Party arrangement command in Might & Magic 1
+	{ KEYBIND_FORWARDS, "FORWARDS", _s("Forwards"), "UP", nullptr },
+	// I18N: Party arrangement command in Might & Magic 1
+	{ KEYBIND_BACKWARDS, "BACKWARDS", _s("Backwards"), "DOWN", nullptr },
 	{ KEYBIND_TURN_LEFT, "TURN_LEFT", _s("Turn Left"), "LEFT", nullptr },
 	{ KEYBIND_TURN_RIGHT, "TURN_RIGHT", _s("Turn Right"), "RIGHT", nullptr },
 	{ KEYBIND_STRAFE_LEFT, "STRAFE_LEFT", _s("Strafe Left"), "C+LEFT", nullptr },
@@ -81,11 +97,16 @@ static const KeybindingRecord NORMAL_KEYS[] = {
 	{ KEYBIND_MAP, "MAP", _s("Show Map"), "m", nullptr },
 	{ KEYBIND_MINIMAP, "MINIMAP", _s("Toggle Minimap"), "=", nullptr },
 	{ KEYBIND_ORDER, "ORDER", _s("Reorder Party"), "o", nullptr },
-	{ KEYBIND_PROTECT, "PROTECT", _s("Protect"), "p", nullptr }, // I18N: Action of hero party in MM1
-	{ KEYBIND_REST, "REST", _s("Rest"), "r", nullptr }, // I18N: Action of hero party in MM1
-	{ KEYBIND_SEARCH, "SEARCH", _s("Search"), "s", nullptr }, // I18N: Action of hero party in MM1
-	{ KEYBIND_BASH, "BASH", _s("Bash"), "b", nullptr }, // I18N: Action of hero party in MM1
-	{ KEYBIND_UNLOCK, "UNLOCK", _s("Unlock"), "u", nullptr }, // I18N: Action of hero party in MM1
+	// I18N: Action of hero party in Might & Magic 1
+	{ KEYBIND_PROTECT, "PROTECT", _s("Protect"), "p", nullptr },
+	// I18N: Action of hero party in Might & Magic 1
+	{ KEYBIND_REST, "REST", _s("Rest"), "r", nullptr },
+	// I18N: Action of hero party in Might & Magic 1
+	{ KEYBIND_SEARCH, "SEARCH", _s("Search"), "s", nullptr },
+	// I18N: Action of hero party in Might & Magic 1
+	{ KEYBIND_BASH, "BASH", _s("Bash"), "b", nullptr },
+	// I18N: Action of hero party in Might & Magic 1
+	{ KEYBIND_UNLOCK, "UNLOCK", _s("Unlock"), "u", nullptr },
 	{ KEYBIND_QUICKREF, "QUICKREF", _s("Quick Reference"), "q", nullptr },
 
 	{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
diff --git a/engines/scumm/dialog-sessionselector.cpp b/engines/scumm/dialog-sessionselector.cpp
index dc72e2f030a..2e04753e3d3 100644
--- a/engines/scumm/dialog-sessionselector.cpp
+++ b/engines/scumm/dialog-sessionselector.cpp
@@ -47,7 +47,8 @@ SessionSelectorDialog::SessionSelectorDialog(Scumm::ScummEngine_v90he *vm)
 	_timestamp = 0;
 
 	_queryProgressText = new GUI::StaticTextWidget(this, "SessionSelector.QueryProgressText",
-						_("Querying games...")); // I18N: Retrieving list of online multiplayer games
+ 						// I18N: Retrieving list of online multiplayer games
+ 						_("Querying games..."));
 
 	_queryProgressText->setAlign(Graphics::kTextAlignCenter);
 
diff --git a/gui/options.cpp b/gui/options.cpp
index 64c8a80ffd7..a20ba56c005 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -2637,12 +2637,14 @@ void GlobalOptionsDialog::addMiscControls(GuiObject *boss, const Common::String
 	new StaticTextWidget(boss, prefix + "DebugLevelPopupDesc", _("Debug level:"));
 	_debugLevelPopUp = new PopUpWidget(boss, prefix + "DebugLevelPopup");
 
-	_debugLevelPopUp->appendEntry(_("None"), -1); // I18N: Debug level -1, no messages
+	// I18N: Debug level -1, no messages
+	_debugLevelPopUp->appendEntry(_("None"), -1);
 
 	for (int i = 0; i < 11; i++)
 		_debugLevelPopUp->appendEntry(Common::U32String::format("%d", i), i);
 
-	_debugLevelPopUp->appendEntry(_("11 (all)"), 11); // I18N: Debug level 11, all messages
+	// I18N: Debug level 11, all messages
+	_debugLevelPopUp->appendEntry(_("11 (all)"), 11);
 
 #ifdef USE_DISCORD
 	_discordRpcCheckbox = new CheckboxWidget(boss, prefix + "DiscordRpc",




More information about the Scummvm-git-logs mailing list