Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11526 Modified Files: basechar.cpp basedef.cpp commands.cpp console.cpp definable.cpp definitions.cpp items.cpp log.cpp npc.cpp party.cpp persistentbroker.cpp player.cpp pythonscript.cpp scriptmanager.cpp sectors.cpp server.cpp serverconfig.cpp serverconfig.h skills.cpp territories.cpp world.cpp Log Message: - Server strings localization Index: persistentbroker.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** persistentbroker.cpp 10 Aug 2004 03:15:57 -0000 1.41 --- persistentbroker.cpp 9 Oct 2004 14:28:59 -0000 1.42 *************** *** 155,159 **** { if ( !d->connection ) ! throw QString( "PersistentBroker not connected to database." ); //qWarning( query ); --- 155,159 ---- { if ( !d->connection ) ! throw tr( "PersistentBroker not connected to database." ); //qWarning( query ); Index: server.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** server.cpp 6 Oct 2004 12:09:59 -0000 1.31 --- server.cpp 9 Oct 2004 14:28:59 -0000 1.32 *************** *** 432,437 **** Console::instance()->send( "Copyright (C) 2000-2004 Wolfpack Development Team\n" ); Console::instance()->send( "Wolfpack Homepage: http://www.wpdev.org/\n" ); ! Console::instance()->send( "By using this software you agree to the license accompanying this release.\n" ); ! Console::instance()->send( "Compiled on " __DATE__ " " __TIME__ "\n" ); Console::instance()->send( tr("Compiled for Qt %1 (Using: %2 %3)\n").arg(QT_VERSION_STR, qVersion(), qSharedBuild() ? " Shared" : " Static" ) ); QString pythonBuild = Py_GetVersion(); --- 432,437 ---- Console::instance()->send( "Copyright (C) 2000-2004 Wolfpack Development Team\n" ); Console::instance()->send( "Wolfpack Homepage: http://www.wpdev.org/\n" ); ! Console::instance()->send( tr("By using this software you agree to the license accompanying this release.\n") ); ! Console::instance()->send( tr("Compiled on %1 %2\n").arg( __DATE__ , __TIME__ ) ); Console::instance()->send( tr("Compiled for Qt %1 (Using: %2 %3)\n").arg(QT_VERSION_STR, qVersion(), qSharedBuild() ? " Shared" : " Static" ) ); QString pythonBuild = Py_GetVersion(); *************** *** 450,458 **** #endif Console::instance()->send( tr("Compiled for Python %1 %2 (Using: %3)\n").arg(PY_VERSION, UnicodeType, pythonBuild) ); ! Console::instance()->send( "Compiled with SQLite " SQLITE_VERSION "\n" ); #if defined (MYSQL_DRIVER) Console::instance()->send( tr( "Compiled for MySQL %1 (Using: %2)\n" ).arg( MYSQL_SERVER_VERSION, mysql_get_client_info() ) ); #else ! Console::instance()->send( "MySQL Support: disabled\n" ); #endif Console::instance()->send( "\n" ); --- 450,458 ---- #endif Console::instance()->send( tr("Compiled for Python %1 %2 (Using: %3)\n").arg(PY_VERSION, UnicodeType, pythonBuild) ); ! Console::instance()->send( tr("Compiled with SQLite %1\n" ).arg( SQLITE_VERSION ) ); #if defined (MYSQL_DRIVER) Console::instance()->send( tr( "Compiled for MySQL %1 (Using: %2)\n" ).arg( MYSQL_SERVER_VERSION, mysql_get_client_info() ) ); #else ! Console::instance()->send( tr("MySQL Support: disabled\n") ); #endif Console::instance()->send( "\n" ); Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.159 retrieving revision 1.160 diff -C2 -d -r1.159 -r1.160 *** basechar.cpp 8 Oct 2004 01:13:15 -0000 1.159 --- basechar.cpp 9 Oct 2004 14:28:58 -0000 1.160 *************** *** 1410,1419 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Invalid equipped element missing id and list attribute in npc definition '%1'." ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } else { ! Console::instance()->log( LOG_ERROR, QString( "Invalid equipped element '%1' in npc definition '%2'." ).arg( element->name() ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } --- 1410,1419 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Invalid equipped element missing id and list attribute in npc definition '%1'." ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } else { ! Console::instance()->log( LOG_ERROR, tr( "Invalid equipped element '%1' in npc definition '%2'." ).arg( element->name() ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.267 retrieving revision 1.268 diff -C2 -d -r1.267 -r1.268 *** commands.cpp 8 Oct 2004 10:57:09 -0000 1.267 --- commands.cpp 9 Oct 2004 14:28:59 -0000 1.268 *************** *** 133,137 **** if ( ScriptSections.isEmpty() ) { ! Console::instance()->log( LOG_WARNING, "No ACLs for players, counselors, gms and admins defined!\n" ); return; } --- 133,138 ---- if ( ScriptSections.isEmpty() ) { ! Console::instance()->log( LOG_WARNING, tr("No ACLs for players, counselors, gms and admins defined!\n" ! "Check your scripts, wolfpack.xml and make sure to run Wolfpack from the proper folder\n") ); return; } *************** *** 903,911 **** if ( !driver.open() ) { ! socket->sysMessage( "Unable to open categories.db in your wolfpack directory." ); return; } ! Console::instance()->log( LOG_MESSAGE, QString( "Exporting definitions to %1.\n" ).arg( "categories.db" ) ); try --- 904,912 ---- if ( !driver.open() ) { ! socket->sysMessage( tr("Unable to open categories.db in your wolfpack directory.") ); return; } ! Console::instance()->log( LOG_MESSAGE, tr( "Exporting definitions to %1.\n" ).arg( "categories.db" ) ); try Index: log.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/log.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** log.cpp 25 Sep 2004 02:03:19 -0000 1.20 --- log.cpp 9 Oct 2004 14:28:59 -0000 1.21 *************** *** 87,91 **** if ( !logfile.open( IO_WriteOnly | IO_Append | IO_Translate ) ) { ! Console::instance()->send( QString( "Couldn't open logfile '%1'\n" ).arg( path + filename ) ); return false; } --- 87,91 ---- if ( !logfile.open( IO_WriteOnly | IO_Append | IO_Translate ) ) { ! Console::instance()->send( tr( "Couldn't open logfile '%1'\n" ).arg( path + filename ) ); return false; } *************** *** 181,185 **** case LOG_ERROR: Console::instance()->changeColor( WPC_RED ); ! Console::instance()->send( "ERROR: " ); Console::instance()->changeColor( WPC_NORMAL ); break; --- 181,185 ---- case LOG_ERROR: Console::instance()->changeColor( WPC_RED ); ! Console::instance()->send( tr("ERROR: ") ); Console::instance()->changeColor( WPC_NORMAL ); break; *************** *** 187,191 **** case LOG_WARNING: Console::instance()->changeColor( WPC_YELLOW ); ! Console::instance()->send( "WARNING: " ); Console::instance()->changeColor( WPC_NORMAL ); break; --- 187,191 ---- case LOG_WARNING: Console::instance()->changeColor( WPC_YELLOW ); ! Console::instance()->send( tr("WARNING: ") ); Console::instance()->changeColor( WPC_NORMAL ); break; Index: party.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/party.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** party.cpp 22 Aug 2004 02:29:50 -0000 1.17 --- party.cpp 9 Oct 2004 14:28:59 -0000 1.18 *************** *** 240,244 **** if ( leader && leader->party() && player && player->socket() && leader->party()->canidates().contains( player ) ) { ! player->socket()->log( LOG_TRACE, QString( "Party invitation from '%1' timed out.\n" ).arg( leader->account()->login() ) ); leader->party()->removeMember( player ); // This automatically resends and checks the party } --- 240,244 ---- if ( leader && leader->party() && player && player->socket() && leader->party()->canidates().contains( player ) ) { ! player->socket()->log( LOG_TRACE, tr( "Party invitation from '%1' timed out.\n" ).arg( leader->account()->login() ) ); leader->party()->removeMember( player ); // This automatically resends and checks the party } *************** *** 315,319 **** player->socket()->clilocMessageAffix( 1008089, 0, leader->name(), 0x3b2, 3, 0, false, true ); leader->party()->addCanidate( player ); ! socket->log( LOG_TRACE, QString( "Invited '%1' to join his party.\n" ).arg( player->account()->login() ) ); // Send a party invitation request --- 315,319 ---- player->socket()->clilocMessageAffix( 1008089, 0, leader->name(), 0x3b2, 3, 0, false, true ); leader->party()->addCanidate( player ); ! socket->log( LOG_TRACE, tr( "Invited '%1' to join his party.\n" ).arg( player->account()->login() ) ); // Send a party invitation request *************** *** 356,365 **** if ( player->party() == target->party() && player->party()->leader() == player ) { ! socket->log( LOG_TRACE, QString( "Removed '%1' from the party.\n" ).arg( target->account()->login() ) ); player->party()->removeMember( target ); } else if ( target == player ) { ! socket->log( LOG_TRACE, QString( "Left the party.\n" ).arg( player->account()->login() ) ); player->party()->removeMember( target ); } --- 356,365 ---- if ( player->party() == target->party() && player->party()->leader() == player ) { ! socket->log( LOG_TRACE, tr( "Removed '%1' from the party.\n" ).arg( target->account()->login() ) ); player->party()->removeMember( target ); } else if ( target == player ) { ! socket->log( LOG_TRACE, tr( "Left the party.\n" ).arg( player->account()->login() ) ); player->party()->removeMember( target ); } *************** *** 375,379 **** if ( target ) { ! socket->log( LOG_TRACE, QString( "Told '%1' in party '%2'.\n" ).arg( target->account()->login() ).arg( message ) ); QString message = packet->getUnicodeString( 10, packet->size() - 10 ); player->party()->send( player, target, message ); --- 375,379 ---- if ( target ) { ! socket->log( LOG_TRACE, tr( "Told '%1' in party '%2'.\n" ).arg( target->account()->login() ).arg( message ) ); QString message = packet->getUnicodeString( 10, packet->size() - 10 ); player->party()->send( player, target, message ); *************** *** 387,391 **** { QString message = packet->getUnicodeString( 6, packet->size() - 6 ); ! socket->log( LOG_TRACE, QString( "Told the whole party: '%1'.\n" ).arg( message ) ); player->party()->send( player, message ); } --- 387,391 ---- { QString message = packet->getUnicodeString( 6, packet->size() - 6 ); ! socket->log( LOG_TRACE, tr( "Told the whole party: '%1'.\n" ).arg( message ) ); player->party()->send( player, message ); } *************** *** 410,414 **** { leader->party()->addMember( player ); ! socket->log( QString( "Accepted party invitation from '%1'.\n" ).arg( leader->account()->login() ) ); } break; --- 410,414 ---- { leader->party()->addMember( player ); ! socket->log( tr( "Accepted party invitation from '%1'.\n" ).arg( leader->account()->login() ) ); } break; *************** *** 425,429 **** socket->clilocMessage( 1008092 ); ! socket->log( LOG_TRACE, QString( "Declined party invitation from '%1'.\n" ).arg( leader->account()->login() ) ); } break; --- 425,429 ---- socket->clilocMessage( 1008092 ); ! socket->log( LOG_TRACE, tr( "Declined party invitation from '%1'.\n" ).arg( leader->account()->login() ) ); } break; Index: console.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** console.cpp 25 Sep 2004 21:15:46 -0000 1.27 --- console.cpp 9 Oct 2004 14:28:59 -0000 1.28 *************** *** 84,88 **** progress = QString::null; changeColor( WPC_GREEN ); ! send( "Done\n" ); changeColor( WPC_NORMAL ); } --- 84,88 ---- progress = QString::null; changeColor( WPC_GREEN ); ! send( tr("Done\n") ); changeColor( WPC_NORMAL ); } *************** *** 93,97 **** progress = QString::null; changeColor( WPC_RED ); ! send( "Failed\n" ); changeColor( WPC_NORMAL ); } --- 93,97 ---- progress = QString::null; changeColor( WPC_RED ); ! send( tr("Failed\n") ); changeColor( WPC_NORMAL ); } *************** *** 102,106 **** progress = QString::null; changeColor( WPC_YELLOW ); ! send( "Skipped\n" ); changeColor( WPC_NORMAL ); } --- 102,106 ---- progress = QString::null; changeColor( WPC_YELLOW ); ! send( tr("Skipped\n") ); changeColor( WPC_NORMAL ); } *************** *** 118,124 **** if ( !Server::instance()->getSecure() ) ! Console::instance()->send( "WOLFPACK: Secure mode disabled. Press ? for a commands list.\n" ); else ! Console::instance()->send( "WOLFPACK: Secure mode re-enabled.\n" ); return true; --- 118,124 ---- if ( !Server::instance()->getSecure() ) ! Console::instance()->send( tr("WOLFPACK: Secure mode disabled. Press ? for a commands list.\n") ); else ! Console::instance()->send( tr("WOLFPACK: Secure mode re-enabled.\n") ); return true; *************** *** 128,132 **** if ( Server::instance()->getSecure() && c != '?' ) { ! Console::instance()->send( "WOLFPACK: Secure mode prevents keyboard commands! Press 'S' to disable.\n" ); return false; } --- 128,132 ---- if ( Server::instance()->getSecure() && c != '?' ) { ! Console::instance()->send( tr("WOLFPACK: Secure mode prevents keyboard commands! Press 'S' to disable.\n") ); return false; } *************** *** 135,139 **** { case 'Q': ! Console::instance()->send( "WOLFPACK: Immediate Shutdown initialized!\n" ); Server::instance()->cancel(); break; --- 135,139 ---- { case 'Q': ! Console::instance()->send( tr("WOLFPACK: Immediate Shutdown initialized!\n") ); Server::instance()->cancel(); break; *************** *** 170,186 **** break; case '?': ! Console::instance()->send( "Console commands:\n" ); ! Console::instance()->send( " Q: Shutdown the server.\n" ); ! Console::instance()->send( " # - Save world\n" ); ! Console::instance()->send( " W - Display logged in characters\n" ); ! Console::instance()->send( " A - Reload accounts\n" ); ! Console::instance()->send( " R - Reload scripts\n" ); ! Console::instance()->send( " S - Toggle Secure mode " ); if ( Server::instance()->getSecure() ) ! Console::instance()->send( "[enabled]\n" ); else ! Console::instance()->send( "[disabled]\n" ); ! Console::instance()->send( " ? - Commands list (this)\n" ); ! Console::instance()->send( "End of commands list.\n" ); break; default: --- 170,186 ---- break; case '?': ! Console::instance()->send( tr("Console commands:\n") ); ! Console::instance()->send( tr(" Q: Shutdown the server.\n") ); ! Console::instance()->send( tr(" # - Save world\n") ); ! Console::instance()->send( tr(" W - Display logged in characters\n") ); ! Console::instance()->send( tr(" A - Reload accounts\n") ); ! Console::instance()->send( tr(" R - Reload scripts\n") ); ! Console::instance()->send( tr(" S - Toggle Secure mode ") ); if ( Server::instance()->getSecure() ) ! Console::instance()->send( tr("[enabled]\n") ); else ! Console::instance()->send( tr("[disabled]\n") ); ! Console::instance()->send( tr(" ? - Commands list (this)\n") ); ! Console::instance()->send( tr("End of commands list.\n") ); break; default: Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.452 retrieving revision 1.453 diff -C2 -d -r1.452 -r1.453 *** items.cpp 8 Oct 2004 01:13:15 -0000 1.452 --- items.cpp 9 Oct 2004 14:28:59 -0000 1.453 *************** *** 871,879 **** else if ( element->hasAttribute( "list" ) ) { ! qWarning( "cItem::processContainerNode <item list=\"myList\"/> not implemented!!!" ); } else { ! Console::instance()->log( LOG_ERROR, QString( "Content element lacking id and list attribute in item definition '%1'." ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } --- 871,879 ---- else if ( element->hasAttribute( "list" ) ) { ! Console::instance()->log( LOG_ERROR, tr( "cItem::processContainerNode <item list=\"myList\"/> not implemented!!!" ) ); } else { ! Console::instance()->log( LOG_ERROR, tr( "Content element lacking id and list attribute in item definition '%1'." ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } *************** *** 1348,1352 **** if ( pItem == this ) { ! Console::instance()->log( LOG_WARNING, QString( "Rejected putting an item into itself (%1)" ).arg( serial_, 0, 16 ) ); return; } --- 1348,1352 ---- if ( pItem == this ) { ! Console::instance()->log( LOG_WARNING, tr( "Rejected putting an item into itself (%1)" ).arg( serial_, 0, 16 ) ); return; } *************** *** 1970,1974 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Unable to create unscripted item: %1\n" ).arg( id ) ); } --- 1970,1974 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Unable to create unscripted item: %1\n" ).arg( id ) ); } Index: skills.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/skills.cpp,v retrieving revision 1.232 retrieving revision 1.233 diff -C2 -d -r1.232 -r1.233 *** skills.cpp 19 Aug 2004 01:55:56 -0000 1.232 --- skills.cpp 9 Oct 2004 14:28:59 -0000 1.233 *************** *** 388,392 **** if ( title >= skillRanks.size() ) { ! pChar->log( LOG_ERROR, "Invalid skill rank information.\n" ); return skillTitle; } --- 388,392 ---- if ( title >= skillRanks.size() ) { ! pChar->log( LOG_ERROR, tr("Invalid skill rank information.\n") ); return skillTitle; } *************** *** 395,399 **** if ( skill >= skills.size() ) { ! pChar->log( LOG_ERROR, QString( "Skill id out of range: %u.\n" ).arg( skill ) ); return skillTitle; } --- 395,399 ---- if ( skill >= skills.size() ) { ! pChar->log( LOG_ERROR, tr( "Skill id out of range: %u.\n" ).arg( skill ) ); return skillTitle; } *************** *** 409,413 **** if ( skill >= skills.size() ) { ! Console::instance()->log( LOG_ERROR, QString( "Skill id out of range: %u" ).arg( skill ) ); return QString::null; } --- 409,413 ---- if ( skill >= skills.size() ) { ! Console::instance()->log( LOG_ERROR, tr( "Skill id out of range: %u" ).arg( skill ) ); return QString::null; } *************** *** 433,437 **** if ( skill >= skills.size() ) { ! Console::instance()->log( LOG_ERROR, QString( "Skill id out of range: %u" ).arg( skill ) ); return QString::null; } --- 433,437 ---- if ( skill >= skills.size() ) { ! Console::instance()->log( LOG_ERROR, tr( "Skill id out of range: %u" ).arg( skill ) ); return QString::null; } Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** pythonscript.cpp 26 Sep 2004 22:40:04 -0000 1.53 --- pythonscript.cpp 9 Oct 2004 14:28:59 -0000 1.54 *************** *** 630,634 **** if ( events[i] && !PyCallable_Check( events[i] ) ) { ! Console::instance()->log( LOG_ERROR, QString( "Script %1 has non callable event: %1" ).arg( eventNames[i] ) ); Py_DECREF( events[i] ); --- 630,634 ---- if ( events[i] && !PyCallable_Check( events[i] ) ) { ! Console::instance()->log( LOG_ERROR, tr( "Script %1 has non callable event: %1" ).arg( eventNames[i] ) ); Py_DECREF( events[i] ); Index: sectors.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/sectors.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** sectors.cpp 17 Sep 2004 16:34:00 -0000 1.32 --- sectors.cpp 9 Oct 2004 14:28:59 -0000 1.33 *************** *** 98,102 **** if ( width == 0 || height == 0 ) { ! Console::instance()->log( LOG_ERROR, QString( "Invalid Sectormap boundaries (Width: %1, Height: %2)." ).arg( width ).arg( height ) ); return false; } --- 98,102 ---- if ( width == 0 || height == 0 ) { ! Console::instance()->log( LOG_ERROR, tr( "Invalid Sectormap boundaries (Width: %1, Height: %2)." ).arg( width ).arg( height ) ); return false; } *************** *** 584,588 **** if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find a map with the id %1. (cSectorMaps::findItems)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } --- 584,588 ---- if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find a map with the id %1. (cSectorMaps::findItems)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } *************** *** 597,601 **** if ( it == charmaps.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find a map with the id %1. (cSectorMaps::findChars)" ).arg( map ) ); return new cCharSectorIterator( 0, 0 ); // Return an empty iterator } --- 597,601 ---- if ( it == charmaps.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find a map with the id %1. (cSectorMaps::findChars)" ).arg( map ) ); return new cCharSectorIterator( 0, 0 ); // Return an empty iterator } *************** *** 614,618 **** if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find a map with the id %1. (cSectorMaps::findItems)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } --- 614,618 ---- if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find a map with the id %1. (cSectorMaps::findItems)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } *************** *** 627,631 **** if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find a map with the id %1. (cSectorMaps::findMultis)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } --- 627,631 ---- if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find a map with the id %1. (cSectorMaps::findMultis)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } *************** *** 640,644 **** if ( it == charmaps.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find a map with the id %1. (cSectorMaps::findChars)" ).arg( map ) ); return new cCharSectorIterator( 0, 0 ); // Return an empty iterator } --- 640,644 ---- if ( it == charmaps.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find a map with the id %1. (cSectorMaps::findChars)" ).arg( map ) ); return new cCharSectorIterator( 0, 0 ); // Return an empty iterator } Index: definable.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definable.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** definable.cpp 2 Oct 2004 22:15:50 -0000 1.22 --- definable.cpp 9 Oct 2004 14:28:59 -0000 1.23 *************** *** 54,58 **** if ( tInherit == sectionNode ) { ! Console::instance()->log( LOG_ERROR, QString( "Circulary inheriting %1.\n" ).arg( sectionNode->getAttribute( "inherit", "" ) ) ); return; } --- 54,58 ---- if ( tInherit == sectionNode ) { ! Console::instance()->log( LOG_ERROR, tr( "Circulary inheriting %1.\n" ).arg( sectionNode->getAttribute( "inherit", "" ) ) ); return; } Index: definitions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** definitions.cpp 1 Oct 2004 19:43:56 -0000 1.20 --- definitions.cpp 9 Oct 2004 14:28:59 -0000 1.21 *************** *** 200,204 **** if ( impl->unique[categories[i].key].contains( tagId ) && !Config::instance()->overwriteDefinitions() ) { ! Console::instance()->log( LOG_WARNING, QString( "Duplicate %1: %2\n[File: %3, Line: %4]\n" ).arg( element->name() ).arg( tagId ).arg( filename ).arg( locator->lineNumber() ) ); delete element; } --- 200,204 ---- if ( impl->unique[categories[i].key].contains( tagId ) && !Config::instance()->overwriteDefinitions() ) { ! Console::instance()->log( LOG_WARNING, tr( "Duplicate %1: %2\n[File: %3, Line: %4]\n" ).arg( element->name() ).arg( tagId ).arg( filename ).arg( locator->lineNumber() ) ); delete element; } *************** *** 218,222 **** } ! Console::instance()->log( LOG_WARNING, QString( "Unknown element: %1\n[File: %2, Line: %3]\n" ).arg( element->name() ).arg( filename ).arg( locator->lineNumber() ) ); delete element; } --- 218,222 ---- } ! Console::instance()->log( LOG_WARNING, tr( "Unknown element: %1\n[File: %2, Line: %3]\n" ).arg( element->name() ).arg( filename ).arg( locator->lineNumber() ) ); delete element; } *************** *** 240,254 **** bool warning( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_WARNING, QString( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool error( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, QString( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool fatalError( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, QString( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } --- 240,254 ---- bool warning( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_WARNING, tr( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool error( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, tr( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool fatalError( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, tr( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } *************** *** 262,268 **** if ( !File.open( IO_ReadOnly ) ) { ! Console::instance()->send( "Unable to open " ); ! Console::instance()->send( FileName ); ! Console::instance()->send( "!\n" ); return false; } --- 262,266 ---- if ( !File.open( IO_ReadOnly ) ) { ! Console::instance()->send( tr("Unable to open %1!\n").arg(FileName) ); return false; } Index: serverconfig.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** serverconfig.h 6 Oct 2004 00:02:37 -0000 1.6 --- serverconfig.h 9 Oct 2004 14:28:59 -0000 1.7 *************** *** 66,69 **** --- 66,70 ---- class cConfig : public Preferences, public cComponent { + OBJECTDEF(cConfig) protected: QString getGroupDoc( const QString& group ); Index: territories.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** territories.cpp 1 Oct 2004 19:43:56 -0000 1.56 --- territories.cpp 9 Oct 2004 14:29:00 -0000 1.57 *************** *** 339,343 **** if ( territory->rectangles().empty() ) { ! Console::instance()->log( LOG_WARNING, QString( "Region %1 lacks rectangle tag, ignoring region.\n" ).arg( territory->name() ) ); delete territory; } --- 339,343 ---- if ( territory->rectangles().empty() ) { ! Console::instance()->log( LOG_WARNING, tr( "Region %1 lacks rectangle tag, ignoring region.\n" ).arg( territory->name() ) ); delete territory; } Index: scriptmanager.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/scriptmanager.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** scriptmanager.cpp 25 Sep 2004 02:03:20 -0000 1.27 --- scriptmanager.cpp 9 Oct 2004 14:28:59 -0000 1.28 *************** *** 149,153 **** if ( scripts.contains( element->text().latin1() ) ) { ! Console::instance()->log( LOG_WARNING, QString( "Duplicate Script: %1" ).arg( element->text() ) ); continue; } --- 149,153 ---- if ( scripts.contains( element->text().latin1() ) ) { ! Console::instance()->log( LOG_WARNING, tr( "Duplicate Script: %1" ).arg( element->text() ) ); continue; } Index: serverconfig.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** serverconfig.cpp 6 Oct 2004 00:02:37 -0000 1.12 --- serverconfig.cpp 9 Oct 2004 14:28:59 -0000 1.13 *************** *** 366,379 **** }; - static stGroupDoc group_doc[] = - { - {"AI", "This group configures the NPC AI."}, - {"Accounts", "This group configures the account management."}, - {"Database", "This group configures access to the worldsave database."}, - {0, 0} - }; - QString cConfig::getGroupDoc( const QString& group ) { // Try to find documentation for a group in our table unsigned int i = 0; --- 366,379 ---- }; QString cConfig::getGroupDoc( const QString& group ) { + static stGroupDoc group_doc[] = + { + {"AI", QT_TR_NOOP("This group configures the NPC AI.")}, + {"Accounts", QT_TR_NOOP("This group configures the account management.")}, + {"Database", QT_TR_NOOP("This group configures access to the worldsave database.")}, + {0, 0} + }; + // Try to find documentation for a group in our table unsigned int i = 0; *************** *** 383,387 **** if ( group == group_doc[i].group ) { ! return group_doc[i].documentation; } ++i; --- 383,387 ---- if ( group == group_doc[i].group ) { ! return tr(group_doc[i].documentation); } ++i; *************** *** 398,414 **** }; - static stEntryDoc entry_doc[] = - { - {"Accounts", "Auto Create", "If active login attempts with non-existing login names will create a new account automatically\n" - "This is very usefull for new shards without account policy\n"}, - {"Accounts", "Database Driver", "Possible values are: sqlite, mysql"}, - {"Accounts", "Maximum Number of Characters", "Should not be more than 6, due to client restrictions"}, - {"Accounts", "Use MD5 Hashed Passwords", "This will store hashed passwords, increasing password security."}, - {"Accounts", "Automatically Hash Loaded Passwords", "If active, will convert older plain text passwords into MD5 hash"}, - {0, 0, 0} - }; - QString cConfig::getEntryDoc( const QString& group, const QString& entry ) { // Try to find documentation for an entry in our table unsigned int i = 0; --- 398,414 ---- }; QString cConfig::getEntryDoc( const QString& group, const QString& entry ) { + static stEntryDoc entry_doc[] = + { + {"Accounts", "Auto Create", QT_TR_NOOP("If active login attempts with non-existing login names will create a new account automatically\n" + "This is very usefull for new shards without account policy\n")}, + {"Accounts", "Database Driver", QT_TR_NOOP("Possible values are: sqlite, mysql")}, + {"Accounts", "Maximum Number of Characters", QT_TR_NOOP("Should not be more than 6, due to client restrictions")}, + {"Accounts", "Use MD5 Hashed Passwords", QT_TR_NOOP("This will store hashed passwords, increasing password security.")}, + {"Accounts", "Automatically Hash Loaded Passwords", QT_TR_NOOP("If active, will convert older plain text passwords into MD5 hash")}, + {0, 0, 0} + }; + // Try to find documentation for an entry in our table unsigned int i = 0; *************** *** 418,422 **** if ( group == entry_doc[i].group && entry == entry_doc[i].entry ) { ! return entry_doc[i].documentation; } ++i; --- 418,422 ---- if ( group == entry_doc[i].group && entry == entry_doc[i].entry ) { ! return tr(entry_doc[i].documentation); } ++i; Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -d -r1.136 -r1.137 *** player.cpp 8 Oct 2004 01:13:15 -0000 1.136 --- player.cpp 9 Oct 2004 14:28:59 -0000 1.137 *************** *** 692,696 **** if ( !pi ) { ! Console::instance()->log( LOG_ERROR, "cChar::canPickUp() - bad parm" ); return false; } --- 692,696 ---- if ( !pi ) { ! Console::instance()->log( LOG_ERROR, tr("cChar::canPickUp() - bad parm") ); return false; } *************** *** 845,849 **** if ( !pItem ) { ! Console::instance()->log( LOG_ERROR, QString( "Invalid item tag without id or list in startitem definition '%1'" ).arg( element->getAttribute( "id" ) ) ); } else --- 845,849 ---- if ( !pItem ) { ! Console::instance()->log( LOG_ERROR, tr( "Invalid item tag without id or list in startitem definition '%1'" ).arg( element->getAttribute( "id" ) ) ); } else *************** *** 881,885 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Trying to equip invalid item (%1) in startitem definition '%2'" ).arg( pItem->id(), 0, 16 ).arg( element->getAttribute( "id" ) ) ); } } --- 881,885 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Trying to equip invalid item (%1) in startitem definition '%2'" ).arg( pItem->id(), 0, 16 ).arg( element->getAttribute( "id" ) ) ); } } *************** *** 887,891 **** { pItem->remove(); ! Console::instance()->log( LOG_ERROR, QString( "Unrecognized startitem tag '%1' in definition '%2'." ).arg( node->name() ).arg( element->getAttribute( "id" ) ) ); } } --- 887,891 ---- { pItem->remove(); ! Console::instance()->log( LOG_ERROR, tr( "Unrecognized startitem tag '%1' in definition '%2'." ).arg( node->name() ).arg( element->getAttribute( "id" ) ) ); } } Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** basedef.cpp 1 Oct 2004 15:15:56 -0000 1.23 --- basedef.cpp 9 Oct 2004 14:28:59 -0000 1.24 *************** *** 50,54 **** if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Basedef %1 has invalid integer property %2.\n").arg(id_).arg(name)); } --- 50,54 ---- if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Basedef %1 has invalid integer property %2.\n").arg(id_).arg(name)); } *************** *** 199,203 **** { if (!id_.isEmpty()) { ! Console::instance()->log( LOG_WARNING, QString( "Missing npc definition '%1'.\n" ).arg( id_ ) ); } return; --- 199,203 ---- { if (!id_.isEmpty()) { ! Console::instance()->log( LOG_WARNING, tr( "Missing npc definition '%1'.\n" ).arg( id_ ) ); } return; *************** *** 229,233 **** if (!file.open(IO_ReadOnly)) { ! Console::instance()->log(LOG_WARNING, QString("Unable to load body information from %1.\n").arg(filename)); } --- 229,233 ---- if (!file.open(IO_ReadOnly)) { ! Console::instance()->log(LOG_WARNING, tr("Unable to load body information from %1.\n").arg(filename)); } *************** *** 249,253 **** bodyinfo.body = id.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid body id in bodyinfo file: %1.\n").arg(id)); continue; } --- 249,253 ---- bodyinfo.body = id.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid body id in bodyinfo file: %1.\n").arg(id)); continue; } *************** *** 258,262 **** bodyinfo.basesound = basesound.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid basesound in bodyinfo file: %1.\n").arg(basesound)); continue; } --- 258,262 ---- bodyinfo.basesound = basesound.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid basesound in bodyinfo file: %1.\n").arg(basesound)); continue; } *************** *** 270,274 **** bodyinfo.figurine = figurine.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid figurine in bodyinfo file: %1.\n").arg(figurine)); continue; } --- 270,274 ---- bodyinfo.figurine = figurine.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid figurine in bodyinfo file: %1.\n").arg(figurine)); continue; } *************** *** 282,286 **** bodyinfo.soundmode = soundmode.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid soundmode in bodyinfo file: %1.\n").arg(soundmode)); continue; } --- 282,286 ---- bodyinfo.soundmode = soundmode.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid soundmode in bodyinfo file: %1.\n").arg(soundmode)); continue; } *************** *** 294,298 **** bodyinfo.flags = flags.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid flags in bodyinfo file: %1.\n").arg(flags)); continue; } --- 294,298 ---- bodyinfo.flags = flags.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid flags in bodyinfo file: %1.\n").arg(flags)); continue; } *************** *** 306,310 **** bodyinfo.type = bodytype.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid bodytype in bodyinfo file: %1.\n").arg(bodytype)); continue; } --- 306,310 ---- bodyinfo.type = bodytype.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid bodytype in bodyinfo file: %1.\n").arg(bodytype)); continue; } *************** *** 441,445 **** { if (!id_.isEmpty()) { ! Console::instance()->log( LOG_WARNING, QString( "Missing item definition '%1'.\n" ).arg( id_ ) ); } return; --- 441,445 ---- { if (!id_.isEmpty()) { ! Console::instance()->log( LOG_WARNING, tr( "Missing item definition '%1'.\n" ).arg( id_ ) ); } return; Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** world.cpp 2 Oct 2004 22:15:51 -0000 1.133 --- world.cpp 9 Oct 2004 14:29:00 -0000 1.134 *************** *** 431,435 **** reader.open( filename ); ! Console::instance()->log( LOG_MESSAGE, QString( "Loading %1 objects from %2.\n" ).arg( reader.objectCount() ).arg( filename ) ); Console::instance()->send( "0%" ); Console::instance()->setProgress( "0%" ); --- 431,435 ---- reader.open( filename ); ! Console::instance()->log( LOG_MESSAGE, tr( "Loading %1 objects from %2.\n" ).arg( reader.objectCount() ).arg( filename ) ); Console::instance()->send( "0%" ); Console::instance()->setProgress( "0%" ); *************** *** 513,517 **** else if ( type != 0xFF ) { ! Console::instance()->log(LOG_ERROR, QString( "Invalid worldfile, unknown and unskippable type %1." ).arg( type ) ); return; } --- 513,517 ---- else if ( type != 0xFF ) { ! Console::instance()->log(LOG_ERROR, tr( "Invalid worldfile, unknown and unskippable type %1." ).arg( type ) ); return; } *************** *** 551,555 **** if ( !PersistentBroker::instance()->connect( Config::instance()->databaseHost(), Config::instance()->databaseName(), Config::instance()->databaseUsername(), Config::instance()->databasePassword() ) ) { ! throw QString( "Unable to open the world database." ); } --- 551,555 ---- if ( !PersistentBroker::instance()->connect( Config::instance()->databaseHost(), Config::instance()->databaseName(), Config::instance()->databaseUsername(), Config::instance()->databasePassword() ) ) { ! throw tr( "Unable to open the world database." ); } *************** *** 591,595 **** cPythonScript *script = ScriptManager::instance()->getGlobalHook(EVENT_UPDATEDATABASE); if (!script || !script->canHandleEvent(EVENT_UPDATEDATABASE)) { ! throw wpException(QString("Unable to load world database. Version mismatch: %1 != %2.").arg(db_version.toInt()).arg(DATABASE_VERSION)); } --- 591,595 ---- cPythonScript *script = ScriptManager::instance()->getGlobalHook(EVENT_UPDATEDATABASE); if (!script || !script->canHandleEvent(EVENT_UPDATEDATABASE)) { ! throw wpException(tr("Unable to load world database. Version mismatch: %1 != %2.").arg(db_version.toInt()).arg(DATABASE_VERSION)); } *************** *** 599,603 **** if (!result) { ! throw wpException(QString("Unable to load world database. Version mismatch: %1 != %2.").arg(db_version.toInt()).arg(DATABASE_VERSION)); } } --- 599,603 ---- if (!result) { ! throw wpException(tr("Unable to load world database. Version mismatch: %1 != %2.").arg(db_version.toInt()).arg(DATABASE_VERSION)); } } *************** *** 683,687 **** if ( pi->pos().x > max_x || pi->pos().y > max_y ) { ! Console::instance()->log( LOG_ERROR, QString( "Item with invalid position %1,%2,%3,%4.\n" ).arg( pi->pos().x ).arg( pi->pos().y ).arg( pi->pos().z ).arg( pi->pos().map ) ); deleteItems.append( pi ); continue; --- 683,687 ---- if ( pi->pos().x > max_x || pi->pos().y > max_y ) { ! Console::instance()->log( LOG_ERROR, tr( "Item with invalid position %1,%2,%3,%4.\n" ).arg( pi->pos().x ).arg( pi->pos().y ).arg( pi->pos().z ).arg( pi->pos().map ) ); deleteItems.append( pi ); continue; *************** *** 705,709 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Item with invalid container [0x%1].\n" ).arg( contserial, 0, 16 ) ); deleteItems.append( pi ); // Queue this item up for deletion continue; // Skip further processing --- 705,709 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Item with invalid container [0x%1].\n" ).arg( contserial, 0, 16 ) ); deleteItems.append( pi ); // Queue this item up for deletion continue; // Skip further processing *************** *** 840,844 **** unsigned int duration = getNormalizedTime() - loadStart; ! Console::instance()->log( LOG_MESSAGE, QString( "The world loaded in %1 ms.\n" ).arg( duration ) ); cComponent::load(); --- 840,844 ---- unsigned int duration = getNormalizedTime() - loadStart; ! Console::instance()->log( LOG_MESSAGE, tr( "The world loaded in %1 ms.\n" ).arg( duration ) ); cComponent::load(); *************** *** 849,853 **** Network::instance()->broadcast(tr("Worldsave Initialized")); ! Console::instance()->send( "Saving World..." ); setOption("db_version", WP_DATABASE_VERSION); // Make SURE it's saved --- 849,853 ---- Network::instance()->broadcast(tr("Worldsave Initialized")); ! Console::instance()->send( tr("Saving World...") ); setOption("db_version", WP_DATABASE_VERSION); // Make SURE it's saved *************** *** 934,938 **** } else { if (!PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver())) { ! Console::instance()->log( LOG_ERROR, QString( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) ); return; } --- 934,938 ---- } else { if (!PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver())) { ! Console::instance()->log( LOG_ERROR, tr( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) ); return; } *************** *** 941,945 **** PersistentBroker::instance()->connect( Config::instance()->databaseHost(), Config::instance()->databaseName(), Config::instance()->databaseUsername(), Config::instance()->databasePassword() ); } catch (QString& e) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't open the database: %1\n" ).arg( e ) ); return; } --- 941,945 ---- PersistentBroker::instance()->connect( Config::instance()->databaseHost(), Config::instance()->databaseName(), Config::instance()->databaseUsername(), Config::instance()->databasePassword() ); } catch (QString& e) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't open the database: %1\n" ).arg( e ) ); return; } *************** *** 1021,1028 **** Console::instance()->changeColor( WPC_GREEN ); ! Console::instance()->send( " Done" ); Console::instance()->changeColor( WPC_NORMAL ); ! Console::instance()->send( QString( " [%1ms]\n" ).arg( Server::instance()->time() - startTime ) ); } catch ( QString& e ) --- 1021,1028 ---- Console::instance()->changeColor( WPC_GREEN ); ! Console::instance()->send( tr(" Done") ); Console::instance()->changeColor( WPC_NORMAL ); ! Console::instance()->send( tr( " [%1ms]\n" ).arg( Server::instance()->time() - startTime ) ); } catch ( QString& e ) *************** *** 1031,1038 **** Console::instance()->changeColor( WPC_RED ); ! Console::instance()->send( " Failed\n" ); Console::instance()->changeColor( WPC_NORMAL ); ! Console::instance()->log( LOG_ERROR, "Saving failed: " + e ); } --- 1031,1038 ---- Console::instance()->changeColor( WPC_RED ); ! Console::instance()->send( tr(" Failed\n") ); Console::instance()->changeColor( WPC_NORMAL ); ! Console::instance()->log( LOG_ERROR, tr("Saving failed: %1").arg( e ) ); } *************** *** 1079,1083 **** if ( !object ) { ! Console::instance()->log( LOG_ERROR, "Couldn't register a NULL object in the world." ); return; } --- 1079,1083 ---- if ( !object ) { ! Console::instance()->log( LOG_ERROR, tr("Couldn't register a NULL object in the world.") ); return; } *************** *** 1090,1094 **** if ( !object ) { ! Console::instance()->log( LOG_ERROR, "Trying to register a null object in the World." ); return; } --- 1090,1094 ---- if ( !object ) { ! Console::instance()->log( LOG_ERROR, tr("Trying to register a null object in the World.") ); return; } *************** *** 1101,1105 **** if ( it != p->items.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to register an item with the Serial 0x%1 which is already in use." ).arg( serial, 0, 16 ) ); return; } --- 1101,1105 ---- if ( it != p->items.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to register an item with the Serial 0x%1 which is already in use." ).arg( serial, 0, 16 ) ); return; } *************** *** 1110,1114 **** if ( !pItem ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to register an object with an item serial (0x%1) which is no item." ).arg( serial, 0, 16 ) ); return; } --- 1110,1114 ---- if ( !pItem ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to register an object with an item serial (0x%1) which is no item." ).arg( serial, 0, 16 ) ); return; } *************** *** 1126,1130 **** if ( it != p->chars.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to register a character with the Serial 0x%1 which is already in use." ).arg( QString::number( serial, 0, 16 ) ) ); return; } --- 1126,1130 ---- if ( it != p->chars.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to register a character with the Serial 0x%1 which is already in use." ).arg( QString::number( serial, 0, 16 ) ) ); return; } *************** *** 1135,1139 **** if ( !pChar ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to register an object with a character serial (0x%1) which is no character." ).arg( QString::number( serial, 0, 16 ) ) ); return; } --- 1135,1139 ---- if ( !pChar ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to register an object with a character serial (0x%1) which is no character." ).arg( QString::number( serial, 0, 16 ) ) ); return; } *************** *** 1156,1160 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Tried to register an object with an invalid Serial (0x%1) in the World." ).arg( QString::number( serial, 0, 16 ) ) ); return; } --- 1156,1160 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Tried to register an object with an invalid Serial (0x%1) in the World." ).arg( QString::number( serial, 0, 16 ) ) ); return; } *************** *** 1165,1169 **** if ( !object ) { ! Console::instance()->log( LOG_ERROR, "Trying to unregister a null object from the world." ); return; } --- 1165,1169 ---- if ( !object ) { ! Console::instance()->log( LOG_ERROR, tr("Trying to unregister a null object from the world.") ); return; } *************** *** 1180,1184 **** if ( it == p->items.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to unregister a non-existing item with the serial 0x%1." ).arg( serial, 0, 16 ) ); return; } --- 1180,1184 ---- if ( it == p->items.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to unregister a non-existing item with the serial 0x%1." ).arg( serial, 0, 16 ) ); return; } *************** *** 1196,1200 **** if ( it == p->chars.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to unregister a non-existing character with the serial 0x%1." ).arg( serial, 0, 16 ) ); return; } --- 1196,1200 ---- if ( it == p->chars.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to unregister a non-existing character with the serial 0x%1." ).arg( serial, 0, 16 ) ); return; } *************** *** 1218,1222 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Trying to unregister an object with an invalid serial (0x%1)." ).arg( serial, 0, 16 ) ); return; } --- 1218,1222 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Trying to unregister an object with an invalid serial (0x%1)." ).arg( serial, 0, 16 ) ); return; } *************** *** 1269,1273 **** if ( !object ) { ! Console::instance()->log( LOG_ERROR, "Tried to delete a null object from the worldsave." ); return; } --- 1269,1273 ---- if ( !object ) { ! Console::instance()->log( LOG_ERROR, tr("Tried to delete a null object from the worldsave.") ); return; } *************** *** 1357,1361 **** if (!backup.isNull() && !QFile::remove( backupName + backup )) { ! Console::instance()->log(LOG_ERROR, QString("Unable to remove backup %1. No new backup has been created.\n").arg(backup)); return; } --- 1357,1361 ---- if (!backup.isNull() && !QFile::remove( backupName + backup )) { ! Console::instance()->log(LOG_ERROR, tr("Unable to remove backup %1. No new backup has been created.\n").arg(backup)); return; } Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** npc.cpp 3 Oct 2004 13:51:39 -0000 1.119 --- npc.cpp 9 Oct 2004 14:28:59 -0000 1.120 *************** *** 1412,1416 **** if ( !DefSection ) { ! Console::instance()->log( LOG_ERROR, QString( "Unable to create unscripted npc: %1\n" ).arg( section ) ); return NULL; } --- 1412,1416 ---- if ( !DefSection ) { ! Console::instance()->log( LOG_ERROR, tr( "Unable to create unscripted npc: %1\n" ).arg( section ) ); return NULL; } |
