diff options
-rw-r--r-- | engines/advancedDetector.cpp | 31 | ||||
-rw-r--r-- | po/POTFILES | 1 | ||||
-rw-r--r-- | po/scummvm.pot | 30 |
3 files changed, 49 insertions, 13 deletions
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index d093c958e7..2ee32b2f86 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -20,9 +20,6 @@ * */ -// FIXME: Avoid using printf -#define FORBIDDEN_SYMBOL_EXCEPTION_printf - #include "common/debug.h" #include "common/util.h" #include "common/hash-str.h" @@ -30,7 +27,9 @@ #include "common/macresman.h" #include "common/md5.h" #include "common/config-manager.h" +#include "common/system.h" #include "common/textconsole.h" +#include "common/translation.h" #include "engines/advancedDetector.h" @@ -366,14 +365,18 @@ static void reportUnknown(const Common::FSNode &path, const SizeMD5Map &filesSiz // // Might also be helpful to display the full path (for when this is used // from the mass detector). - printf("The game in '%s' seems to be unknown.\n", path.getPath().c_str()); - printf("Please, report the following data to the ScummVM team along with name\n"); - printf("of the game you tried to add and its version/language/etc.:\n"); + Common::String report = Common::String::format(_("The game in '%s' seems to be unknown."), path.getPath().c_str()) + "\n"; + report += _("Please, report the following data to the ScummVM team along with name"); + report += "\n"; + report += _("of the game you tried to add and its version/language/etc.:"); + report += "\n"; for (SizeMD5Map::const_iterator file = filesSizeMD5.begin(); file != filesSizeMD5.end(); ++file) - printf(" {\"%s\", 0, \"%s\", %d},\n", file->_key.c_str(), file->_value.md5.c_str(), file->_value.size); + report += Common::String::format(" {\"%s\", 0, \"%s\", %d},\n", file->_key.c_str(), file->_value.md5.c_str(), file->_value.size); + + report += "\n"; - printf("\n"); + g_system->logMessage(LogMessageType::kInfo, report.c_str()); } static ADGameDescList detectGameFilebased(const FileMap &allFiles, const ADParams ¶ms); @@ -626,10 +629,14 @@ static ADGameDescList detectGameFilebased(const FileMap &allFiles, const ADParam if (matchedDesc) { // We got a match matched.push_back(matchedDesc); if (params.flags & kADFlagPrintWarningOnFileBasedFallback) { - printf("Your game version has been detected using filename matching as a\n"); - printf("variant of %s.\n", matchedDesc->gameid); - printf("If this is an original and unmodified version, please report any\n"); - printf("information previously printed by ScummVM to the team.\n"); + Common::String report = Common::String::format(_("Your game version has been detected using " + "filename matching as a variant of %s."), matchedDesc->gameid); + report += "\n"; + report += _("If this is an original and unmodified version, please report any"); + report += "\n"; + report += _("information previously printed by ScummVM to the team."); + report += "\n"; + g_system->logMessage(LogMessageType::kInfo, report.c_str()); } } diff --git a/po/POTFILES b/po/POTFILES index b2fa545723..fc14daf209 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -19,6 +19,7 @@ base/main.cpp common/error.cpp common/util.cpp +engines/advancedDetector.cpp engines/dialogs.cpp engines/scumm/dialogs.cpp engines/scumm/help.cpp diff --git a/po/scummvm.pot b/po/scummvm.pot index ec87aed950..ff41b69df5 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2011-06-06 11:59+0200\n" +"POT-Creation-Date: 2011-06-06 12:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1074,6 +1074,34 @@ msgctxt "lowres" msgid "Hercules Amber" msgstr "" +#: engines/advancedDetector.cpp:368 +#, c-format +msgid "The game in '%s' seems to be unknown." +msgstr "" + +#: engines/advancedDetector.cpp:369 +msgid "Please, report the following data to the ScummVM team along with name" +msgstr "" + +#: engines/advancedDetector.cpp:371 +msgid "of the game you tried to add and its version/language/etc.:" +msgstr "" + +#: engines/advancedDetector.cpp:632 +#, c-format +msgid "" +"Your game version has been detected using filename matching as a variant of %" +"s." +msgstr "" + +#: engines/advancedDetector.cpp:635 +msgid "If this is an original and unmodified version, please report any" +msgstr "" + +#: engines/advancedDetector.cpp:637 +msgid "information previously printed by ScummVM to the team." +msgstr "" + #: engines/dialogs.cpp:84 msgid "~R~esume" msgstr "" |