diff options
Diffstat (limited to 'gui')
-rw-r--r-- | gui/ThemeEngine.cpp | 9 | ||||
-rw-r--r-- | gui/ThemeEngine.h | 1 | ||||
-rw-r--r-- | gui/browser.cpp | 5 | ||||
-rw-r--r-- | gui/options.cpp | 7 | ||||
-rw-r--r-- | gui/themes/translations.dat | bin | 75438 -> 75356 bytes |
5 files changed, 13 insertions, 9 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 9cc98d83ce..eb388272c8 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -331,15 +331,12 @@ ThemeEngine::~ThemeEngine() { * Rendering mode management *********************************************************/ const ThemeEngine::Renderer ThemeEngine::_rendererModes[] = { - { _s("Disabled GFX"), "none", kGfxDisabled }, - { _s("Standard Renderer (16bpp)"), "normal_16bpp", kGfxStandard16bit }, + { _s("Disabled GFX"), _sc("Disabled GFX", "lowres"), "none", kGfxDisabled }, + { _s("Standard Renderer (16bpp)"), _s("Standard (16bpp)"), "normal_16bpp", kGfxStandard16bit }, #ifndef DISABLE_FANCY_THEMES - { _s("Antialiased Renderer (16bpp)"), "aa_16bpp", kGfxAntialias16bit } + { _s("Antialiased Renderer (16bpp)"), _s("Antialiased (16bpp)"), "aa_16bpp", kGfxAntialias16bit } #endif }; - -DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("Standard Renderer (16bpp)", "lowres") -DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("Antialiased Renderer (16bpp)", "lowres") const uint ThemeEngine::_rendererModesSize = ARRAYSIZE(ThemeEngine::_rendererModes); diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index 73181b74a6..b2bb9439a7 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -238,6 +238,7 @@ public: struct Renderer { const char *name; + const char *shortname; const char *cfg; GraphicsMode mode; }; diff --git a/gui/browser.cpp b/gui/browser.cpp index 0d95e5397b..6a9d3d05b5 100644 --- a/gui/browser.cpp +++ b/gui/browser.cpp @@ -66,7 +66,10 @@ BrowserDialog::BrowserDialog(const char *title, bool dirBrowser) _backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain; // Buttons - new ButtonWidget(this, "Browser.Up", _("Go up"), _("Go to previous directory level"), kGoUpCmd); + if (g_system->getOverlayWidth() > 320) + new ButtonWidget(this, "Browser.Up", _("Go up"), _("Go to previous directory level"), kGoUpCmd); + else + new ButtonWidget(this, "Browser.Up", _c("Go up", "lowres"), _("Go to previous directory level"), kGoUpCmd); new ButtonWidget(this, "Browser.Cancel", _("Cancel"), 0, kCloseCmd); new ButtonWidget(this, "Browser.Choose", _("Choose"), 0, kChooseCmd); } diff --git a/gui/options.cpp b/gui/options.cpp index a6357d9737..970aa28155 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -663,7 +663,10 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &prefix) { // The MIDI mode popup & a label - _midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", _domain == Common::ConfigManager::kApplicationDomain ? _("Preferred Device:") : _("Music Device:"), _domain == Common::ConfigManager::kApplicationDomain ? _("Specifies preferred sound device or sound card emulator") : _("Specifies output sound device or sound card emulator")); + if (g_system->getOverlayWidth() > 320) + _midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", _domain == Common::ConfigManager::kApplicationDomain ? _("Preferred Device:") : _("Music Device:"), _domain == Common::ConfigManager::kApplicationDomain ? _("Specifies preferred sound device or sound card emulator") : _("Specifies output sound device or sound card emulator")); + else + _midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", _domain == Common::ConfigManager::kApplicationDomain ? _c("Preferred Device:", "lowres") : _c("Music Device:", "lowres"), _domain == Common::ConfigManager::kApplicationDomain ? _("Specifies preferred sound device or sound card emulator") : _("Specifies output sound device or sound card emulator")); _midiPopUp = new PopUpWidget(boss, prefix + "auMidiPopup", _("Specifies output sound device or sound card emulator")); // Populate it @@ -1025,7 +1028,7 @@ GlobalOptionsDialog::GlobalOptionsDialog() _rendererPopUp->appendEntry(_(GUI::ThemeEngine::_rendererModes[i].name), GUI::ThemeEngine::_rendererModes[i].mode); } else { for (uint i = 1; i < GUI::ThemeEngine::_rendererModesSize; ++i) - _rendererPopUp->appendEntry(_c(GUI::ThemeEngine::_rendererModes[i].name, "lowres"), GUI::ThemeEngine::_rendererModes[i].mode); + _rendererPopUp->appendEntry(_(GUI::ThemeEngine::_rendererModes[i].shortname), GUI::ThemeEngine::_rendererModes[i].mode); } if (g_system->getOverlayWidth() > 320) diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex 751d75f6bd..77bad8f2a6 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat |