Ticket #9116: translations.patch

configure

@@ -122 +122 @@
 _keymapper=no
 # Default platform settings
 _backend=sdl
+_translation=yes
 _endian=unknown
 _need_memalign=no
 _have_x86=no
@@ -585 +586 @@
   --disable-mt32emu        don't enable the integrated MT-32 emulator
   --disable-hq-scalers     exclude HQ2x and HQ3x scalers
   --disable-scalers        exclude scalers
+  --disable-translation    don't build support for translated messages
 
 Optional Libraries:
   --with-alsa-prefix=DIR   Prefix where alsa is installed (optional)
@@ -661 +663 @@
         --default-dynamic)        _plugins_default=dynamic ;;
         --enable-mt32emu)         _mt32emu=yes    ;;
         --disable-mt32emu)        _mt32emu=no     ;;
+        --enable-translation)     _translation=yes ;;
+        --disable-translation)    _translation=no ;;
         --enable-vkeybd)          _vkeybd=yes     ;;
         --disable-vkeybd)         _vkeybd=no      ;;
         --enable-keymapper)       _keymapper=yes  ;;
@@ -1896 +1900 @@
         _def_fluidsynth='#undef USE_FLUIDSYNTH'
 fi
 echo "$_fluidsynth"
-rm -rf $TMPC $TMPO$HOSTEXEEXT $TMPO.dSYM
 
 #
 # Check for nasm
@@ -1955 +1958 @@
 fi
 
 #
+# Check whether to build translation support
+#
+echo_n "Building translation support... "
+add_to_config_mk_if_yes $_translation 'ENABLE_TRANSLATION = 1'
+add_to_config_h_if_yes $_translation '#define TRANSLATION'
+if test "$_translation" = no ; then
+        echo "no"
+else
+        echo_n "yes ("
+
+        cat > $TMPC << EOF
+#include <locale.h>
+int main(void) { setlocale(LC_ALL, ""); return 0; }
+EOF
+        _detectlang=no
+        cc_check $LDFLAGS $CXXFLAGS && _detectlang=yes
+
+        add_to_config_h_if_yes $_detectlang '#define DETECTLANG'
+        if test "$_detectlang" = yes ; then
+                echo_n "with runtime language detection, "
+
+                cat > $TMPC << EOF
+#include <langinfo.h>
+#include <iconv.h>
+int main(void) { nl_langinfo(CODESET); iconv_open(0, 0); return 0; }
+EOF
+                _termconv=no
+                cc_check $LDFLAGS $CXXFLAGS && _termconv=yes
+                cc_check $LDFLAGS $CXXFLAGS -liconv && LIBS="$LIBS -liconv" && _termconv=yes
+
+                add_to_config_h_if_yes $_termconv '#define TERMCONV'
+                if test "$_termconv" = yes ; then
+                        echo "with terminal conversion)"
+                else
+                        echo "without terminal conversion)"
+                fi
+        else
+                echo "without runtime language detection)"
+        fi
+fi
+rm -rf $TMPC $TMPO$HOSTEXEEXT $TMPO.dSYM
+
+#
 # Figure out installation directories
 #
 test -z "$_bindir" && _bindir="$_prefix/bin"

gui/options.h

@@ -190 +190 @@
         PopUpWidget *_rendererPopUp;
         StaticTextWidget *_autosavePeriodPopUpDesc;
         PopUpWidget *_autosavePeriodPopUp;
+        StaticTextWidget *_guiLanguagePopUpDesc;
+        PopUpWidget *_guiLanguagePopUp;
 };
 
 } // End of namespace GUI

gui/themes/scummclassic/classic_layout.stx

@@ -406 +406 @@
                                                 type = 'PopUp'
                                 />
                         </layout>
+                        <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+                                <widget name = 'GuiLanguagePopupDesc'
+                                                type = 'OptionsLabel'
+                                />
+                                <widget name = 'GuiLanguagePopup'
+                                                type = 'PopUp'
+                                />
+                        </layout>
                         <widget name='KeysButton' 
                                      type='Button' 
                         /> 

gui/themes/scummmodern/scummmodern_layout.stx

@@ -416 +416 @@
                                                 type = 'PopUp'
                                 />
                         </layout>
+                        <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+                                <widget name = 'GuiLanguagePopupDesc'
+                                                type = 'OptionsLabel'
+                                />
+                                <widget name = 'GuiLanguagePopup'
+                                                type = 'PopUp'
+                                />
+                        </layout>
                         <widget name='KeysButton' 
                                      type='Button' 
                         /> 

gui/options.cpp

@@ -35 +35 @@
 #include "common/fs.h"
 #include "common/config-manager.h"
 #include "common/system.h"
+#include "common/translation.h"
 
 #include "graphics/scaler.h"
 
@@ -67 +68 @@
 };
 #endif
 
-static const char *savePeriodLabels[] = { "Never", "every 5 mins", "every 10 mins", "every 15 mins", "every 30 mins", 0 };
+static const char *savePeriodLabels[] = { _s("Never"), _s("every 5 mins"), _s("every 10 mins"), _s("every 15 mins"), _s("every 30 mins"), 0 };
 static const int savePeriodValues[] = { 0, 5 * 60, 10 * 60, 15 * 60, 30 * 60, -1 };
-static const char *outputRateLabels[] = { "<default>", "22 kHz", "8 kHz", "11kHz", "44 kHz", "48 kHz", 0 };
+static const char *outputRateLabels[] = { _s("<default>"), _s("22 kHz"), _s("8 kHz"), _s("11kHz"), _s("44 kHz"), _s("48 kHz"), 0 };
 static const int outputRateValues[] = { 0, 22050, 8000, 11025, 44100, 48000, -1 };
 
 
@@ -85 +86 @@
 }
 
 const char *OptionsDialog::_subModeDesc[] = {
-        "Speech Only",
-        "Speech and Subtitles",
-        "Subtitles Only"
+        _s("Speech Only"),
+        _s("Speech and Subtitles"),
+        _s("Subtitles Only")
 };
 
 const char *OptionsDialog::_lowresSubModeDesc[] = {
-        "Speech Only",
-        "Speech & Subs",
-        "Subtitles Only"
+        _s("Speech Only"),
+        _s("Speech & Subs"),
+        _s("Subtitles Only")
 };
 
 void OptionsDialog::init() {
@@ -222 +223 @@
 
                 String soundFont(ConfMan.get("soundfont", _domain));
                 if (soundFont.empty() || !ConfMan.hasKey("soundfont", _domain)) {
-                        _soundFont->setLabel("None");
+                        _soundFont->setLabel(_("None"));
                         _soundFontClearButton->setEnabled(false);
                 } else {
                         _soundFont->setLabel(soundFont);
@@ -267 +268 @@
                 int speed;              int sliderMaxValue = _subSpeedSlider->getMaxValue();
 
                 _subMode = getSubtitleMode(ConfMan.getBool("subtitles", _domain), ConfMan.getBool("speech_mute", _domain));
-                _subToggleButton->setLabel(_subModeDesc[_subMode]);
+                _subToggleButton->setLabel(_(_subModeDesc[_subMode]));
 
                 // Engines that reuse the subtitle speed widget set their own max value.
                 // Scale the config value accordingly (see addSubtitleControls)
@@ -378 +379 @@
                                 ConfMan.setInt("midi_gain", _midiGainSlider->getValue(), _domain);
 
                                 String soundFont(_soundFont->getLabel());
-                                if (!soundFont.empty() && (soundFont != "None"))
+                                if (!soundFont.empty() && (soundFont != _("None")))
                                         ConfMan.set("soundfont", soundFont, _domain);
                                 else
                                         ConfMan.removeKey("soundfont", _domain);
@@ -465 +466 @@
                 else
                         _subMode = 0;
 
-                _subToggleButton->setLabel(g_system->getOverlayWidth() > 320 ? _subModeDesc[_subMode] : _lowresSubModeDesc[_subMode]);
+                _subToggleButton->setLabel(g_system->getOverlayWidth() > 320 ? _(_subModeDesc[_subMode]) : _(_lowresSubModeDesc[_subMode]));
                 _subToggleButton->draw();
                 _subSpeedDesc->draw();
                 _subSpeedSlider->draw();
@@ -476 +477 @@
                 _subSpeedLabel->draw();
                 break;
         case kClearSoundFontCmd:
-                _soundFont->setLabel("None");
+                _soundFont->setLabel(_("None"));
                 _soundFontClearButton->setEnabled(false);
                 draw();
                 break;
@@ -522 +523 @@
         _soundFontButton->setEnabled(enabled);
         _soundFont->setEnabled(enabled);
 
-        if (enabled && !_soundFont->getLabel().empty() && (_soundFont->getLabel() != "None"))
+        if (enabled && !_soundFont->getLabel().empty() && (_soundFont->getLabel() != _("None")))
                 _soundFontClearButton->setEnabled(enabled);
         else
                 _soundFontClearButton->setEnabled(false);
@@ -591 +592 @@
         const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
 
         // The GFX mode popup
-        _gfxPopUpDesc = new StaticTextWidget(boss, prefix + "grModePopupDesc", "Graphics mode:");
+        _gfxPopUpDesc = new StaticTextWidget(boss, prefix + "grModePopupDesc", _("Graphics mode:"));
         _gfxPopUp = new PopUpWidget(boss, prefix + "grModePopup");
 
-        _gfxPopUp->appendEntry("<default>");
+        _gfxPopUp->appendEntry(_("<default>"));
         _gfxPopUp->appendEntry("");
         while (gm->name) {
-                _gfxPopUp->appendEntry(gm->description, gm->id);
+                _gfxPopUp->appendEntry(_(gm->description), gm->id);
                 gm++;
         }
 
         // RenderMode popup
-        _renderModePopUpDesc = new StaticTextWidget(boss, prefix + "grRenderPopupDesc", "Render mode:");
+        _renderModePopUpDesc = new StaticTextWidget(boss, prefix + "grRenderPopupDesc", _("Render mode:"));
         _renderModePopUp = new PopUpWidget(boss, prefix + "grRenderPopup");
-        _renderModePopUp->appendEntry("<default>", Common::kRenderDefault);
+        _renderModePopUp->appendEntry(_("<default>"), Common::kRenderDefault);
         _renderModePopUp->appendEntry("");
         const Common::RenderModeDescription *rm = Common::g_renderModes;
         for (; rm->code; ++rm) {
-                _renderModePopUp->appendEntry(rm->description, rm->id);
+                _renderModePopUp->appendEntry(_(rm->description), rm->id);
         }
 
         // Fullscreen checkbox
-        _fullscreenCheckbox = new CheckboxWidget(boss, prefix + "grFullscreenCheckbox", "Fullscreen mode", 0, 0);
+        _fullscreenCheckbox = new CheckboxWidget(boss, prefix + "grFullscreenCheckbox", _("Fullscreen mode"), 0, 0);
 
         // Aspect ratio checkbox
-        _aspectCheckbox = new CheckboxWidget(boss, prefix + "grAspectCheckbox", "Aspect ratio correction", 0, 0);
+        _aspectCheckbox = new CheckboxWidget(boss, prefix + "grAspectCheckbox", _("Aspect ratio correction"), 0, 0);
 
         _enableGraphicSettings = true;
 }
 
 void OptionsDialog::addAudioControls(GuiObject *boss, const String &prefix) {
         // The MIDI mode popup & a label
-        _midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", "Music driver:");
+        _midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", _("Music driver:"));
         _midiPopUp = new PopUpWidget(boss, prefix + "auMidiPopup");
 
         // Populate it
@@ -633 +634 @@
         }
 
         // The OPL emulator popup & a label
-        _oplPopUpDesc = new StaticTextWidget(boss, prefix + "auOPLPopupDesc", "AdLib emulator:");
+        _oplPopUpDesc = new StaticTextWidget(boss, prefix + "auOPLPopupDesc", _("AdLib emulator:"));
         _oplPopUp = new PopUpWidget(boss, prefix + "auOPLPopup");
 
         // Populate it
         const OPL::Config::EmulatorDescription *ed = OPL::Config::getAvailable();
         while (ed->name) {
-                _oplPopUp->appendEntry(ed->description, ed->id);
+                _oplPopUp->appendEntry(_(ed->description), ed->id);
                 ++ed;
         }
 
         // Sample rate settings
-        _outputRatePopUpDesc = new StaticTextWidget(boss, prefix + "auSampleRatePopupDesc", "Output rate:");
+        _outputRatePopUpDesc = new StaticTextWidget(boss, prefix + "auSampleRatePopupDesc", _("Output rate:"));
         _outputRatePopUp = new PopUpWidget(boss, prefix + "auSampleRatePopup");
 
         for (int i = 0; outputRateLabels[i]; i++) {
@@ -656 +657 @@
 
 void OptionsDialog::addMIDIControls(GuiObject *boss, const String &prefix) {
         // SoundFont
-        _soundFontButton = new ButtonWidget(boss, prefix + "mcFontButton", "SoundFont:", kChooseSoundFontCmd, 0);
-        _soundFont = new StaticTextWidget(boss, prefix + "mcFontPath", "None");
+        _soundFontButton = new ButtonWidget(boss, prefix + "mcFontButton", _("SoundFont:"), kChooseSoundFontCmd, 0);
+        _soundFont = new StaticTextWidget(boss, prefix + "mcFontPath", _("None"));
         _soundFontClearButton = new ButtonWidget(boss, prefix + "mcFontClearButton", "C", kClearSoundFontCmd, 0);
 
         // Multi midi setting
-        _multiMidiCheckbox = new CheckboxWidget(boss, prefix + "mcMixedCheckbox", "Mixed AdLib/MIDI mode", 0, 0);
+        _multiMidiCheckbox = new CheckboxWidget(boss, prefix + "mcMixedCheckbox", _("Mixed AdLib/MIDI mode"), 0, 0);
 
         // Native mt32 setting
-        _mt32Checkbox = new CheckboxWidget(boss, prefix + "mcMt32Checkbox", "True Roland MT-32 (disable GM emulation)", 0, 0);
+        _mt32Checkbox = new CheckboxWidget(boss, prefix + "mcMt32Checkbox", _("True Roland MT-32 (disable GM emulation)"), 0, 0);
 
         // GS Extensions setting
-        _enableGSCheckbox = new CheckboxWidget(boss, prefix + "mcGSCheckbox", "Enable Roland GS Mode", 0, 0);
+        _enableGSCheckbox = new CheckboxWidget(boss, prefix + "mcGSCheckbox", _("Enable Roland GS Mode"), 0, 0);
 
         // MIDI gain setting (FluidSynth uses this)
-        _midiGainDesc = new StaticTextWidget(boss, prefix + "mcMidiGainText", "MIDI gain:");
+        _midiGainDesc = new StaticTextWidget(boss, prefix + "mcMidiGainText", _("MIDI gain:"));
         _midiGainSlider = new SliderWidget(boss, prefix + "mcMidiGainSlider", kMidiGainChanged);
         _midiGainSlider->setMinValue(0);
         _midiGainSlider->setMaxValue(1000);
@@ -683 +684 @@
 // make use of the widgets. The launcher range is 0-255. SCUMM's 0-9
 void OptionsDialog::addSubtitleControls(GuiObject *boss, const String &prefix, int maxSliderVal) {
 
-        _subToggleDesc = new StaticTextWidget(boss, prefix + "subToggleDesc", "Text and Speech:");
+        _subToggleDesc = new StaticTextWidget(boss, prefix + "subToggleDesc", _("Text and Speech:"));
         _subToggleButton = new ButtonWidget(boss, prefix + "subToggleButton", "", kSubtitleToggle, 0);
 
         // Subtitle speed
-        _subSpeedDesc = new StaticTextWidget(boss, prefix + "subSubtitleSpeedDesc", "Subtitle speed:");
+        _subSpeedDesc = new StaticTextWidget(boss, prefix + "subSubtitleSpeedDesc", _("Subtitle speed:"));
         _subSpeedSlider = new SliderWidget(boss, prefix + "subSubtitleSpeedSlider", kSubtitleSpeedChanged);
         _subSpeedLabel = new StaticTextWidget(boss, prefix + "subSubtitleSpeedLabel", "100%");
         _subSpeedSlider->setMinValue(0); _subSpeedSlider->setMaxValue(maxSliderVal);
@@ -699 +700 @@
 void OptionsDialog::addVolumeControls(GuiObject *boss, const String &prefix) {
 
         // Volume controllers
-        _musicVolumeDesc = new StaticTextWidget(boss, prefix + "vcMusicText", "Music volume:");
+        _musicVolumeDesc = new StaticTextWidget(boss, prefix + "vcMusicText", _("Music volume:"));
         _musicVolumeSlider = new SliderWidget(boss, prefix + "vcMusicSlider", kMusicVolumeChanged);
         _musicVolumeLabel = new StaticTextWidget(boss, prefix + "vcMusicLabel", "100%");
         _musicVolumeSlider->setMinValue(0);
         _musicVolumeSlider->setMaxValue(Audio::Mixer::kMaxMixerVolume);
         _musicVolumeLabel->setFlags(WIDGET_CLEARBG);
 
-        _muteCheckbox = new CheckboxWidget(boss, prefix + "vcMuteCheckbox", "Mute All", kMuteAllChanged, 0);
+        _muteCheckbox = new CheckboxWidget(boss, prefix + "vcMuteCheckbox", _("Mute All"), kMuteAllChanged, 0);
 
 
-        _sfxVolumeDesc = new StaticTextWidget(boss, prefix + "vcSfxText", "SFX volume:");
+        _sfxVolumeDesc = new StaticTextWidget(boss, prefix + "vcSfxText", _("SFX volume:"));
         _sfxVolumeSlider = new SliderWidget(boss, prefix + "vcSfxSlider", kSfxVolumeChanged);
         _sfxVolumeLabel = new StaticTextWidget(boss, prefix + "vcSfxLabel", "100%");
         _sfxVolumeSlider->setMinValue(0);
         _sfxVolumeSlider->setMaxValue(Audio::Mixer::kMaxMixerVolume);
         _sfxVolumeLabel->setFlags(WIDGET_CLEARBG);
 
-        _speechVolumeDesc = new StaticTextWidget(boss, prefix + "vcSpeechText" , "Speech volume:");
+        _speechVolumeDesc = new StaticTextWidget(boss, prefix + "vcSpeechText" , _("Speech volume:"));
         _speechVolumeSlider = new SliderWidget(boss, prefix + "vcSpeechSlider", kSpeechVolumeChanged);
         _speechVolumeLabel = new StaticTextWidget(boss, prefix + "vcSpeechLabel", "100%");
         _speechVolumeSlider->setMinValue(0);
@@ -739 +740 @@
         else if (subtitles && speech_mute) // Subtitles only
                 return 2;
         else
-                warning("Wrong configuration: Both subtitles and speech are off. Assuming subtitles only");
+                warning(_t("Wrong configuration: Both subtitles and speech are off. Assuming subtitles only"));
         return 2;
 }
 
 void OptionsDialog::reflowLayout() {
         if (_graphicsTabId != -1 && _tabWidget)
-                _tabWidget->setTabTitle(_graphicsTabId, g_system->getOverlayWidth() > 320 ? "Graphics" : "GFX");
+                _tabWidget->setTabTitle(_graphicsTabId, g_system->getOverlayWidth() > 320 ? _("Graphics") : _("GFX"));
 
         Dialog::reflowLayout();
 }
@@ -768 +769 @@
         //
         // 2) The audio tab
         //
-        tab->addTab("Audio");
+        tab->addTab(_("Audio"));
         addAudioControls(tab, "GlobalOptions_Audio.");
         addSubtitleControls(tab, "GlobalOptions_Audio.");
 
-        tab->addTab("Volume");
+        tab->addTab(_("Volume"));
         addVolumeControls(tab, "GlobalOptions_Volume.");
 
         // TODO: cd drive setting
@@ -780 +781 @@
         //
         // 3) The MIDI tab
         //
-        tab->addTab("MIDI");
+        tab->addTab(_("MIDI"));
         addMIDIControls(tab, "GlobalOptions_MIDI.");
 
         //
         // 4) The miscellaneous tab
         //
-        tab->addTab("Paths");
+        tab->addTab(_("Paths"));
 
 #if !( defined(__DC__) || defined(__GP32__) )
         // These two buttons have to be extra wide, or the text will be
         // truncated in the small version of the GUI.
 
         // Save game path
-        new ButtonWidget(tab, "GlobalOptions_Paths.SaveButton", "Save Path: ", kChooseSaveDirCmd, 0);
+        new ButtonWidget(tab, "GlobalOptions_Paths.SaveButton", _("Save Path: "), kChooseSaveDirCmd, 0);
         _savePath = new StaticTextWidget(tab, "GlobalOptions_Paths.SavePath", "/foo/bar");
 
-        new ButtonWidget(tab, "GlobalOptions_Paths.ThemeButton", "Theme Path:", kChooseThemeDirCmd, 0);
-        _themePath = new StaticTextWidget(tab, "GlobalOptions_Paths.ThemePath", "None");
+        new ButtonWidget(tab, "GlobalOptions_Paths.ThemeButton", _("Theme Path:"), kChooseThemeDirCmd, 0);
+        _themePath = new StaticTextWidget(tab, "GlobalOptions_Paths.ThemePath", _("None"));
 
-        new ButtonWidget(tab, "GlobalOptions_Paths.ExtraButton", "Extra Path:", kChooseExtraDirCmd, 0);
-        _extraPath = new StaticTextWidget(tab, "GlobalOptions_Paths.ExtraPath", "None");
+        new ButtonWidget(tab, "GlobalOptions_Paths.ExtraButton", _("Extra Path:"), kChooseExtraDirCmd, 0);
+        _extraPath = new StaticTextWidget(tab, "GlobalOptions_Paths.ExtraPath", _("None"));
 
 #ifdef DYNAMIC_MODULES
-        new ButtonWidget(tab, "GlobalOptions_Paths.PluginsButton", "Plugins Path:", kChoosePluginsDirCmd, 0);
+        new ButtonWidget(tab, "GlobalOptions_Paths.PluginsButton", _("Plugins Path:"), kChoosePluginsDirCmd, 0);
         _pluginsPath = new StaticTextWidget(tab, "GlobalOptions_Paths.PluginsPath", "None");
 #endif
 #endif
 
-        tab->addTab("Misc");
+        tab->addTab(_("Misc"));
 
-        new ButtonWidget(tab, "GlobalOptions_Misc.ThemeButton", "Theme:", kChooseThemeCmd, 0);
+        new ButtonWidget(tab, "GlobalOptions_Misc.ThemeButton", _("Theme:"), kChooseThemeCmd, 0);
         _curTheme = new StaticTextWidget(tab, "GlobalOptions_Misc.CurTheme", g_gui.theme()->getThemeName());
 
 
-        _rendererPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.RendererPopupDesc", "GUI Renderer:");
+        _rendererPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.RendererPopupDesc", _("GUI Renderer:"));
         _rendererPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.RendererPopup");
 
         for (uint i = 1; i < GUI::ThemeEngine::_rendererModesSize; ++i)
                 _rendererPopUp->appendEntry(GUI::ThemeEngine::_rendererModes[i].name, GUI::ThemeEngine::_rendererModes[i].mode);
 
-        _autosavePeriodPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.AutosavePeriodPopupDesc", "Autosave:");
+        _autosavePeriodPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.AutosavePeriodPopupDesc", _("Autosave:"));
         _autosavePeriodPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.AutosavePeriodPopup");
 
         for (int i = 0; savePeriodLabels[i]; i++) {
@@ -828 +829 @@
         }
 
 #ifdef SMALL_SCREEN_DEVICE
-        new ButtonWidget(tab, "GlobalOptions_Misc.KeysButton", "Keys", kChooseKeyMappingCmd, 0);
+        new ButtonWidget(tab, "GlobalOptions_Misc.KeysButton", _("Keys"), kChooseKeyMappingCmd, 0);
 #endif
 
+#ifdef TRANSLATION
+        _guiLanguagePopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.GuiLanguagePopupDesc", _("Language:"));
+        _guiLanguagePopUp = new PopUpWidget(tab, "GlobalOptions_Misc.GuiLanguagePopup");
+#ifdef DETECTLANG
+        _guiLanguagePopUp->appendEntry(_("<default>"), 0);
+#endif // DETECTLANG
+        _guiLanguagePopUp->appendEntry(_("English"), 1);
+        _guiLanguagePopUp->appendEntry("", 0);
+        Common::List<String> languages = TransMan.getSupportedLanguages();
+        Common::List<String>::iterator lang = languages.begin();
+        while (lang != languages.end()) {
+                _guiLanguagePopUp->appendEntry(*lang, 2);
+                lang++;
+        }
+#endif // TRANSLATION
+
         // TODO: joystick setting
 
 
@@ -839 +856 @@
         _tabWidget = tab;
 
         // Add OK & Cancel buttons
-        new ButtonWidget(this, "GlobalOptions.Cancel", "Cancel", kCloseCmd, 0);
-        new ButtonWidget(this, "GlobalOptions.Ok", "OK", kOKCmd, 0);
+        new ButtonWidget(this, "GlobalOptions.Cancel", _("Cancel"), kCloseCmd, 0);
+        new ButtonWidget(this, "GlobalOptions.Ok", _("OK"), kOKCmd, 0);
 
 #ifdef SMALL_SCREEN_DEVICE
         _keysDialog = new KeysDialog();
@@ -863 +880 @@
         Common::String extraPath(ConfMan.get("extrapath", _domain));
 
         if (savePath.empty() || !ConfMan.hasKey("savepath", _domain)) {
-                _savePath->setLabel("None");
+                _savePath->setLabel(_("None"));
         } else {
                 _savePath->setLabel(savePath);
         }
 
         if (themePath.empty() || !ConfMan.hasKey("themepath", _domain)) {
-                _themePath->setLabel("None");
+                _themePath->setLabel(_("None"));
         } else {
                 _themePath->setLabel(themePath);
         }
 
         if (extraPath.empty() || !ConfMan.hasKey("extrapath", _domain)) {
-                _extraPath->setLabel("None");
+                _extraPath->setLabel(_("None"));
         } else {
                 _extraPath->setLabel(extraPath);
         }
@@ -883 +900 @@
 #ifdef DYNAMIC_MODULES
         Common::String pluginsPath(ConfMan.get("pluginspath", _domain));
         if (pluginsPath.empty() || !ConfMan.hasKey("pluginspath", _domain)) {
-                _pluginsPath->setLabel("None");
+                _pluginsPath->setLabel(_("None"));
         } else {
                 _pluginsPath->setLabel(pluginsPath);
         }
@@ -907 +924 @@
 void GlobalOptionsDialog::close() {
         if (getResult()) {
                 String savePath(_savePath->getLabel());
-                if (!savePath.empty() && (savePath != "None"))
+                if (!savePath.empty() && (savePath != _("None")))
                         ConfMan.set("savepath", savePath, _domain);
 
                 String themePath(_themePath->getLabel());
-                if (!themePath.empty() && (themePath != "None"))
+                if (!themePath.empty() && (themePath != _("None")))
                         ConfMan.set("themepath", themePath, _domain);
                 else
                         ConfMan.removeKey("themepath", _domain);
 
                 String extraPath(_extraPath->getLabel());
-                if (!extraPath.empty() && (extraPath != "None"))
+                if (!extraPath.empty() && (extraPath != _("None")))
                         ConfMan.set("extrapath", extraPath, _domain);
                 else
                         ConfMan.removeKey("extrapath", _domain);
 
 #ifdef DYNAMIC_MODULES
                 String pluginsPath(_pluginsPath->getLabel());
-                if (!pluginsPath.empty() && (pluginsPath != "None"))
+                if (!pluginsPath.empty() && (pluginsPath != _("None")))
                         ConfMan.set("pluginspath", pluginsPath, _domain);
                 else
                         ConfMan.removeKey("pluginspath", _domain);
@@ -940 +957 @@
                         g_gui.loadNewTheme(g_gui.theme()->getThemeId(), selected);
                         ConfMan.set("gui_renderer", cfg, _domain);
                 }
+#ifdef TRANSLATION
+                String oldLang = ConfMan.get("gui_language");
+                switch (_guiLanguagePopUp->getSelectedTag()) {
+                case 0:
+#ifdef DETECTLANG
+                        // Default
+                        ConfMan.set("gui_language", "", _domain);
+                        break;
+#endif // DETECTLANG
+                case 1:
+                        // English
+                        ConfMan.set("gui_language", "C", _domain);
+                        break;
+                case 2:
+                        // Other language
+                        ConfMan.set("gui_language", _guiLanguagePopUp->getSelectedString(), _domain);
+                        break;
+                }
+                String newLang = ConfMan.get("gui_language").c_str();
+                if (newLang != oldLang) {
+                /*
+                        // Activate the selected language
+                        TransMan.setLanguage(newLang.c_str());
+
+                        // Update widgets' strings
+                        g_gui.updateTranslation(); // TODO: Currently you have to restart.
+                */
+                }
+#endif // TRANSLATION
         }
         OptionsDialog::close();
 }
@@ -947 +993 @@
 void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
         switch (cmd) {
         case kChooseSaveDirCmd: {
-                BrowserDialog browser("Select directory for savegames", true);
+                BrowserDialog browser(_("Select directory for savegames"), true);
                 if (browser.runModal() > 0) {
                         // User made his choice...
                         Common::FSNode dir(browser.getResult());
                         if (dir.isWritable()) {
                                 _savePath->setLabel(dir.getPath());
                         } else {
-                                MessageDialog error("The chosen directory cannot be written to. Please select another one.");
+                                MessageDialog error(_("The chosen directory cannot be written to. Please select another one."));
                                 error.runModal();
                                 return;
                         }
@@ -963 +1009 @@
                 break;
         }
         case kChooseThemeDirCmd: {
-                BrowserDialog browser("Select directory for GUI themes", true);
+                BrowserDialog browser(_("Select directory for GUI themes"), true);
                 if (browser.runModal() > 0) {
                         // User made his choice...
                         Common::FSNode dir(browser.getResult());
@@ -973 +1019 @@
                 break;
         }
         case kChooseExtraDirCmd: {
-                BrowserDialog browser("Select directory for extra files", true);
+                BrowserDialog browser(_("Select directory for extra files"), true);
                 if (browser.runModal() > 0) {
                         // User made his choice...
                         Common::FSNode dir(browser.getResult());
@@ -984 +1030 @@
         }
 #ifdef DYNAMIC_MODULES
         case kChoosePluginsDirCmd: {
-                BrowserDialog browser("Select directory for plugins", true);
+                BrowserDialog browser(_("Select directory for plugins"), true);
                 if (browser.runModal() > 0) {
                         // User made his choice...
                         Common::FSNode dir(browser.getResult());
@@ -995 +1041 @@
         }
 #endif
         case kChooseSoundFontCmd: {
-                BrowserDialog browser("Select SoundFont", false);
+                BrowserDialog browser(_("Select SoundFont"), false);
                 if (browser.runModal() > 0) {
                         // User made his choice...
                         Common::FSNode file(browser.getResult());
                         _soundFont->setLabel(file.getPath());
 
-                        if (!file.getPath().empty() && (file.getPath() != "None"))
+                        if (!file.getPath().empty() && (file.getPath() != _("None")))
                                 _soundFontClearButton->setEnabled(true);
                         else
                                 _soundFontClearButton->setEnabled(false);

gui/GuiManager.cpp

@@ -27 +27 @@
 #include "common/util.h"
 #include "common/config-manager.h"
 #include "common/algorithm.h"
+#include "common/translation.h"
 
 #include "backends/keymapper/keymapper.h"
 
@@ -69 +70 @@
                 // Loading the theme failed, try to load the built-in theme
                 if (!loadNewTheme("builtin", gfxMode)) {
                         // Loading the built-in theme failed as well. Bail out
-                        error("Failed to load any GUI theme, aborting");
+                        error(_t("Failed to load any GUI theme, aborting"));
                 }
         }
 }

common/module.mk

@@ -15 +15 @@
         stream.o \
         util.o \
         system.o \
+        translation.o \
         unarj.o \
         unzip.o \
         xmlparser.o \
         zlib.o
 
+ifdef ENABLE_TRANSLATION
+common/translation.cpp: common/messages.cpp
+
+common/messages.cpp: $(wildcard po/*.po)
+ tools/po2c $^ > common/messages.cpp
+endif
+
 # Include common rules
 include $(srcdir)/rules.mk

Makefile.common

@@ -28 +28 @@
         sound \
         backends \
         common \
+        po
 
 ifdef USE_MT32EMU
 MODULES += sound/softsynth/mt32

base/main.cpp

@@ -44 +44 @@
 #include "common/file.h"
 #include "common/fs.h"
 #include "common/system.h"
+#include "common/translation.h"
 #include "gui/GuiManager.h"
 #include "gui/message.h"
 
@@ -94 +95 @@
         ConfMan.set("gameid", gameid);
 
         // Query the plugins and find one that will handle the specified gameid
-        printf("User picked target '%s' (gameid '%s')...\n", ConfMan.getActiveDomainName().c_str(), gameid.c_str());
-        printf("  Looking for a plugin supporting this gameid... ");
+        printf(_t("User picked target '%s' (gameid '%s')...\n"), ConfMan.getActiveDomainName().c_str(), gameid.c_str());
+        printf(_t("  Looking for a plugin supporting this gameid... "));
         GameDescriptor game = EngineMan.findGame(gameid, &plugin);
 
         if (plugin == 0) {
-                printf("failed\n");
-                warning("%s is an invalid gameid. Use the --list-games option to list supported gameid", gameid.c_str());
+                printf(_t("failed\n"));
+                warning(_t("%s is an invalid gameid. Use the --list-games option to list supported gameid"), gameid.c_str());
                 return 0;
         } else {
                 printf("%s\n", plugin->getName());
         }
 
         // FIXME: Do we really need this one?
-        printf("  Starting '%s'\n", game.description().c_str());
+        printf(_t("  Starting '%s'\n"), game.description().c_str());
 
         return plugin;
 }
@@ -136 +137 @@
                 const char *errMsg = 0;
                 switch (err) {
                 case Common::kInvalidPathError:
-                        errMsg = "Invalid game path";
+                        errMsg = _t("Invalid game path");
                         break;
                 case Common::kNoGameDataFoundError:
-                        errMsg = "Unable to locate game data";
+                        errMsg = _t("Unable to locate game data");
                         break;
                 default:
-                        errMsg = "Unknown error";
+                        errMsg = _t("Unknown error");
                 }
 
-                warning("%s failed to instantiate engine: %s (target '%s', path '%s')",
+                warning(_t("%s failed to instantiate engine: %s (target '%s', path '%s')"),
                         plugin->getName(),
                         errMsg,
                         ConfMan.getActiveDomainName().c_str(),
@@ -321 +322 @@
         // Update the config file
         ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
 
+        // Enable translation
+        TransMan.setLanguage(ConfMan.get("gui_language").c_str());
 
         // Load and setup the debuglevel and the debug flags. We do this at the
         // soonest possible moment to ensure debug output starts early on, if