[Scummvm-git-logs] scummvm master -> 2df128d74d9c362dc6b18f27342758232ecaaaf9
sev-
noreply at scummvm.org
Mon Apr 6 16:32:16 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
83ee539f27 GLK: Made the options dialog translatable
2df128d74d GLK: Maked more strings for translation in the options dialog and added I18N comments
Commit: 83ee539f272f2c4c85a632eab8990e8a4adff176
https://github.com/scummvm/scummvm/commit/83ee539f272f2c4c85a632eab8990e8a4adff176
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-06T18:18:45+02:00
Commit Message:
GLK: Made the options dialog translatable
Changed paths:
engines/glk/dialogs.cpp
diff --git a/engines/glk/dialogs.cpp b/engines/glk/dialogs.cpp
index d127471f3fc..3bf88294a5e 100644
--- a/engines/glk/dialogs.cpp
+++ b/engines/glk/dialogs.cpp
@@ -209,33 +209,33 @@ GlkOptionsWidget::GlkOptionsWidget(GuiObject *boss, const Common::String &name,
_fontHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.FontHeading", "Font");
- NEW_LABEL_POPUP("GlkOptionsDialog.TFont", _s("Text:"), _tfontPopUps[0], "GlkOptionsDialog.TFont0", _s("Font for the text"));
+ NEW_LABEL_POPUP("GlkOptionsDialog.TFont", _("Text:"), _tfontPopUps[0], "GlkOptionsDialog.TFont0", _("Font for the text"));
for (int f = MONOR; f <= PROPZ; ++f)
_tfontPopUps[0]->appendEntry(_(fontLabels[f]), f);
- NEW_LABEL_POPUP("GlkOptionsDialog.GFont", _s("Grid:"), _gfontPopUps[0], "GlkOptionsDialog.GFont0", _s("Font for drawn graphics like maps, diagrams, puzzles, etc"));
+ NEW_LABEL_POPUP("GlkOptionsDialog.GFont", _("Grid:"), _gfontPopUps[0], "GlkOptionsDialog.GFont0", _("Font for drawn graphics like maps, diagrams, puzzles, etc"));
for (int f = MONOR; f <= PROPZ; ++f)
_gfontPopUps[0]->appendEntry(_(fontLabels[f]), f);
_colorHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.ColorHeading", "Color");
- COLOR_EDIT("GlkOptionsDialog.T", _manualTColorHexInput, _tcolorPopUps[0], _s("Text:"), _s("Color of the interactive text"), kTHexChangedCmd, kTColorChangedCmd);
+ COLOR_EDIT("GlkOptionsDialog.T", _manualTColorHexInput, _tcolorPopUps[0], _("Text:"), _("Color of the interactive text"), kTHexChangedCmd, kTColorChangedCmd);
for (int c = 0; c <= 5; ++c)
_tcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
_tcolorPopUps[0]->appendEntry("custom", 6);
- COLOR_EDIT("GlkOptionsDialog.G", _manualGColorHexInput, _gcolorPopUps[0], _s("Grid:"), _s("Color for drawn graphics such as maps, diagrams, puzzles, etc"), kGHexChangedCmd, kGColorChangedCmd);
+ COLOR_EDIT("GlkOptionsDialog.G", _manualGColorHexInput, _gcolorPopUps[0], _("Grid:"), _("Color for drawn graphics such as maps, diagrams, puzzles, etc"), kGHexChangedCmd, kGColorChangedCmd);
for (int c = 0; c <= 5; ++c)
_gcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
_gcolorPopUps[0]->appendEntry("custom", 6);
- COLOR_EDIT("GlkOptionsDialog.W", _manualWColorHexInput, _wcolorPopUps[0], _s("Window:"), _s("Color of the window(background)"), kWHexChangedCmd, kWColorChangedCmd);
+ COLOR_EDIT("GlkOptionsDialog.W", _manualWColorHexInput, _wcolorPopUps[0], _("Window:"), _("Color of the window(background)"), kWHexChangedCmd, kWColorChangedCmd);
_wcolorPopUps[0]->appendEntry("<default>", 7);
for (int c = 0; c <= 5; ++c)
_wcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
_wcolorPopUps[0]->appendEntry("custom", 6);
- COLOR_EDIT("GlkOptionsDialog.B", _manualBColorHexInput, _bcolorPopUps[0], _s("Border:"), _s("Color of the window border"), kBHexChangedCmd, kBColorChangedCmd);
+ COLOR_EDIT("GlkOptionsDialog.B", _manualBColorHexInput, _bcolorPopUps[0], _("Border:"), _("Color of the window border"), kBHexChangedCmd, kBColorChangedCmd);
_bcolorPopUps[0]->appendEntry("<default>", 7);
for (int c = 0; c <= 5; ++c)
_bcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
@@ -243,22 +243,22 @@ GlkOptionsWidget::GlkOptionsWidget(GuiObject *boss, const Common::String &name,
_borderHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.wborderlbl", "Border");
- NEW_LABEL_EDIT("GlkOptionsDialog.wborderx", _s("Horizontal:"), _wborderx, "GlkOptionsDialog.wborderhorizontal", _s("Horizontal border size"));
- NEW_LABEL_EDIT("GlkOptionsDialog.wbordery", _s("Vertical:"), _wbordery, "GlkOptionsDialog.wbordervertical", _s("Vertical border size"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.wborderx", _("Horizontal:"), _wborderx, "GlkOptionsDialog.wborderhorizontal", _("Horizontal border size"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.wbordery", _("Vertical:"), _wbordery, "GlkOptionsDialog.wbordervertical", _("Vertical border size"));
- COLOR_EDIT("GlkOptionsDialog.C", _manualCColorHexInput, _ccolorPopUps[0], _s("Caret:"), _s("Color of the cursor"), kCHexChangedCmd, kCColorChangedCmd);
+ COLOR_EDIT("GlkOptionsDialog.C", _manualCColorHexInput, _ccolorPopUps[0], _("Caret:"), _("Color of the cursor"), kCHexChangedCmd, kCColorChangedCmd);
_ccolorPopUps[0]->appendEntry("<default>", 7);
for (int c = 0; c <= 5; ++c)
_ccolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
_ccolorPopUps[0]->appendEntry("custom", 6);
- COLOR_EDIT("GlkOptionsDialog.L", _manualLColorHexInput, _lcolorPopUps[0], _s("Link:"), _s("Color for URLs if they appear in-game"), kLHexChangedCmd, kLColorChangedCmd);
+ COLOR_EDIT("GlkOptionsDialog.L", _manualLColorHexInput, _lcolorPopUps[0], _("Link:"), _("Color for URLs if they appear in-game"), kLHexChangedCmd, kLColorChangedCmd);
_lcolorPopUps[0]->appendEntry("<default>", 7);
for (int c = 0; c <= 5; ++c)
_lcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
_lcolorPopUps[0]->appendEntry("custom", 6);
- COLOR_EDIT("GlkOptionsDialog.M", _manualMColorHexInput, _mcolorPopUps[0], _s("More:"), _s("Color for the \"More...\" markers in the text"), kMHexChangedCmd, kMColorChangedCmd);
+ COLOR_EDIT("GlkOptionsDialog.M", _manualMColorHexInput, _mcolorPopUps[0], _("More:"), _("Color for the \"More...\" markers in the text"), kMHexChangedCmd, kMColorChangedCmd);
_mcolorPopUps[0]->appendEntry("<default>", 7);
for (int c = 0; c <= 5; ++c)
_mcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
@@ -266,77 +266,77 @@ GlkOptionsWidget::GlkOptionsWidget(GuiObject *boss, const Common::String &name,
_typographyHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.topographyheadinglbl", "Typography");
- NEW_LABEL_POPUP("GlkOptionsDialog.linkstyle", _s("Link style:"), _linkStyle, "GlkOptionsDialog.linkStyle", _s("Style for URLs if they appear in-game"));
+ NEW_LABEL_POPUP("GlkOptionsDialog.linkstyle", _("Link style:"), _linkStyle, "GlkOptionsDialog.linkStyle", _("Style for URLs if they appear in-game"));
_linkStyle->appendEntry(_("1"), 0);
_linkStyle->appendEntry(_("2"), 1);
_linkStyle->appendEntry(_("3"), 2);
- NEW_LABEL_POPUP("GlkOptionsDialog.caretshape", _s("Caret shape:"), _caretShape, "GlkOptionsDialog.caretShape", _s("Shape of the cursor"));
+ NEW_LABEL_POPUP("GlkOptionsDialog.caretshape", _("Caret shape:"), _caretShape, "GlkOptionsDialog.caretShape", _("Shape of the cursor"));
_caretShape->appendEntry(_("0"), 0);
_caretShape->appendEntry(_("1"), 1);
_caretShape->appendEntry(_("2"), 2);
_caretShape->appendEntry(_("3"), 3);
_caretShape->appendEntry(_("4"), 4);
- NEW_LABEL_EDIT("GlkOptionsDialog.moreprompt", _s("More prompt:"), _morePrompt, "GlkOptionsDialog.morePrompt", _s("Custom marker in place of the \"More...\" marker for eg. \"continue\". Leave it blank to use the game's default"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.moreprompt", _("More prompt:"), _morePrompt, "GlkOptionsDialog.morePrompt", _("Custom marker in place of the \"More...\" marker for eg. \"continue\". Leave it blank to use the game's default"));
- NEW_LABEL_CHECKBOX("GlkOptionsDialog.stylehintlabel", _s("Style hints:"), _styleHint, "GlkOptionsDialog.stylehint", _s("Let the game suggest text styling options"));
- NEW_LABEL_CHECKBOX("GlkOptionsDialog.safeclickslabel", _s("Safe clicks:"), _safeClicks, "GlkOptionsDialog.safeclicks", _s("Safely apply clicks while input is pending"));
+ NEW_LABEL_CHECKBOX("GlkOptionsDialog.stylehintlabel", _("Style hints:"), _styleHint, "GlkOptionsDialog.stylehint", _("Let the game suggest text styling options"));
+ NEW_LABEL_CHECKBOX("GlkOptionsDialog.safeclickslabel", _("Safe clicks:"), _safeClicks, "GlkOptionsDialog.safeclicks", _("Safely apply clicks while input is pending"));
- NEW_LABEL_EDIT("GlkOptionsDialog.colslbl", _s("Column count:"), _cols, "GlkOptionsDialog.cols", _s("Number of columns"));
- NEW_LABEL_EDIT("GlkOptionsDialog.rowslbl", _s("Rows count:"), _rows, "GlkOptionsDialog.rows", _s("Number of rows"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.colslbl", _("Column count:"), _cols, "GlkOptionsDialog.cols", _("Number of columns"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.rowslbl", _("Rows count:"), _rows, "GlkOptionsDialog.rows", _("Number of rows"));
- NEW_LABEL_CHECKBOX("GlkOptionsDialog.lockcolslbl", _s("Lock columns:"), _lockcols, "GlkOptionsDialog.lockcols", _s("Check it to manually change the column count"));
- NEW_LABEL_CHECKBOX("GlkOptionsDialog.lockrowslbl", _s("Lock rows:"), _lockrows, "GlkOptionsDialog.lockrows", _s("Check it to manually change the row count"));
+ NEW_LABEL_CHECKBOX("GlkOptionsDialog.lockcolslbl", _("Lock columns:"), _lockcols, "GlkOptionsDialog.lockcols", _("Check it to manually change the column count"));
+ NEW_LABEL_CHECKBOX("GlkOptionsDialog.lockrowslbl", _("Lock rows:"), _lockrows, "GlkOptionsDialog.lockrows", _("Check it to manually change the row count"));
- NEW_LABEL_CHECKBOX("GlkOptionsDialog.justifylbl", _s("Justify:"), _justify, "GlkOptionsDialog.justify", _s("Enable text justification"));
+ NEW_LABEL_CHECKBOX("GlkOptionsDialog.justifylbl", _("Justify:"), _justify, "GlkOptionsDialog.justify", _("Enable text justification"));
- NEW_LABEL_POPUP("GlkOptionsDialog.quoteslbl", _s("Typographic quotes:"), _quotes, "GlkOptionsDialog.quotes", _s("Choose typographic quotes"));
+ NEW_LABEL_POPUP("GlkOptionsDialog.quoteslbl", _("Typographic quotes:"), _quotes, "GlkOptionsDialog.quotes", _("Choose typographic quotes"));
_quotes->appendEntry(_("Off"), 0);
_quotes->appendEntry(_("Normal"), 1);
_quotes->appendEntry(_("Rabid"), 2);
- NEW_LABEL_CHECKBOX("GlkOptionsDialog.capslbl", _s("Caps:"), _caps, "GlkOptionsDialog.caps", _s("Force uppercase input"));
+ NEW_LABEL_CHECKBOX("GlkOptionsDialog.capslbl", _("Caps:"), _caps, "GlkOptionsDialog.caps", _("Force uppercase input"));
- NEW_LABEL_POPUP("GlkOptionsDialog.dasheslbl", _s("Dashes:"), _dashes, "GlkOptionsDialog.dashes", _s("Types of dashes"));
+ NEW_LABEL_POPUP("GlkOptionsDialog.dasheslbl", _("Dashes:"), _dashes, "GlkOptionsDialog.dashes", _("Types of dashes"));
_dashes->appendEntry(_("Off"), 0);
_dashes->appendEntry(_("Em dashes"), 1);
_dashes->appendEntry(_("En+Em dashes"), 2);
_userExperiencelbl = createHeading(widgetsBoss(), "GlkOptionsDialog.userexplbl", "User experience");
- NEW_LABEL_POPUP("GlkOptionsDialog.spaceslbl", _s("Spaces:"), _spaces, "GlkOptionsDialog.spaces", _s("Types of spaces"));
+ NEW_LABEL_POPUP("GlkOptionsDialog.spaceslbl", _("Spaces:"), _spaces, "GlkOptionsDialog.spaces", _("Types of spaces"));
_spaces->appendEntry(_("Off"), 0);
_spaces->appendEntry(_("Compress double spaces"), 1);
_spaces->appendEntry(_("Expand single spaces"), 2);
- NEW_LABEL_CHECKBOX("GlkOptionsDialog.graphicslbl", _s("Graphics:"), _graphics, "GlkOptionsDialog.graphics", _s("Turn graphics on/off"));
+ NEW_LABEL_CHECKBOX("GlkOptionsDialog.graphicslbl", _("Graphics:"), _graphics, "GlkOptionsDialog.graphics", _("Turn graphics on/off"));
_wmarginHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.WindowMarginHeading", "Window margin");
- NEW_LABEL_EDIT("GlkOptionsDialog.wmarginxlbl", _s("Horizontal:"), _wmarginx, "GlkOptionsDialog.wmarginx", _s("Horizontal margin for window"));
- NEW_LABEL_EDIT("GlkOptionsDialog.wmarginylbl", _s("Vertical:"), _wmarginy, "GlkOptionsDialog.wmarginy", _s("Vertical margin for window"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.wmarginxlbl", _("Horizontal:"), _wmarginx, "GlkOptionsDialog.wmarginx", _("Horizontal margin for window"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.wmarginylbl", _("Vertical:"), _wmarginy, "GlkOptionsDialog.wmarginy", _("Vertical margin for window"));
_wpaddingHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.wpaddinglbl", "Window padding");
- NEW_LABEL_EDIT("GlkOptionsDialog.wpaddingxlbl", _s("Horizontal:"), _wpaddingx, "GlkOptionsDialog.wpaddingx", _s("Horizontal padding for window"));
- NEW_LABEL_EDIT("GlkOptionsDialog.wpaddingylbl", _s("Vertical:"), _wpaddingy, "GlkOptionsDialog.wpaddingy", _s("Vertical padding for window"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.wpaddingxlbl", _("Horizontal:"), _wpaddingx, "GlkOptionsDialog.wpaddingx", _("Horizontal padding for window"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.wpaddingylbl", _("Vertical:"), _wpaddingy, "GlkOptionsDialog.wpaddingy", _("Vertical padding for window"));
_tmarginHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.tmarginlbl", "Text margin");
- NEW_LABEL_EDIT("GlkOptionsDialog.tmarginxlbl", _s("Horizontal:"), _tmarginx, "GlkOptionsDialog.tmarginx", _s("Horizontal margin for text"));
- NEW_LABEL_EDIT("GlkOptionsDialog.tmarginylbl", _s("Vertical:"), _tmarginy, "GlkOptionsDialog.tmarginy", _s("Vertical margin for text"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.tmarginxlbl", _("Horizontal:"), _tmarginx, "GlkOptionsDialog.tmarginx", _("Horizontal margin for text"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.tmarginylbl", _("Vertical:"), _tmarginy, "GlkOptionsDialog.tmarginy", _("Vertical margin for text"));
- NEW_LABEL_EDIT("GlkOptionsDialog.leadinglbl", _s("Leading:"), _leading, "GlkOptionsDialog.leading", _s("Vertical distance between text rows. Valid inputs - 12, 16, 22 etc."));
- NEW_LABEL_EDIT("GlkOptionsDialog.baselinelbl", _s("Baseline:"), _baseline, "GlkOptionsDialog.baseline", _s("Invisible horizontal line on which text sits. Valid inputs - 8, 16 etc. as per your font size"));
+ NEW_LABEL_EDIT("GlkOptionsDialog.leadinglbl", _("Leading:"), _leading, "GlkOptionsDialog.leading", _("Vertical distance between text rows. Valid inputs - 12, 16, 22 etc."));
+ NEW_LABEL_EDIT("GlkOptionsDialog.baselinelbl", _("Baseline:"), _baseline, "GlkOptionsDialog.baseline", _("Invisible horizontal line on which text sits. Valid inputs - 8, 16 etc. as per your font size"));
- NEW_LABEL_SLIDER_CMD("GlkOptionsDialog.monosizelbl", _s("Monosize:"), _monosize, "GlkOptionsDialog.monosize", _monosizeVal, "GlkOptionsDialog.monosizeval", _s("Font size scaling for the monospace text font"), kMonoSizeCmd);
- NEW_LABEL_SLIDER_CMD("GlkOptionsDialog.propsizelbl", _s("Propsize:"), _propsize, "GlkOptionsDialog.propsize", _propsizeVal, "GlkOptionsDialog.propsizeval", _s("Font size scaling for the proportional text font"), kPropSizeCmd);
+ NEW_LABEL_SLIDER_CMD("GlkOptionsDialog.monosizelbl", _("Monosize:"), _monosize, "GlkOptionsDialog.monosize", _monosizeVal, "GlkOptionsDialog.monosizeval", _("Font size scaling for the monospace text font"), kMonoSizeCmd);
+ NEW_LABEL_SLIDER_CMD("GlkOptionsDialog.propsizelbl", _("Propsize:"), _propsize, "GlkOptionsDialog.propsize", _propsizeVal, "GlkOptionsDialog.propsizeval", _("Font size scaling for the proportional text font"), kPropSizeCmd);
_moreHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.morelbl", "More");
- NEW_LABEL_POPUP("GlkOptionsDialog.morealignlbl", _s("Align:"), _morealign, "GlkOptionsDialog.morealign", _s("Alignment of the \"More...\" marker on the window"));
+ NEW_LABEL_POPUP("GlkOptionsDialog.morealignlbl", _("Align:"), _morealign, "GlkOptionsDialog.morealign", _("Alignment of the \"More...\" marker on the window"));
_morealign->appendEntry(_("Left"), 0);
_morealign->appendEntry(_("Centre"), 1);
_morealign->appendEntry(_("Right"), 2);
- NEW_LABEL_POPUP("GlkOptionsDialog.morefontlbl", _s("Font:"), _morefont, "GlkOptionsDialog.morefont", _s("Font for the \"More...\" marker"));
+ NEW_LABEL_POPUP("GlkOptionsDialog.morefontlbl", _("Font:"), _morefont, "GlkOptionsDialog.morefont", _("Font for the \"More...\" marker"));
for (int f = MONOR; f <= PROPZ; ++f)
_morefont->appendEntry(_(fontLabels[f]), f);
Commit: 2df128d74d9c362dc6b18f27342758232ecaaaf9
https://github.com/scummvm/scummvm/commit/2df128d74d9c362dc6b18f27342758232ecaaaf9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-06T18:31:42+02:00
Commit Message:
GLK: Maked more strings for translation in the options dialog and added I18N comments
Changed paths:
engines/glk/dialogs.cpp
diff --git a/engines/glk/dialogs.cpp b/engines/glk/dialogs.cpp
index 3bf88294a5e..98a86e8a9b6 100644
--- a/engines/glk/dialogs.cpp
+++ b/engines/glk/dialogs.cpp
@@ -138,12 +138,12 @@ struct GlkColor {
};
static const GlkColor GLK_COLORS[] = {
- { "white", 0xFFFFFF },
- { "green", 0x00FF00 },
- { "red", 0xFF0000 },
- { "blue", 0x0000FF },
- { "black", 0x000000 },
- { "grey", 0x808080 }
+ { _s("white"), 0xFFFFFF },
+ { _s("green"), 0x00FF00 },
+ { _s("red"), 0xFF0000 },
+ { _s("blue"), 0x0000FF },
+ { _s("black"), 0x000000 },
+ { _s("grey"), 0x808080 }
};
struct BoolOption {
@@ -182,8 +182,8 @@ struct FontOption {
const char *confKeyPrefix;
};
-static GUI::StaticTextWidget *createHeading(GUI::GuiObject *boss, const char *id, const char *text) {
- auto h = new GUI::StaticTextWidget(boss, id, _(text));
+static GUI::StaticTextWidget *createHeading(GUI::GuiObject *boss, const char *id, Common::U32String text) {
+ auto h = new GUI::StaticTextWidget(boss, id, text);
h->setAlign(Graphics::kTextAlignCenter);
return h;
}
@@ -207,7 +207,7 @@ GlkOptionsWidget::GlkOptionsWidget(GuiObject *boss, const Common::String &name,
_gfontPopUps[f] = nullptr;
}
- _fontHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.FontHeading", "Font");
+ _fontHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.FontHeading", _("Font"));
NEW_LABEL_POPUP("GlkOptionsDialog.TFont", _("Text:"), _tfontPopUps[0], "GlkOptionsDialog.TFont0", _("Font for the text"));
for (int f = MONOR; f <= PROPZ; ++f)
@@ -217,73 +217,80 @@ GlkOptionsWidget::GlkOptionsWidget(GuiObject *boss, const Common::String &name,
for (int f = MONOR; f <= PROPZ; ++f)
_gfontPopUps[0]->appendEntry(_(fontLabels[f]), f);
- _colorHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.ColorHeading", "Color");
+ _colorHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.ColorHeading", _("Color"));
COLOR_EDIT("GlkOptionsDialog.T", _manualTColorHexInput, _tcolorPopUps[0], _("Text:"), _("Color of the interactive text"), kTHexChangedCmd, kTColorChangedCmd);
for (int c = 0; c <= 5; ++c)
_tcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
- _tcolorPopUps[0]->appendEntry("custom", 6);
+ _tcolorPopUps[0]->appendEntry(_("<custom>"), 6);
COLOR_EDIT("GlkOptionsDialog.G", _manualGColorHexInput, _gcolorPopUps[0], _("Grid:"), _("Color for drawn graphics such as maps, diagrams, puzzles, etc"), kGHexChangedCmd, kGColorChangedCmd);
for (int c = 0; c <= 5; ++c)
_gcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
- _gcolorPopUps[0]->appendEntry("custom", 6);
+ _gcolorPopUps[0]->appendEntry(_("<custom>"), 6);
- COLOR_EDIT("GlkOptionsDialog.W", _manualWColorHexInput, _wcolorPopUps[0], _("Window:"), _("Color of the window(background)"), kWHexChangedCmd, kWColorChangedCmd);
- _wcolorPopUps[0]->appendEntry("<default>", 7);
+ COLOR_EDIT("GlkOptionsDialog.W", _manualWColorHexInput, _wcolorPopUps[0], _("Window:"), _("Color of the window (background)"), kWHexChangedCmd, kWColorChangedCmd);
+ _wcolorPopUps[0]->appendEntry(_("<default>"), 7);
for (int c = 0; c <= 5; ++c)
_wcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
- _wcolorPopUps[0]->appendEntry("custom", 6);
+ _wcolorPopUps[0]->appendEntry(_("<custom>"), 6);
COLOR_EDIT("GlkOptionsDialog.B", _manualBColorHexInput, _bcolorPopUps[0], _("Border:"), _("Color of the window border"), kBHexChangedCmd, kBColorChangedCmd);
- _bcolorPopUps[0]->appendEntry("<default>", 7);
+ _bcolorPopUps[0]->appendEntry(_("<default>"), 7);
for (int c = 0; c <= 5; ++c)
_bcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
- _bcolorPopUps[0]->appendEntry("custom", 6);
+ _bcolorPopUps[0]->appendEntry(_("<custom>"), 6);
- _borderHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.wborderlbl", "Border");
+ // I18N: This is a section for text windows border settings
+ _borderHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.wborderlbl", _("Border"));
NEW_LABEL_EDIT("GlkOptionsDialog.wborderx", _("Horizontal:"), _wborderx, "GlkOptionsDialog.wborderhorizontal", _("Horizontal border size"));
NEW_LABEL_EDIT("GlkOptionsDialog.wbordery", _("Vertical:"), _wbordery, "GlkOptionsDialog.wbordervertical", _("Vertical border size"));
COLOR_EDIT("GlkOptionsDialog.C", _manualCColorHexInput, _ccolorPopUps[0], _("Caret:"), _("Color of the cursor"), kCHexChangedCmd, kCColorChangedCmd);
- _ccolorPopUps[0]->appendEntry("<default>", 7);
+ _ccolorPopUps[0]->appendEntry(_("<default>"), 7);
for (int c = 0; c <= 5; ++c)
_ccolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
- _ccolorPopUps[0]->appendEntry("custom", 6);
+ _ccolorPopUps[0]->appendEntry(_("<custom>"), 6);
COLOR_EDIT("GlkOptionsDialog.L", _manualLColorHexInput, _lcolorPopUps[0], _("Link:"), _("Color for URLs if they appear in-game"), kLHexChangedCmd, kLColorChangedCmd);
- _lcolorPopUps[0]->appendEntry("<default>", 7);
+ _lcolorPopUps[0]->appendEntry(_("<default>"), 7);
for (int c = 0; c <= 5; ++c)
_lcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
- _lcolorPopUps[0]->appendEntry("custom", 6);
+ _lcolorPopUps[0]->appendEntry(_("<custom>"), 6);
- COLOR_EDIT("GlkOptionsDialog.M", _manualMColorHexInput, _mcolorPopUps[0], _("More:"), _("Color for the \"More...\" markers in the text"), kMHexChangedCmd, kMColorChangedCmd);
- _mcolorPopUps[0]->appendEntry("<default>", 7);
+ COLOR_EDIT("GlkOptionsDialog.M", _manualMColorHexInput, _mcolorPopUps[0],
+ // I18N: "More..." is a prompt in text windows, which appears when the text exceeds the window size
+ _("More:"),
+ _("Color for the \"More...\" markers in the text"), kMHexChangedCmd, kMColorChangedCmd);
+ _mcolorPopUps[0]->appendEntry(_("<default>"), 7);
for (int c = 0; c <= 5; ++c)
_mcolorPopUps[0]->appendEntry(_(GLK_COLORS[c].name), c);
- _mcolorPopUps[0]->appendEntry("custom", 6);
+ _mcolorPopUps[0]->appendEntry(_("<custom>"), 6);
- _typographyHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.topographyheadinglbl", "Typography");
+ // I18n: This is a section for typography settings, such as font size, spacing, etc.
+ _typographyHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.topographyheadinglbl", _("Typography"));
NEW_LABEL_POPUP("GlkOptionsDialog.linkstyle", _("Link style:"), _linkStyle, "GlkOptionsDialog.linkStyle", _("Style for URLs if they appear in-game"));
- _linkStyle->appendEntry(_("1"), 0);
- _linkStyle->appendEntry(_("2"), 1);
- _linkStyle->appendEntry(_("3"), 2);
+ _linkStyle->appendEntry("1", 0);
+ _linkStyle->appendEntry("2", 1);
+ _linkStyle->appendEntry("3", 2);
NEW_LABEL_POPUP("GlkOptionsDialog.caretshape", _("Caret shape:"), _caretShape, "GlkOptionsDialog.caretShape", _("Shape of the cursor"));
- _caretShape->appendEntry(_("0"), 0);
- _caretShape->appendEntry(_("1"), 1);
- _caretShape->appendEntry(_("2"), 2);
- _caretShape->appendEntry(_("3"), 3);
- _caretShape->appendEntry(_("4"), 4);
+ _caretShape->appendEntry("0", 0);
+ _caretShape->appendEntry("1", 1);
+ _caretShape->appendEntry("2", 2);
+ _caretShape->appendEntry("3", 3);
+ _caretShape->appendEntry("4", 4);
NEW_LABEL_EDIT("GlkOptionsDialog.moreprompt", _("More prompt:"), _morePrompt, "GlkOptionsDialog.morePrompt", _("Custom marker in place of the \"More...\" marker for eg. \"continue\". Leave it blank to use the game's default"));
NEW_LABEL_CHECKBOX("GlkOptionsDialog.stylehintlabel", _("Style hints:"), _styleHint, "GlkOptionsDialog.stylehint", _("Let the game suggest text styling options"));
NEW_LABEL_CHECKBOX("GlkOptionsDialog.safeclickslabel", _("Safe clicks:"), _safeClicks, "GlkOptionsDialog.safeclicks", _("Safely apply clicks while input is pending"));
+ // I18N: This is setting for number of text columns
NEW_LABEL_EDIT("GlkOptionsDialog.colslbl", _("Column count:"), _cols, "GlkOptionsDialog.cols", _("Number of columns"));
+ // I18N: This is setting for number of text rows
NEW_LABEL_EDIT("GlkOptionsDialog.rowslbl", _("Rows count:"), _rows, "GlkOptionsDialog.rows", _("Number of rows"));
NEW_LABEL_CHECKBOX("GlkOptionsDialog.lockcolslbl", _("Lock columns:"), _lockcols, "GlkOptionsDialog.lockcols", _("Check it to manually change the column count"));
@@ -293,34 +300,40 @@ GlkOptionsWidget::GlkOptionsWidget(GuiObject *boss, const Common::String &name,
NEW_LABEL_POPUP("GlkOptionsDialog.quoteslbl", _("Typographic quotes:"), _quotes, "GlkOptionsDialog.quotes", _("Choose typographic quotes"));
_quotes->appendEntry(_("Off"), 0);
+ // I18N: This is a setting for using normal typographic quotes, which are like in most books, with the opening quote higher than the closing one
_quotes->appendEntry(_("Normal"), 1);
+ // I18N: This is a setting for using "rabid" quotes, which are like normal typographic quotes but with the opening quote lower than the closing one, like in some comic books
_quotes->appendEntry(_("Rabid"), 2);
NEW_LABEL_CHECKBOX("GlkOptionsDialog.capslbl", _("Caps:"), _caps, "GlkOptionsDialog.caps", _("Force uppercase input"));
NEW_LABEL_POPUP("GlkOptionsDialog.dasheslbl", _("Dashes:"), _dashes, "GlkOptionsDialog.dashes", _("Types of dashes"));
_dashes->appendEntry(_("Off"), 0);
+ // I18N: This is a setting for using normal typographic dashes, which are like in most books, with the em dash being the longest and the en dash being half of it
_dashes->appendEntry(_("Em dashes"), 1);
+ // I18N: This is a setting for using "en+em" dashes, which are like normal typographic dashes but with the en dash being the same length as the em dash, like in some comic books
_dashes->appendEntry(_("En+Em dashes"), 2);
- _userExperiencelbl = createHeading(widgetsBoss(), "GlkOptionsDialog.userexplbl", "User experience");
+ _userExperiencelbl = createHeading(widgetsBoss(), "GlkOptionsDialog.userexplbl", _("User experience"));
NEW_LABEL_POPUP("GlkOptionsDialog.spaceslbl", _("Spaces:"), _spaces, "GlkOptionsDialog.spaces", _("Types of spaces"));
_spaces->appendEntry(_("Off"), 0);
+ // I18N: This is a setting for compressing double spaces into single ones in text
_spaces->appendEntry(_("Compress double spaces"), 1);
+ // I18N: This is a setting for expanding single spaces into double ones in text
_spaces->appendEntry(_("Expand single spaces"), 2);
NEW_LABEL_CHECKBOX("GlkOptionsDialog.graphicslbl", _("Graphics:"), _graphics, "GlkOptionsDialog.graphics", _("Turn graphics on/off"));
- _wmarginHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.WindowMarginHeading", "Window margin");
+ _wmarginHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.WindowMarginHeading", _("Window margin"));
NEW_LABEL_EDIT("GlkOptionsDialog.wmarginxlbl", _("Horizontal:"), _wmarginx, "GlkOptionsDialog.wmarginx", _("Horizontal margin for window"));
NEW_LABEL_EDIT("GlkOptionsDialog.wmarginylbl", _("Vertical:"), _wmarginy, "GlkOptionsDialog.wmarginy", _("Vertical margin for window"));
- _wpaddingHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.wpaddinglbl", "Window padding");
+ _wpaddingHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.wpaddinglbl", _("Window padding"));
NEW_LABEL_EDIT("GlkOptionsDialog.wpaddingxlbl", _("Horizontal:"), _wpaddingx, "GlkOptionsDialog.wpaddingx", _("Horizontal padding for window"));
NEW_LABEL_EDIT("GlkOptionsDialog.wpaddingylbl", _("Vertical:"), _wpaddingy, "GlkOptionsDialog.wpaddingy", _("Vertical padding for window"));
- _tmarginHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.tmarginlbl", "Text margin");
+ _tmarginHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.tmarginlbl", _("Text margin"));
NEW_LABEL_EDIT("GlkOptionsDialog.tmarginxlbl", _("Horizontal:"), _tmarginx, "GlkOptionsDialog.tmarginx", _("Horizontal margin for text"));
NEW_LABEL_EDIT("GlkOptionsDialog.tmarginylbl", _("Vertical:"), _tmarginy, "GlkOptionsDialog.tmarginy", _("Vertical margin for text"));
@@ -330,7 +343,8 @@ GlkOptionsWidget::GlkOptionsWidget(GuiObject *boss, const Common::String &name,
NEW_LABEL_SLIDER_CMD("GlkOptionsDialog.monosizelbl", _("Monosize:"), _monosize, "GlkOptionsDialog.monosize", _monosizeVal, "GlkOptionsDialog.monosizeval", _("Font size scaling for the monospace text font"), kMonoSizeCmd);
NEW_LABEL_SLIDER_CMD("GlkOptionsDialog.propsizelbl", _("Propsize:"), _propsize, "GlkOptionsDialog.propsize", _propsizeVal, "GlkOptionsDialog.propsizeval", _("Font size scaling for the proportional text font"), kPropSizeCmd);
- _moreHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.morelbl", "More");
+ // I18N: This is a section for settings related to the "More..." prompt in text windows
+ _moreHeadinglbl = createHeading(widgetsBoss(), "GlkOptionsDialog.morelbl", _("More"));
NEW_LABEL_POPUP("GlkOptionsDialog.morealignlbl", _("Align:"), _morealign, "GlkOptionsDialog.morealign", _("Alignment of the \"More...\" marker on the window"));
_morealign->appendEntry(_("Left"), 0);
_morealign->appendEntry(_("Centre"), 1);
More information about the Scummvm-git-logs
mailing list