Ticket #8695: translation-marked-messages2.patch
File translation-marked-messages2.patch, 48.5 KB (added by , 17 years ago) |
---|
-
gui/newgui.cpp
34 34 #include "gui/ThemeClassic.h" 35 35 36 36 #include "common/config-manager.h" 37 #include "common/translation.h" 37 38 38 39 DECLARE_SINGLETON(GUI::NewGui); 39 40 … … 106 107 loadClassicTheme = false; 107 108 } else { 108 109 loadClassicTheme = true; 109 warning( "falling back to classic style");110 warning(_t("falling back to classic style")); 110 111 } 111 112 #endif 112 113 … … 114 115 _theme = new ThemeClassic(_system); 115 116 assert(_theme); 116 117 if (!_theme->init()) { 117 error( "Couldn't initialize classic theme");118 error(_t("Couldn't initialize classic theme")); 118 119 } 119 120 } 120 121 … … 151 152 _theme = new ThemeModern(_system, style, &cfg); 152 153 #endif 153 154 else 154 warning( "Unsupported theme type '%s'", styleType.c_str());155 warning(_t("Unsupported theme type '%s'"), styleType.c_str()); 155 156 } else { 156 warning( "Config '%s' is NOT usable for themes or not found", style.c_str());157 warning(_t("Config '%s' is NOT usable for themes or not found"), style.c_str()); 157 158 } 158 159 } 159 160 cfg.clear(); … … 162 163 return (!oldTheme.empty() ? loadNewTheme(oldTheme) : false); 163 164 164 165 if (!_theme->init()) { 165 warning( "Could not initialize your preferred theme");166 warning(_t("Could not initialize your preferred theme")); 166 167 delete _theme; 167 168 _theme = 0; 168 169 loadNewTheme(oldTheme); -
gui/KeysDialog.h
30 30 #include "gui/dialog.h" 31 31 #include "gui/ListWidget.h" 32 32 #include "common/str.h" 33 #include "common/translation.h" 33 34 34 35 namespace GUI { 35 36 36 37 class KeysDialog : public GUI::Dialog { 37 38 public: 38 KeysDialog(const Common::String &title = "Choose an action to map");39 KeysDialog(const Common::String &title = _("Choose an action to map")); 39 40 40 41 virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data); 41 42 virtual void handleKeyUp(Common::KeyState state); -
gui/themebrowser.cpp
28 28 #include "gui/widget.h" 29 29 #include "gui/theme.h" 30 30 #include "common/fs.h" 31 #include "common/translation.h" 31 32 32 33 #ifdef MACOSX 33 34 #include "CoreFoundation/CoreFoundation.h" … … 48 49 ThemeBrowser::ThemeBrowser() : Dialog("browser") { 49 50 _fileList = 0; 50 51 51 new StaticTextWidget(this, "browser_headline", "Select a Theme");52 new StaticTextWidget(this, "browser_headline", _("Select a Theme")); 52 53 53 54 // Add file list 54 55 _fileList = new ListWidget(this, "browser_list"); … … 58 59 _fileList->setHints(THEME_HINT_PLAIN_COLOR); 59 60 60 61 // Buttons 61 new ButtonWidget(this, "browser_cancel", "Cancel", kCloseCmd, 0);62 new ButtonWidget(this, "browser_choose", "Choose", kChooseCmd, 0);62 new ButtonWidget(this, "browser_cancel", _("Cancel"), kCloseCmd, 0); 63 new ButtonWidget(this, "browser_choose", _("Choose"), kChooseCmd, 0); 63 64 } 64 65 65 66 void ThemeBrowser::open() { -
gui/ThemeModern.cpp
34 34 35 35 #include "common/config-manager.h" 36 36 #include "common/file.h" 37 #include "common/translation.h" 37 38 38 39 #define kShadowTr0 8 39 40 #define kShadowTr1 16 … … 76 77 _configFile = *cfg; 77 78 } else { 78 79 if (!loadConfigFile(stylefile)) { 79 warning( "Can not find theme config file '%s'", (stylefile + ".ini").c_str());80 warning(_t("Can not find theme config file '%s'"), (stylefile + ".ini").c_str()); 80 81 return; 81 82 } 82 83 } … … 87 88 _configFile.getKey("version", "theme", temp); 88 89 if (atoi(temp.c_str()) != THEME_VERSION) { 89 90 // TODO: improve this detection and handle it nicer 90 warning( "Theme config uses a different version (you have: '%s', needed is: '%d')", temp.c_str(), THEME_VERSION);91 warning(_t("Theme config uses a different version (you have: '%s', needed is: '%d')"), temp.c_str(), THEME_VERSION); 91 92 return; 92 93 } 93 94 94 95 temp.clear(); 95 96 _configFile.getKey("type", "theme", temp); 96 97 if (0 != temp.compareToIgnoreCase("modern")) { 97 warning( "Theme config is not for the modern style theme");98 warning(_t("Theme config is not for the modern style theme")); 98 99 return; 99 100 } 100 101 … … 1297 1298 1298 1299 _fonts[style] = loadFont(temp.c_str()); 1299 1300 if (!_fonts[style]) 1300 error( "Couldn't load %s font '%s'", key.c_str(), temp.c_str());1301 error(_t("Couldn't load %s font '%s'"), key.c_str(), temp.c_str()); 1301 1302 1302 1303 FontMan.assignFontToName(name, _fonts[style]); 1303 1304 } -
gui/massadd.cpp
34 34 #include "gui/newgui.h" 35 35 #include "gui/widget.h" 36 36 37 #include "common/translation.h" 37 38 39 38 40 namespace GUI { 39 41 40 42 /* … … 78 80 // - static text displaying the progress text 79 81 // - (future) a listbox showing all the games we added/are going to add 80 82 81 new StaticTextWidget(this, "massadddialog_caption", "Mass Add Dialog");83 new StaticTextWidget(this, "massadddialog_caption", _("Mass Add Dialog")); 82 84 83 85 _dirProgressText = new StaticTextWidget(this, "massadddialog_dirprogress", 84 "... progress ...");86 _("... progress ...")); 85 87 86 88 _gameProgressText = new StaticTextWidget(this, "massadddialog_gameprogress", 87 "... progress ...");89 _("... progress ...")); 88 90 89 _okButton = new ButtonWidget(this, "massadddialog_ok", "OK", kOkCmd, Common::ASCII_RETURN);91 _okButton = new ButtonWidget(this, "massadddialog_ok", _("OK"), kOkCmd, Common::ASCII_RETURN); 90 92 _okButton->setEnabled(false); 91 93 92 new ButtonWidget(this, "massadddialog_cancel", "Cancel", kCancelCmd, Common::ASCII_ESCAPE);94 new ButtonWidget(this, "massadddialog_cancel", _("Cancel"), kCancelCmd, Common::ASCII_ESCAPE); 93 95 94 96 } 95 97 … … 99 101 if (cmd == kOkCmd) { 100 102 // Add all the detected games to the config 101 103 for (GameList::const_iterator iter = _games.begin(); iter != _games.end(); ++iter) { 102 printf( " Added gameid '%s', desc '%s'\n",104 printf(_(" Added gameid '%s', desc '%s'\n"), 103 105 (*iter)["gameid"].c_str(), 104 106 (*iter)["description"].c_str()); 105 107 addGameToConf(*iter); … … 166 168 // Enable the OK button 167 169 _okButton->setEnabled(true); 168 170 169 snprintf(buf, sizeof(buf), "Scan complete!");171 snprintf(buf, sizeof(buf), _("Scan complete!")); 170 172 _dirProgressText->setLabel(buf); 171 173 172 snprintf(buf, sizeof(buf), "Discovered %d games.", _games.size());174 snprintf(buf, sizeof(buf), _("Discovered %d games."), _games.size()); 173 175 _gameProgressText->setLabel(buf); 174 176 175 177 } else { 176 snprintf(buf, sizeof(buf), "Scanned %d directories ...", _dirsScanned);178 snprintf(buf, sizeof(buf), _("Scanned %d directories ..."), _dirsScanned); 177 179 _dirProgressText->setLabel(buf); 178 180 179 snprintf(buf, sizeof(buf), "Discovered %d games ...", _games.size());181 snprintf(buf, sizeof(buf), _("Discovered %d games ..."), _games.size()); 180 182 _gameProgressText->setLabel(buf); 181 183 } 182 184 -
gui/message.h
27 27 28 28 #include "gui/dialog.h" 29 29 #include "common/str.h" 30 #include "common/translation.h" 30 31 31 32 namespace GUI { 32 33 … … 41 42 */ 42 43 class MessageDialog : public Dialog { 43 44 public: 44 MessageDialog(const Common::String &message, const char *defaultButton = "OK", const char *altButton = 0);45 MessageDialog(const Common::String &message, const char *defaultButton = _("OK"), const char *altButton = 0); 45 46 46 47 void handleCommand(CommandSender *sender, uint32 cmd, uint32 data); 47 48 }; -
gui/KeysDialog.cpp
42 42 KeysDialog::KeysDialog(const Common::String &title) 43 43 : GUI::Dialog("keysdialog") { 44 44 45 new ButtonWidget(this, "keysdialog_map", "Map", kMapCmd, 0);46 new ButtonWidget(this, "keysdialog_ok", "OK", kOKCmd, 0);47 new ButtonWidget(this, "keysdialog_cancel", "Cancel", kCloseCmd, 0);45 new ButtonWidget(this, "keysdialog_map", _("Map"), kMapCmd, 0); 46 new ButtonWidget(this, "keysdialog_ok", _("OK"), kOKCmd, 0); 47 new ButtonWidget(this, "keysdialog_cancel", _("Cancel"), kCloseCmd, 0); 48 48 49 49 _actionsList = new ListWidget(this, "keysdialog_list"); 50 50 _actionsList->setNumberingMode(kListNumberingZero); 51 51 52 52 _actionTitle = new StaticTextWidget(this, "keysdialog_action", title); 53 _keyMapping = new StaticTextWidget(this, "keysdialog_mapping", "Select an action and click 'Map'");53 _keyMapping = new StaticTextWidget(this, "keysdialog_mapping", _("Select an action and click 'Map'")); 54 54 55 55 _actionTitle->setFlags(WIDGET_CLEARBG); 56 56 _keyMapping->setFlags(WIDGET_CLEARBG); … … 81 81 key = key - Common::ASCII_F1 + SDLK_F1; 82 82 #endif 83 83 if (key != 0) 84 sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey)key));84 sprintf(selection, _("Associated key : %s"), SDL_GetKeyName((SDLKey)key)); 85 85 else 86 sprintf(selection, "Associated key : none");86 sprintf(selection, _("Associated key : none")); 87 87 88 88 _keyMapping->setLabel(selection); 89 89 _keyMapping->draw(); … … 91 91 break; 92 92 case kMapCmd: 93 93 if (_actionsList->getSelected() < 0) { 94 _actionTitle->setLabel( "Please select an action");94 _actionTitle->setLabel(_("Please select an action")); 95 95 } else { 96 96 char selection[100]; 97 97 … … 103 103 key = key - Common::ASCII_F1 + SDLK_F1; 104 104 #endif 105 105 if (key != 0) 106 sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey)key));106 sprintf(selection, _("Associated key : %s"), SDL_GetKeyName((SDLKey)key)); 107 107 else 108 sprintf(selection, "Associated key : none");108 sprintf(selection, _("Associated key : none")); 109 109 110 _actionTitle->setLabel( "Press the key to associate");110 _actionTitle->setLabel(_("Press the key to associate")); 111 111 _keyMapping->setLabel(selection); 112 112 _keyMapping->draw(); 113 113 Actions::Instance()->beginMapping(true); … … 142 142 Actions::Instance()->setMapping((ActionType)_actionSelected, state.ascii); 143 143 144 144 if (state.ascii != 0) 145 sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey) state.keycode));145 sprintf(selection, _("Associated key : %s"), SDL_GetKeyName((SDLKey) state.keycode)); 146 146 else 147 sprintf(selection, "Associated key : none");147 sprintf(selection, _("Associated key : none")); 148 148 149 _actionTitle->setLabel( "Choose an action to map");149 _actionTitle->setLabel(_("Choose an action to map")); 150 150 _keyMapping->setLabel(selection); 151 151 _keyMapping->draw(); 152 152 _actionTitle->draw(); -
gui/launcher.cpp
34 34 #include "common/fs.h" 35 35 #include "common/util.h" 36 36 #include "common/system.h" 37 #include "common/translation.h" 37 38 38 39 #include "gui/about.h" 39 40 #include "gui/browser.h" … … 168 169 // 169 170 // 1) The game tab 170 171 // 171 tab->addTab( "Game");172 tab->addTab(_("Game")); 172 173 173 174 // GUI: Label & edit widget for the game ID 174 new StaticTextWidget(tab, "gameoptions_id", "ID:");175 new StaticTextWidget(tab, "gameoptions_id", _("ID:")); 175 176 _domainWidget = new DomainEditTextWidget(tab, "gameoptions_domain", _domain); 176 177 177 178 // GUI: Label & edit widget for the description 178 new StaticTextWidget(tab, "gameoptions_name", "Name:");179 new StaticTextWidget(tab, "gameoptions_name", _("Name:")); 179 180 _descriptionWidget = new EditTextWidget(tab, "gameoptions_desc", description); 180 181 181 182 // Language popup 182 _langPopUp = new PopUpWidget(tab, "gameoptions_lang", "Language:", labelWidth);183 _langPopUp->appendEntry( "<default>");183 _langPopUp = new PopUpWidget(tab, "gameoptions_lang", _("Language:"), labelWidth); 184 _langPopUp->appendEntry(_("<default>")); 184 185 _langPopUp->appendEntry(""); 185 186 const Common::LanguageDescription *l = Common::g_languages; 186 187 for (; l->code; ++l) { 187 _langPopUp->appendEntry( l->description, l->id);188 _langPopUp->appendEntry(_(l->description), l->id); 188 189 } 189 190 190 191 // Platform popup 191 _platformPopUp = new PopUpWidget(tab, "gameoptions_platform", "Platform:", labelWidth);192 _platformPopUp->appendEntry( "<default>");192 _platformPopUp = new PopUpWidget(tab, "gameoptions_platform", _("Platform:"), labelWidth); 193 _platformPopUp->appendEntry(_("<default>")); 193 194 _platformPopUp->appendEntry(""); 194 195 const Common::PlatformDescription *p = Common::g_platforms; 195 196 for (; p->code; ++p) { 196 _platformPopUp->appendEntry( p->description, p->id);197 _platformPopUp->appendEntry(_(p->description), p->id); 197 198 } 198 199 199 200 // 200 201 // 3) The graphics tab 201 202 // 202 tab->addTab( "Graphics");203 tab->addTab(_("Graphics")); 203 204 204 _globalGraphicsOverride = new CheckboxWidget(tab, "gameoptions_graphicsCheckbox", "Override global graphic settings", kCmdGlobalGraphicsOverride, 0);205 _globalGraphicsOverride = new CheckboxWidget(tab, "gameoptions_graphicsCheckbox", _("Override global graphic settings"), kCmdGlobalGraphicsOverride, 0); 205 206 206 207 addGraphicControls(tab, "gameoptions_"); 207 208 208 209 // 209 210 // 4) The audio tab 210 211 // 211 tab->addTab( "Audio");212 tab->addTab(_("Audio")); 212 213 213 _globalAudioOverride = new CheckboxWidget(tab, "gameoptions_audioCheckbox", "Override global audio settings", kCmdGlobalAudioOverride, 0);214 _globalAudioOverride = new CheckboxWidget(tab, "gameoptions_audioCheckbox", _("Override global audio settings"), kCmdGlobalAudioOverride, 0); 214 215 215 216 addAudioControls(tab, "gameoptions_"); 216 217 addSubtitleControls(tab, "gameoptions_"); … … 218 219 // 219 220 // 5) The volume tab 220 221 // 221 tab->addTab( "Volume");222 tab->addTab(_("Volume")); 222 223 223 _globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0);224 _globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", _("Override global volume settings"), kCmdGlobalVolumeOverride, 0); 224 225 225 226 addVolumeControls(tab, "gameoptions_"); 226 227 227 228 // 228 229 // 6) The MIDI tab 229 230 // 230 tab->addTab( "MIDI");231 tab->addTab(_("MIDI")); 231 232 232 _globalMIDIOverride = new CheckboxWidget(tab, "gameoptions_midiCheckbox", "Override global MIDI settings", kCmdGlobalMIDIOverride, 0);233 _globalMIDIOverride = new CheckboxWidget(tab, "gameoptions_midiCheckbox", _("Override global MIDI settings"), kCmdGlobalMIDIOverride, 0); 233 234 234 235 addMIDIControls(tab, "gameoptions_"); 235 236 236 237 // 237 238 // 2) The 'Path' tab 238 239 // 239 tab->addTab( "Paths");240 tab->addTab(_("Paths")); 240 241 241 242 // These buttons have to be extra wide, or the text will be truncated 242 243 // in the small version of the GUI. 243 244 244 245 // GUI: Button + Label for the game path 245 new ButtonWidget(tab, "gameoptions_gamepath", "Game Path:", kCmdGameBrowser, 0);246 new ButtonWidget(tab, "gameoptions_gamepath", _("Game Path:"), kCmdGameBrowser, 0); 246 247 _gamePathWidget = new StaticTextWidget(tab, "gameoptions_gamepathText", gamePath); 247 248 248 249 // GUI: Button + Label for the additional path 249 new ButtonWidget(tab, "gameoptions_extrapath", "Extra Path:", kCmdExtraBrowser, 0);250 new ButtonWidget(tab, "gameoptions_extrapath", _("Extra Path:"), kCmdExtraBrowser, 0); 250 251 _extraPathWidget = new StaticTextWidget(tab, "gameoptions_extrapathText", extraPath); 251 252 if (extraPath.empty() || !ConfMan.hasKey("extrapath", _domain)) { 252 _extraPathWidget->setLabel( "None");253 _extraPathWidget->setLabel(_("None")); 253 254 } 254 255 255 256 // GUI: Button + Label for the save path 256 new ButtonWidget(tab, "gameoptions_savepath", "Save Path:", kCmdSaveBrowser, 0);257 new ButtonWidget(tab, "gameoptions_savepath", _("Save Path:"), kCmdSaveBrowser, 0); 257 258 _savePathWidget = new StaticTextWidget(tab, "gameoptions_savepathText", savePath); 258 259 if (savePath.empty() || !ConfMan.hasKey("savepath", _domain)) { 259 _savePathWidget->setLabel( "Default");260 _savePathWidget->setLabel(_("Default")); 260 261 } 261 262 262 263 // Activate the first tab 263 264 tab->setActiveTab(0); 264 265 265 266 // Add OK & Cancel buttons 266 new ButtonWidget(this, "gameoptions_cancel", "Cancel", kCloseCmd, 0);267 new ButtonWidget(this, "gameoptions_ok", "OK", kOKCmd, 0);267 new ButtonWidget(this, "gameoptions_cancel", _("Cancel"), kCloseCmd, 0); 268 new ButtonWidget(this, "gameoptions_ok", _("OK"), kOKCmd, 0); 268 269 } 269 270 270 271 void EditGameDialog::reflowLayout() { … … 351 352 ConfMan.set("path", gamePath, _domain); 352 353 353 354 String extraPath(_extraPathWidget->getLabel()); 354 if (!extraPath.empty() && (extraPath != "None"))355 if (!extraPath.empty() && (extraPath != _("None"))) 355 356 ConfMan.set("extrapath", extraPath, _domain); 356 357 357 358 String savePath(_savePathWidget->getLabel()); 358 if (!savePath.empty() && (savePath != "Default"))359 if (!savePath.empty() && (savePath != _("Default"))) 359 360 ConfMan.set("savepath", savePath, _domain); 360 361 361 362 Common::Platform platform = (Common::Platform)_platformPopUp->getSelectedTag(); … … 389 390 draw(); 390 391 break; 391 392 case kCmdChooseSoundFontCmd: { 392 BrowserDialog browser( "Select SoundFont", false);393 BrowserDialog browser(_("Select SoundFont"), false); 393 394 394 395 if (browser.runModal() > 0) { 395 396 // User made this choice... 396 397 FilesystemNode file(browser.getResult()); 397 398 _soundFont->setLabel(file.path()); 398 399 399 if (!file.path().empty() && (file.path() != "None"))400 if (!file.path().empty() && (file.path() != _("None"))) 400 401 _soundFontClearButton->setEnabled(true); 401 402 else 402 403 _soundFontClearButton->setEnabled(false); … … 408 409 409 410 // Change path for the game 410 411 case kCmdGameBrowser: { 411 BrowserDialog browser( "Select directory with game data", true);412 BrowserDialog browser(_("Select directory with game data"), true); 412 413 if (browser.runModal() > 0) { 413 414 // User made his choice... 414 415 FilesystemNode dir(browser.getResult()); … … 426 427 427 428 // Change path for extra game data (eg, using sword cutscenes when playing via CD) 428 429 case kCmdExtraBrowser: { 429 BrowserDialog browser( "Select additional game directory", true);430 BrowserDialog browser(_("Select additional game directory"), true); 430 431 if (browser.runModal() > 0) { 431 432 // User made his choice... 432 433 FilesystemNode dir(browser.getResult()); … … 438 439 } 439 440 // Change path for stored save game (perm and temp) data 440 441 case kCmdSaveBrowser: { 441 BrowserDialog browser( "Select directory for saved games", true);442 BrowserDialog browser(_("Select directory for saved games"), true); 442 443 if (browser.runModal() > 0) { 443 444 // User made his choice... 444 445 FilesystemNode dir(browser.getResult()); … … 454 455 String newDomain(_domainWidget->getEditString()); 455 456 if (newDomain != _domain) { 456 457 if (newDomain.empty() || ConfMan.hasGameDomain(newDomain)) { 457 MessageDialog alert( "This game ID is already taken. Please choose another one.");458 MessageDialog alert(_("This game ID is already taken. Please choose another one.")); 458 459 alert.runModal(); 459 460 return; 460 461 } … … 496 497 new StaticTextWidget(this, "launcher_version", gScummVMFullVersion); 497 498 #endif 498 499 499 new ButtonWidget(this, "launcher_quit_button", "Quit", kQuitCmd, 'Q');500 new ButtonWidget(this, "launcher_about_button", "About", kAboutCmd, 'B');501 new ButtonWidget(this, "launcher_options_button", "Options", kOptionsCmd, 'O');500 new ButtonWidget(this, "launcher_quit_button", _("Quit"), kQuitCmd, 'Q'); 501 new ButtonWidget(this, "launcher_about_button", _("About"), kAboutCmd, 'B'); 502 new ButtonWidget(this, "launcher_options_button", _("Options"), kOptionsCmd, 'O'); 502 503 _startButton = 503 new ButtonWidget(this, "launcher_start_button", "Start", kStartCmd, 'S');504 new ButtonWidget(this, "launcher_start_button", _("Start"), kStartCmd, 'S'); 504 505 505 506 // Above the lowest button rows: two more buttons (directly below the list box) 506 507 _addButton = 507 new ButtonWidget(this, "launcher_addGame_button", "Add Game...", kAddGameCmd, 'A');508 new ButtonWidget(this, "launcher_addGame_button", _("Add Game..."), kAddGameCmd, 'A'); 508 509 _editButton = 509 new ButtonWidget(this, "launcher_editGame_button", "Edit Game...", kEditGameCmd, 'E');510 new ButtonWidget(this, "launcher_editGame_button", _("Edit Game..."), kEditGameCmd, 'E'); 510 511 _removeButton = 511 new ButtonWidget(this, "launcher_removeGame_button", "Remove Game", kRemoveGameCmd, 'R');512 new ButtonWidget(this, "launcher_removeGame_button", _("Remove Game"), kRemoveGameCmd, 'R'); 512 513 513 514 514 515 // Add list with game titles … … 528 529 updateButtons(); 529 530 530 531 // Create file browser dialog 531 _browser = new BrowserDialog( "Select directory with game data", true);532 _browser = new BrowserDialog(_("Select directory with game data"), true); 532 533 } 533 534 534 535 void LauncherDialog::selectGame(const String &name) { … … 626 627 bool massAdd = (modifiers & Common::KBD_SHIFT) != 0; 627 628 628 629 if (massAdd) { 629 MessageDialog alert( "Do you really want to run the mass game detector? "630 "This could potentially add a huge number of games." , "Yes", "No");630 MessageDialog alert(_("Do you really want to run the mass game detector? " 631 "This could potentially add a huge number of games."), _("Yes"), _("No")); 631 632 if (alert.runModal() == GUI::kMessageOK && _browser->runModal() > 0) { 632 633 MassAddDialog massAddDlg(_browser->getResult()); 633 634 massAddDlg.runModal(); … … 666 667 int idx; 667 668 if (candidates.empty()) { 668 669 // No game was found in the specified directory 669 MessageDialog alert( "ScummVM could not find any game in the specified directory!");670 MessageDialog alert(_("ScummVM could not find any game in the specified directory!")); 670 671 alert.runModal(); 671 672 idx = -1; 672 673 } else if (candidates.size() == 1) { … … 678 679 for (idx = 0; idx < (int)candidates.size(); idx++) 679 680 list.push_back(candidates[idx].description()); 680 681 681 ChooserDialog dialog( "Pick the game:");682 ChooserDialog dialog(_("Pick the game:")); 682 683 dialog.setList(list); 683 684 idx = dialog.runModal(); 684 685 } … … 758 759 } 759 760 760 761 void LauncherDialog::removeGame(int item) { 761 MessageDialog alert( "Do you really want to remove this game configuration?", "Yes", "No");762 MessageDialog alert(_("Do you really want to remove this game configuration?"), _("Yes"), _("No")); 762 763 763 764 if (alert.runModal() == GUI::kMessageOK) { 764 765 // Remove the currently selected game from the list … … 870 871 // Update the label of the "Add" button depending on whether shift is pressed or not 871 872 int modifiers = g_system->getEventManager()->getModifierState(); 872 873 const char *newAddButtonLabel = ((modifiers & Common::KBD_SHIFT) != 0) 873 ? "Mass Add..."874 : "Add Game...";874 ? _("Mass Add...") 875 : _("Add Game..."); 875 876 876 877 if (_addButton->getLabel() != newAddButtonLabel) { 877 878 _addButton->setLabel(newAddButtonLabel); -
gui/chooser.cpp
27 27 #include "gui/chooser.h" 28 28 #include "gui/newgui.h" 29 29 #include "gui/ListWidget.h" 30 #include "common/translation.h" 30 31 31 32 namespace GUI { 32 33 … … 47 48 _list->setNumberingMode(kListNumberingOff); 48 49 49 50 // Buttons 50 new ButtonWidget(this, prefix + "chooser_cancel", "Cancel", kCloseCmd, 0);51 new ButtonWidget(this, prefix + "chooser_cancel", _("Cancel"), kCloseCmd, 0); 51 52 _chooseButton = new ButtonWidget(this, prefix + "chooser_ok", buttonLabel, kChooseCmd, 0); 52 53 _chooseButton->setEnabled(false); 53 54 } -
gui/ThemeClassic.cpp
24 24 25 25 #include "gui/ThemeClassic.h" 26 26 #include "gui/eval.h" 27 #include "common/translation.h" 27 28 28 29 namespace GUI { 29 30 ThemeClassic::ThemeClassic(OSystem *system, const Common::String &config, const Common::ConfigFile *cfg) : Theme() { … … 663 664 _configFile.getKey("version", "theme", temp); 664 665 if (atoi(temp.c_str()) != THEME_VERSION) { 665 666 // TODO: improve this detection and handle it nicer 666 warning( "Theme config uses a different version (you have: '%s', needed is: '%d')", temp.c_str(), THEME_VERSION);667 warning(_t("Theme config uses a different version (you have: '%s', needed is: '%d')"), temp.c_str(), THEME_VERSION); 667 668 _configFile.clear(); 668 669 669 670 // force a theme reload here … … 674 675 temp.clear(); 675 676 _configFile.getKey("type", "theme", temp); 676 677 if (0 != temp.compareToIgnoreCase("classic")) { 677 warning( "Theme config is not for the classic style theme");678 warning(_t("Theme config is not for the classic style theme")); 678 679 _configFile.clear(); 679 680 680 681 // force a theme reload here -
gui/browser.cpp
31 31 #include "common/fs.h" 32 32 #include "common/system.h" 33 33 #include "common/algorithm.h" 34 #include "common/translation.h" 34 35 35 36 namespace GUI { 36 37 … … 155 156 _fileList->setHints(THEME_HINT_PLAIN_COLOR); 156 157 157 158 // Buttons 158 new ButtonWidget(this, "browser_up", "Go up", kGoUpCmd, 0);159 new ButtonWidget(this, "browser_cancel", "Cancel", kCloseCmd, 0);160 new ButtonWidget(this, "browser_choose", "Choose", kChooseCmd, 0);159 new ButtonWidget(this, "browser_up", _("Go up"), kGoUpCmd, 0); 160 new ButtonWidget(this, "browser_cancel", _("Cancel"), kCloseCmd, 0); 161 new ButtonWidget(this, "browser_choose", _("Choose"), kChooseCmd, 0); 161 162 } 162 163 163 164 void BrowserDialog::open() { -
gui/debugger.cpp
26 26 #include "common/stdafx.h" 27 27 28 28 #include "common/system.h" 29 #include "common/translation.h" 29 30 30 31 #include "gui/debugger.h" 31 32 #if USE_CONSOLE … … 123 124 void Debugger::enter() { 124 125 #if USE_CONSOLE 125 126 if (_firstTime) { 126 DebugPrintf( "Debugger started, type 'exit' to return to the game.\n");127 DebugPrintf( "Type 'help' to see a little list of commands and variables.\n");127 DebugPrintf(_("Debugger started, type 'exit' to return to the game.\n")); 128 DebugPrintf(_("Type 'help' to see a little list of commands and variables.\n")); 128 129 _firstTime = false; 129 130 } 130 131 131 132 if (_errStr) { 132 DebugPrintf( "ERROR: %s\n\n", _errStr);133 DebugPrintf(_("ERROR: %s\n\n"), _errStr); 133 134 free(_errStr); 134 135 _errStr = NULL; 135 136 } … … 146 147 // and tab completion of the console. It would still require a lot of 147 148 // work, but at least no dependency on a 3rd party library... 148 149 149 printf( "Debugger entered, please switch to this console for input.\n");150 printf(_t("Debugger entered, please switch to this console for input.\n")); 150 151 151 152 int i; 152 153 char buf[256]; -
common/advancedDetector.cpp
33 33 #include "common/md5.h" 34 34 #include "common/advancedDetector.h" 35 35 #include "common/config-manager.h" 36 #include "common/translation.h" 36 37 37 38 namespace Common { 38 39 … … 66 67 } 67 68 g++; 68 69 } 69 error( "Engine %s doesn't have its singleid specified in ids list", params.singleid);70 error(_t("Engine %s doesn't have its singleid specified in ids list"), params.singleid); 70 71 } 71 72 72 73 return GameList(params.list); … … 86 87 if (o->platform != Common::kPlatformUnknown) 87 88 ConfMan.set("platform", Common::getPlatformCode(o->platform)); 88 89 89 warning( "Target upgraded from %s to %s", o->from, o->to);90 warning(_t("Target upgraded from %s to %s"), o->from, o->to); 90 91 91 92 if (ConfMan.hasKey("id_came_from_command_line")) { 92 warning( "Target came from command line. Skipping save");93 warning(_t("Target came from command line. Skipping save")); 93 94 } else { 94 95 ConfMan.flushToDisk(); 95 96 } … … 116 117 if (0 == scumm_stricmp(gameid, o->from)) { 117 118 g = findPlainGameDescriptor(o->to, list); 118 119 if (g && g->description) 119 return GameDescriptor(gameid, "Obsolete game ID (" + Common::String(g->description) + ")"); 120 return GameDescriptor(gameid, _t("Obsolete game ID") 121 + Common::String(" (") + Common::String(g->description) + ")"); 120 122 else 121 return GameDescriptor(gameid, "Obsolete game ID");123 return GameDescriptor(gameid, _t("Obsolete game ID")); 122 124 } 123 125 o++; 124 126 } … … 468 470 // 469 471 // Might also be helpful to display the full path (for when this is used 470 472 // from the mass detector). 471 printf( "Your game version appears to be unknown. Please, report the following\n");472 printf("data to the ScummVM team along with name of the game you tried to add\n");473 printf("and its version/language/etc.:\n");473 printf(_t("Your game version appears to be unknown. Please, report the following\n" 474 "data to the ScummVM team along with name of the game you tried to add\n" 475 "and its version/language/etc.:\n")); 474 476 475 477 for (StringMap::const_iterator file = filesMD5.begin(); file != filesMD5.end(); ++file) 476 478 printf(" \"%s\", \"%s\", %d\n", file->_key.c_str(), file->_value.c_str(), filesSize[file->_key]); … … 545 547 if (matchedDesc) { // We got a match 546 548 matched.push_back(matchedDesc); 547 549 if (params.flags & kADFlagPrintWarningOnFileBasedFallback) { 548 printf( "Your game version has been detected using filename matching as a\n");549 printf("variant of %s.\n", matchedDesc->gameid);550 printf( "If this is an original and unmodified version, please report any\n");551 printf("information previously printed by ScummVM to the team.\n");550 printf(_t("Your game version has been detected using filename matching as a\n" 551 "variant of %s.\n"), matchedDesc->gameid); 552 printf(_t("If this is an original and unmodified version, please report any\n" 553 "information previously printed by ScummVM to the team.\n")); 552 554 } 553 555 } 554 556 } -
common/config-manager.cpp
34 34 #include "common/config-manager.h" 35 35 #include "common/file.h" 36 36 #include "common/util.h" 37 #include "common/translation.h" 37 38 38 39 DECLARE_SINGLETON(Common::ConfigManager); 39 40 … … 120 121 GetWindowsDirectory(oldConfigFile, MAXPATHLEN); 121 122 strcat(oldConfigFile, "\\" DEFAULT_CONFIG_FILE); 122 123 if (fopen(oldConfigFile, "r")) { 123 printf("The default location of the config file (scummvm.ini) in ScummVM has changed,\n" );124 printf("under Windows NT4/2000/XP/Vista. You may want to consider moving your config\n");125 printf("file from the old default location:\n");126 printf("%s\n", oldConfigFile);127 printf("to the new default location:\n");128 printf("%s\n\n", configFile);124 printf("The default location of the config file (scummvm.ini) in ScummVM has changed,\n" 125 "under Windows NT4/2000/XP/Vista. You may want to consider moving your config\n" 126 "file from the old default location:\n" 127 "%s\n" 128 "to the new default location:\n" 129 "%s\n\n", oldConfigFile, configFile); 129 130 strcpy(configFile, oldConfigFile); 130 131 } 131 132 } … … 161 162 _filename = filename; 162 163 _domainSaveOrder.clear(); 163 164 loadFile(_filename); 164 printf( "Using configuration file: %s\n", _filename.c_str());165 printf(_t("Using configuration file: %s\n"), _filename.c_str()); 165 166 } 166 167 167 168 void ConfigManager::loadFile(const String &filename) { 168 169 File cfg_file; 169 170 170 171 if (!cfg_file.open(filename)) { 171 printf( "Creating configuration file: %s\n", filename.c_str());172 printf(_t("Creating configuration file: %s\n"), filename.c_str()); 172 173 } else { 173 174 char buf[MAXLINELEN]; 174 175 String domain; … … 262 263 // return; 263 264 264 265 if (!cfg_file.open(_filename, File::kFileWriteMode)) { 265 warning( "Unable to write configuration file: %s", _filename.c_str());266 warning(_t("Unable to write configuration file: %s"), _filename.c_str()); 266 267 } else { 267 268 268 269 // First write the domains in _domainSaveOrder, in that order. -
common/util.cpp
27 27 #include "common/util.h" 28 28 #include "common/system.h" 29 29 #include "gui/debugger.h" 30 #include "common/translation.h" 30 31 31 32 #ifdef _WIN32_WCE 32 33 // This is required for the debugger attachment … … 147 148 148 149 149 150 const LanguageDescription g_languages[] = { 150 {"zh", "Chinese (Taiwan)", ZH_TWN},151 {"cz", "Czech", CZ_CZE},152 {"nl", "Dutch", NL_NLD},153 {"en", "English", EN_ANY}, // Generic English (when only one game version exist)154 {"gb", "English (GB)", EN_GRB},155 {"us", "English (US)", EN_USA},156 {"fr", "French", FR_FRA},157 {"de", "German", DE_DEU},158 {"hb", "Hebrew", HB_ISR},159 {"it", "Italian", IT_ITA},160 {"jp", "Japanese", JA_JPN},161 {"kr", "Korean", KO_KOR},162 {"nb", "Norwegian Bokm\xE5l", NB_NOR},163 {"pl", "Polish", PL_POL},164 {"br", "Portuguese", PT_BRA},165 {"ru", "Russian", RU_RUS},166 {"es", "Spanish", ES_ESP},167 {"se", "Swedish", SE_SWE},151 {"zh", _s("Chinese (Taiwan)"), ZH_TWN}, 152 {"cz", _s("Czech"), CZ_CZE}, 153 {"nl", _s("Dutch"), NL_NLD}, 154 {"en", _s("English"), EN_ANY}, // Generic English (when only one game version exist) 155 {"gb", _s("English (GB)"), EN_GRB}, 156 {"us", _s("English (US)"), EN_USA}, 157 {"fr", _s("French"), FR_FRA}, 158 {"de", _s("German"), DE_DEU}, 159 {"hb", _s("Hebrew"), HB_ISR}, 160 {"it", _s("Italian"), IT_ITA}, 161 {"jp", _s("Japanese"), JA_JPN}, 162 {"kr", _s("Korean"), KO_KOR}, 163 {"nb", _s("Norwegian Bokm\xE5l"), NB_NOR}, 164 {"pl", _s("Polish"), PL_POL}, 165 {"br", _s("Portuguese"), PT_BRA}, 166 {"ru", _s("Russian"), RU_RUS}, 167 {"es", _s("Spanish"), ES_ESP}, 168 {"se", _s("Swedish"), SE_SWE}, 168 169 {0, 0, UNK_LANG} 169 170 }; 170 171 … … 205 206 206 207 207 208 const PlatformDescription g_platforms[] = { 208 {"2gs", "2gs", "2gs", "Apple IIgs", kPlatformApple2GS },209 {"3do", "3do", "3do", "3DO", kPlatform3DO},210 {"acorn", "acorn", "acorn", "Acorn", kPlatformAcorn},211 {"amiga", "ami", "amiga", "Amiga", kPlatformAmiga},212 {"atari", "atari-st", "st", "Atari ST", kPlatformAtariST},213 {"c64", "c64", "c64", "Commodore 64", kPlatformC64},214 {"pc", "dos", "ibm", "DOS", kPlatformPC},209 {"2gs", "2gs", "2gs", _s("Apple IIgs"), kPlatformApple2GS }, 210 {"3do", "3do", "3do", _s("3DO"), kPlatform3DO}, 211 {"acorn", "acorn", "acorn", _s("Acorn"), kPlatformAcorn}, 212 {"amiga", "ami", "amiga", _s("Amiga"), kPlatformAmiga}, 213 {"atari", "atari-st", "st", _s("Atari ST"), kPlatformAtariST}, 214 {"c64", "c64", "c64", _s("Commodore 64"), kPlatformC64}, 215 {"pc", "dos", "ibm", _s("DOS"), kPlatformPC}, 215 216 216 217 // The 'official' spelling seems to be "FM-TOWNS" (e.g. in the Indy4 demo). 217 218 // However, on the net many variations can be seen, like "FMTOWNS", 218 219 // "FM TOWNS", "FmTowns", etc. 219 {"fmtowns", "towns", "fm", "FM-TOWNS", kPlatformFMTowns},220 {"fmtowns", "towns", "fm", _s("FM-TOWNS"), kPlatformFMTowns}, 220 221 221 {"linux", "linux", "linux", "Linux", kPlatformLinux},222 {"macintosh", "mac", "mac", "Macintosh", kPlatformMacintosh},223 {"pce", "pce", "pce", "PC-Engine", kPlatformPCEngine },224 {"nes", "nes", "nes", "NES", kPlatformNES},225 {"segacd", "segacd", "sega", "SegaCD", kPlatformSegaCD},226 {"windows", "win", "win", "Windows", kPlatformWindows},222 {"linux", "linux", "linux", _s("Linux"), kPlatformLinux}, 223 {"macintosh", "mac", "mac", _s("Macintosh"), kPlatformMacintosh}, 224 {"pce", "pce", "pce", _s("PC-Engine"), kPlatformPCEngine }, 225 {"nes", "nes", "nes", _s("NES"), kPlatformNES}, 226 {"segacd", "segacd", "sega", _s("SegaCD"), kPlatformSegaCD}, 227 {"windows", "win", "win", _s("Windows"), kPlatformWindows}, 227 228 228 229 229 230 {0, 0, 0, "Default", kPlatformUnknown} … … 286 287 287 288 288 289 const RenderModeDescription g_renderModes[] = { 289 {"hercGreen", "Hercules Green", kRenderHercG},290 {"hercAmber", "Hercules Amber", kRenderHercA},291 {"cga", "CGA", kRenderCGA},292 {"ega", "EGA", kRenderEGA},293 {"amiga", "Amiga", kRenderAmiga},290 {"hercGreen", _s("Hercules Green"), kRenderHercG}, 291 {"hercAmber", _s("Hercules Amber"), kRenderHercA}, 292 {"cga", _s("CGA"), kRenderCGA}, 293 {"ega", _s("EGA"), kRenderEGA}, 294 {"amiga", _s("Amiga"), kRenderAmiga}, 294 295 {0, 0, kRenderDefault} 295 296 }; 296 297 … … 512 513 513 514 // Print the error message to stderr 514 515 #ifdef __GP32__ 515 printf( "ERROR: %s\n", buf_output);516 printf(_t("ERROR: %s\n"), buf_output); 516 517 #else 517 518 fprintf(stderr, "%s!\n", buf_output); 518 519 #endif … … 575 576 va_end(va); 576 577 577 578 #ifdef __GP32__ //ph0x FIXME: implement fprint? 578 printf( "WARNING: %s\n", buf);579 printf(_t("WARNING: %s\n"), buf); 579 580 #else 580 581 #if !defined (__SYMBIAN32__) 581 fprintf(stderr, "WARNING: %s!\n", buf);582 fprintf(stderr, _t("WARNING: %s!\n"), buf); 582 583 #endif 583 584 #endif 584 585 #if defined( USE_WINDBG ) -
sound/mididrv.cpp
30 30 #include "common/str.h" 31 31 #include "common/system.h" 32 32 #include "common/util.h" 33 #include "common/translation.h" 33 34 #include "sound/mididrv.h" 34 35 35 36 /** Internal list of all available 'midi' drivers. */ … … 37 38 38 39 // The flags for the "auto" & "null" drivers indicate that they are anything 39 40 // you want it to be. 40 {"auto", "<default>", MD_AUTO, MDT_MIDI | MDT_PCSPK | MDT_ADLIB | MDT_TOWNS},41 {"null", "No music", MD_NULL, MDT_MIDI | MDT_PCSPK | MDT_ADLIB | MDT_TOWNS},41 {"auto", _s("<default>"), MD_AUTO, MDT_MIDI | MDT_PCSPK | MDT_ADLIB | MDT_TOWNS}, 42 {"null", _s("No music"), MD_NULL, MDT_MIDI | MDT_PCSPK | MDT_ADLIB | MDT_TOWNS}, 42 43 43 44 #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) 44 {"windows", "Windows MIDI", MD_WINDOWS, MDT_MIDI},45 {"windows", _s("Windows MIDI"), MD_WINDOWS, MDT_MIDI}, 45 46 #endif 46 47 47 48 #if defined(UNIX) && defined(USE_ALSA) 48 {"alsa", "ALSA", MD_ALSA, MDT_MIDI},49 {"alsa", _s("ALSA"), MD_ALSA, MDT_MIDI}, 49 50 #endif 50 51 51 52 #if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX) && !defined(__MAEMO__) 52 {"seq", "SEQ", MD_SEQ, MDT_MIDI},53 {"seq", _s("SEQ"), MD_SEQ, MDT_MIDI}, 53 54 #endif 54 55 55 56 #if defined(MACOSX) 56 {"core", "CoreAudio", MD_COREAUDIO, MDT_MIDI},57 {"core", _s("CoreAudio"), MD_COREAUDIO, MDT_MIDI}, 57 58 // {"coreaudio", "CoreAudio", MD_COREAUDIO, MDT_MIDI}, 58 {"coremidi", "CoreMIDI", MD_COREMIDI, MDT_MIDI},59 {"qt", "QuickTime", MD_QTMUSIC, MDT_MIDI},59 {"coremidi", _s("CoreMIDI"), MD_COREMIDI, MDT_MIDI}, 60 {"qt", _s("QuickTime"), MD_QTMUSIC, MDT_MIDI}, 60 61 #endif 61 62 62 63 #if defined(PALMOS_MODE) 63 64 # if defined(COMPILE_CLIE) 64 {"ypa1", "Yamaha Pa1", MD_YPA1, MDT_MIDI},65 {"ypa1", _s("Yamaha Pa1"), MD_YPA1, MDT_MIDI}, 65 66 # elif defined(COMPILE_ZODIAC) && (defined(DISABLE_SCUMM) || !defined(PALMOS_ARM)) 66 {"zodiac", "Tapwave Zodiac", MD_ZODIAC, MDT_MIDI},67 {"zodiac", _s("Tapwave Zodiac"), MD_ZODIAC, MDT_MIDI}, 67 68 # endif 68 69 #endif 69 70 70 71 #if defined(__MORPHOS__) 71 {"etude", "Etude", MD_ETUDE, MDT_MIDI},72 {"etude", _s("Etude"), MD_ETUDE, MDT_MIDI}, 72 73 #endif 73 74 #ifdef USE_FLUIDSYNTH 74 {"fluidsynth", "FluidSynth", MD_FLUIDSYNTH, MDT_MIDI},75 {"fluidsynth", _s("FluidSynth"), MD_FLUIDSYNTH, MDT_MIDI}, 75 76 #endif 76 77 #ifdef USE_MT32EMU 77 {"mt32", "MT-32", MD_MT32, MDT_MIDI},78 {"mt32", _s("MT-32"), MD_MT32, MDT_MIDI}, 78 79 #endif 79 80 80 81 // The flags for the "adlibe" driver indicate that it can do adlib and MIDI. 81 {"adlib", "Adlib", MD_ADLIB, MDT_ADLIB},82 {"pcspk", "PC Speaker", MD_PCSPK, MDT_PCSPK},83 {"pcjr", "IBM PCjr", MD_PCJR, MDT_PCSPK},84 {"towns", "FM Towns", MD_TOWNS, MDT_TOWNS},82 {"adlib", _s("Adlib"), MD_ADLIB, MDT_ADLIB}, 83 {"pcspk", _s("PC Speaker"), MD_PCSPK, MDT_PCSPK}, 84 {"pcjr", _s("IBM PCjr"), MD_PCJR, MDT_PCSPK}, 85 {"towns", _s("FM Towns"), MD_TOWNS, MDT_TOWNS}, 85 86 86 87 {0, 0, MD_NULL, MDT_NONE} 87 88 }; -
sound/softsynth/mt32.cpp
37 37 #include "common/file.h" 38 38 #include "common/system.h" 39 39 #include "common/util.h" 40 #include "common/translation.h" 40 41 41 42 #include "graphics/fontman.h" 42 43 #include "graphics/surface.h" … … 191 192 g_system->displayMessageOnOSD((const char *)reportData); 192 193 break; 193 194 case MT32Emu::ReportType_errorControlROM: 194 error( "Failed to load MT32_CONTROL.ROM");195 error(_t("Failed to load MT32_CONTROL.ROM")); 195 196 break; 196 197 case MT32Emu::ReportType_errorPCMROM: 197 error( "Failed to load MT32_PCM.ROM");198 error(_t("Failed to load MT32_PCM.ROM")); 198 199 break; 199 200 case MT32Emu::ReportType_progressInit: 200 201 if (((MidiDriver_MT32 *)userData)->_initialising) { … … 279 280 }; 280 281 281 282 g_system->setPalette(dummy_palette, 0, 5); 282 drawMessage(-1, "Initialising MT-32 Emulator");283 drawMessage(-1, _("Initialising MT-32 Emulator")); 283 284 if (!_synth->open(prop)) 284 285 return MERR_DEVICE_NOT_AVAILABLE; 285 286 _initialising = false; -
sound/softsynth/fluidsynth.cpp
24 24 25 25 #include "common/stdafx.h" 26 26 #include "common/scummsys.h" 27 #include "common/translation.h" 27 28 28 29 #ifdef USE_FLUIDSYNTH 29 30 … … 113 114 return MERR_ALREADY_OPEN; 114 115 115 116 if (!ConfMan.hasKey("soundfont")) 116 error( "FluidSynth requires a 'soundfont' setting");117 error(_t("FluidSynth requires a 'soundfont' setting")); 117 118 118 119 _settings = new_fluid_settings(); 119 120 … … 140 141 141 142 _soundFont = fluid_synth_sfload(_synth, soundfont, 1); 142 143 if (_soundFont == -1) 143 error( "Failed loading custom sound font '%s'", soundfont);144 error(_t("Failed loading custom sound font '%s'"), soundfont); 144 145 145 146 MidiDriver_Emulated::open(); 146 147 -
graphics/mpeg_player.cpp
29 29 #include "common/system.h" 30 30 #include "common/util.h" 31 31 #include "graphics/scaler/intern.h" 32 #include "common/translation.h" 32 33 33 34 namespace Graphics { 34 35 … … 82 83 Common::File f; 83 84 84 85 if (!f.open(tempFile)) { 85 warning( "Cutscene: %s palette missing", tempFile);86 warning(_t("Cutscene: %s palette missing"), tempFile); 86 87 return false; 87 88 } 88 89 … … 131 132 _mpegFile = new Common::File(); 132 133 sprintf(tempFile, "%s.mp2", name); 133 134 if (!_mpegFile->open(tempFile)) { 134 warning( "Cutscene: Could not open %s", tempFile);135 warning(_t("Cutscene: Could not open %s"), tempFile); 135 136 return false; 136 137 } 137 138 -
backends/platform/sdl/graphics.cpp
29 29 #include "graphics/fontman.h" 30 30 #include "graphics/scaler.h" 31 31 #include "graphics/surface.h" 32 #include "common/translation.h" 32 33 33 34 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { 34 {"1x", "Normal (no scaling)", GFX_NORMAL},35 {"1x", _s("Normal (no scaling)"), GFX_NORMAL}, 35 36 {"2x", "2x", GFX_DOUBLESIZE}, 36 37 {"3x", "3x", GFX_TRIPLESIZE}, 37 38 {"2xsai", "2xSAI", GFX_2XSAI}, -
backends/platform/wince/wince-sdl.cpp
32 32 #include "common/events.h" 33 33 #include "common/util.h" 34 34 #include "common/timer.h" 35 #include "common/translation.h" 35 36 36 37 #include "engines/engine.h" 37 38 … … 107 108 // Low end devices 240x320 108 109 109 110 static const OSystem::GraphicsMode s_supportedGraphicsModesLow[] = { 110 {"1x", "Normal (no scaling)", GFX_NORMAL},111 {"1x", _s("Normal (no scaling)"), GFX_NORMAL}, 111 112 {0, 0, 0} 112 113 }; 113 114 114 115 // High end device 480x640 115 116 116 117 static const OSystem::GraphicsMode s_supportedGraphicsModesHigh[] = { 117 {"1x", "Normal (no scaling)", GFX_NORMAL},118 {"1x", _s("Normal (no scaling)"), GFX_NORMAL}, 118 119 {"2x", "2x", GFX_DOUBLESIZE}, 119 120 #ifndef _MSC_VER // EVC breaks template functions, and I'm tired of fixing them :) 120 121 {"2xsai", "2xSAI", GFX_2XSAI}, -
base/commandLine.cpp
32 32 33 33 #include "common/config-manager.h" 34 34 #include "common/system.h" 35 #include "common/translation.h" 35 36 36 37 #include "sound/mididrv.h" 37 38 #include "sound/mixer.h" … … 54 55 55 56 namespace Base { 56 57 57 static const char USAGE_STRING[] = 58 static const char USAGE_STRING[] = _s( 58 59 "%s: %s\n" 59 60 "Usage: %s [OPTIONS]... [GAME]\n" 60 61 "\n" 61 "Try '%s --help' for more options.\n" 62 "Try '%s --help' for more options.\n") 62 63 ; 63 64 64 65 // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :) … … 148 149 va_end(va); 149 150 150 151 #if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined (__SYMBIAN32__)) 151 printf( USAGE_STRING, s_appName, buf, s_appName, s_appName);152 printf(_t(USAGE_STRING), s_appName, buf, s_appName, s_appName); 152 153 #endif 153 154 exit(1); 154 155 } … … 253 254 // Use this for options which have a required (string) value 254 255 #define DO_OPTION(shortCmd, longCmd) \ 255 256 DO_OPTION_OPT(shortCmd, longCmd, 0) \ 256 if (!option) usage( "Option '%s' requires an argument", argv[isLongCmd ? i : i-1]);257 if (!option) usage(_t("Option '%s' requires an argument"), argv[isLongCmd ? i : i-1]); 257 258 258 259 // Use this for options which have a required integer value 259 260 #define DO_OPTION_INT(shortCmd, longCmd) \ 260 261 DO_OPTION(shortCmd, longCmd) \ 261 262 char *endptr = 0; \ 262 263 int intValue; intValue = (int)strtol(option, &endptr, 0); \ 263 if (endptr == NULL || *endptr != 0) usage( "--%s: Invalid number '%s'", longCmd, option);264 if (endptr == NULL || *endptr != 0) usage(_t("--%s: Invalid number '%s'"), longCmd, option); 264 265 265 266 // Use this for boolean options; this distinguishes between "-x" and "-X", 266 267 // resp. between "--some-option" and "--no-some-option". … … 319 320 // Hence it must be the target name. We currently enforce that 320 321 // this always comes last. 321 322 if (i != argc - 1) 322 usage( "Stray argument '%s'", s);323 usage(_t("Stray argument '%s'"), s); 323 324 324 325 // We defer checking whether this is a valid target to a later point. 325 326 return s; … … 358 359 359 360 DO_OPTION('e', "music-driver") 360 361 if (MidiDriver::parseMusicDriver(option) < 0) 361 usage( "Unrecognized music driver '%s'", option);362 usage(_t("Unrecognized music driver '%s'"), option); 362 363 END_OPTION 363 364 364 365 DO_LONG_OPTION_INT("output-rate") … … 380 381 } 381 382 } 382 383 if (!isValid) 383 usage( "Unrecognized graphics mode '%s'", option);384 usage(_t("Unrecognized graphics mode '%s'"), option); 384 385 END_OPTION 385 386 386 387 DO_OPTION_INT('m', "music-volume") … … 395 396 396 397 DO_OPTION('q', "language") 397 398 if (Common::parseLanguage(option) == Common::UNK_LANG) 398 usage( "Unrecognized language '%s'", option);399 usage(_t("Unrecognized language '%s'"), option); 399 400 END_OPTION 400 401 401 402 DO_OPTION_INT('s', "sfx-volume") … … 424 425 DO_LONG_OPTION("platform") 425 426 int platform = Common::parsePlatform(option); 426 427 if (platform == Common::kPlatformUnknown) 427 usage( "Unrecognized platform '%s'", option);428 usage(_t("Unrecognized platform '%s'"), option); 428 429 END_OPTION 429 430 430 431 DO_LONG_OPTION("soundfont") … … 449 450 DO_LONG_OPTION("render-mode") 450 451 int renderMode = Common::parseRenderMode(option); 451 452 if (renderMode == Common::kRenderDefault) 452 usage( "Unrecognized render mode '%s'", option);453 usage(_t("Unrecognized render mode '%s'"), option); 453 454 END_OPTION 454 455 455 456 DO_LONG_OPTION("savepath") … … 487 488 488 489 unknownOption: 489 490 // If we get till here, the option is unhandled and hence unknown. 490 usage( "Unrecognized option '%s'", argv[i]);491 usage(_t("Unrecognized option '%s'"), argv[i]); 491 492 } 492 493 } 493 494 … … 497 498 498 499 /** List all supported game IDs, i.e. all games which any loaded plugin supports. */ 499 500 static void listGames() { 500 printf( "Game ID Full Title \n"501 "-------------------- ------------------------------------------------------\n") ;501 printf(_t("Game ID Full Title \n" 502 "-------------------- ------------------------------------------------------\n")); 502 503 503 504 const PluginList &plugins = PluginManager::instance().getPlugins(); 504 505 PluginList::const_iterator iter = plugins.begin(); … … 512 513 513 514 /** List all targets which are configured in the config file. */ 514 515 static void listTargets() { 515 printf( "Target Description \n"516 "-------------------- ------------------------------------------------------\n") ;516 printf(_t("Target Description \n" 517 "-------------------- ------------------------------------------------------\n")); 517 518 518 519 using namespace Common; 519 520 const ConfigManager::DomainMap &domains = ConfMan.getGameDomains(); … … 622 623 return false; 623 624 } else if (command == "version") { 624 625 printf("%s\n", gScummVMFullVersion); 625 printf( "Features compiled in: %s\n", gScummVMFeatures);626 printf(_t("Features compiled in: %s\n"), gScummVMFeatures); 626 627 return false; 627 628 } else if (command == "help") { 628 629 printf(HELP_STRING, s_appName); … … 660 661 ConfMan.set("id_came_from_command_line", "1"); 661 662 662 663 } else { 663 usage( "Unrecognized game target '%s'", command.c_str());664 usage(_t("Unrecognized game target '%s'"), command.c_str()); 664 665 } 665 666 } 666 667