More rebranding

30 files changed, 1763 insertions, 1763 deletions

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 85cd439d..a5a69c09 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -4,7 +4,7 @@ FIND_PACKAGE(Gettext REQUIRED)
 # we need our own version because the upstream one contains
 # a call to msgmerge (updating po files) which can't be
 # disabled
-MACRO(TMW_GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
+MACRO(MANA_GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
    # make it a real variable, so we can modify it here
    SET(_firstPoFile "${_firstPoFileArg}")
 
@@ -36,7 +36,7 @@ MACRO(TMW_GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
    ENDFOREACH (_currentPoFile )
 
    ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles})
-ENDMACRO(TMW_GETTEXT_CREATE_TRANSLATIONS )
+ENDMACRO(MANA_GETTEXT_CREATE_TRANSLATIONS )
 
 FILE(GLOB POFILES *.po)
-TMW_GETTEXT_CREATE_TRANSLATIONS(tmw.pot ALL ${POFILES})
+MANA_GETTEXT_CREATE_TRANSLATIONS(mana.pot ALL ${POFILES})
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8958a9e0..d34edc85 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -78,15 +78,15 @@ src/net/ea/partyhandler.cpp
 src/net/ea/playerhandler.cpp
 src/net/ea/specialhandler.cpp
 src/net/ea/tradehandler.cpp
-src/net/tmwserv/beinghandler.cpp
-src/net/tmwserv/charserverhandler.cpp
-src/net/tmwserv/chathandler.cpp
-src/net/tmwserv/generalhandler.cpp
-src/net/tmwserv/guildhandler.cpp
-src/net/tmwserv/loginhandler.cpp
-src/net/tmwserv/partyhandler.cpp
-src/net/tmwserv/playerhandler.cpp
-src/net/tmwserv/tradehandler.cpp
+src/net/manaserv/beinghandler.cpp
+src/net/manaserv/charserverhandler.cpp
+src/net/manaserv/chathandler.cpp
+src/net/manaserv/generalhandler.cpp
+src/net/manaserv/guildhandler.cpp
+src/net/manaserv/loginhandler.cpp
+src/net/manaserv/partyhandler.cpp
+src/net/manaserv/playerhandler.cpp
+src/net/manaserv/tradehandler.cpp
 src/playerrelations.cpp
 src/resources/itemdb.cpp
 src/resources/monsterdb.cpp
diff --git a/po/ar.po b/po/ar.po
index 5cf763b4..fd78bec5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,11 +1,11 @@
-# Arabic translation for tmw
+# Arabic translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-01-09 11:47+0000\n"
@@ -2101,7 +2101,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2234,27 +2234,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "القوّة:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "خفّة الحركة:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "نشاط:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "ذكاء:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "المهارة:"
 
@@ -2285,27 +2285,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "القوّة:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "خفّة الحركة:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "نشاط:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "ذكاء:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "المهارة:"
@@ -2498,7 +2498,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2507,9 +2507,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2596,23 +2596,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2620,39 +2620,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2808,11 +2808,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2855,130 +2855,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "قوّة الذات:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "قوّة الذات:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 4718e5f1..473bbf41 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,11 +1,11 @@
-# Catalan translation for tmw
+# Catalan translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-01-09 11:46+0000\n"
@@ -2093,7 +2093,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2225,27 +2225,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr ""
 
@@ -2276,27 +2276,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2489,7 +2489,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2498,9 +2498,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2587,23 +2587,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2611,39 +2611,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2799,11 +2799,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2846,130 +2846,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 876f4231..b4a6b2ed 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,11 +1,11 @@
-# Czech translation for tmw
+# Czech translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-03-26 13:00+0000\n"
@@ -2098,7 +2098,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2231,27 +2231,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Síla:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitalita:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Inteligence:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr ""
 
@@ -2282,27 +2282,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Síla:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalita:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligence:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2495,7 +2495,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2504,9 +2504,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2593,23 +2593,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2617,39 +2617,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2805,11 +2805,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2852,130 +2852,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 115ac01d..fbd753dc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,11 +1,11 @@
-# Danish translation for tmw
+# Danish translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
@@ -2251,7 +2251,7 @@ msgid " video mode: "
 msgstr " skærm opsætning: "
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2404,31 +2404,31 @@ msgid "Failed to delete character."
 msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 #, fuzzy
 msgid "Strength:"
 msgstr "Styrke"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 #, fuzzy
 msgid "Agility:"
 msgstr "Adræthed"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 #, fuzzy
 msgid "Vitality:"
 msgstr "Helbred"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 #, fuzzy
 msgid "Intelligence:"
 msgstr "Intelligens"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 #, fuzzy
 msgid "Dexterity:"
 msgstr "Behændighed"
@@ -2462,27 +2462,27 @@ msgstr "Tag af"
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Styrke"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Adræthed"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Helbred"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligens"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Behændighed"
@@ -2700,7 +2700,7 @@ msgstr "Fejlede i at skifte til "
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2709,9 +2709,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 #, fuzzy
 msgid "Unknown error"
 msgstr "Ukendt genstand"
@@ -2805,24 +2805,24 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr "Du er død."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Vi er ked af at måtte informere dig, om at din karakter var dræbt i kamp."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr "Du er ikke så levende som du engang har været."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "De kolder hænder der tilhøre Grim Reaper, griber ud efter din sjæl"
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr "Game Over!"
 
@@ -2831,7 +2831,7 @@ msgstr "Game Over!"
 msgid "Insert coin to continue."
 msgstr "Indsæt en mønt for at fortsætte"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2839,33 +2839,33 @@ msgstr ""
 "Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
 "sted."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr "Jeg går ud fra at dette ikke gik alt for godt."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr "Du vil gerne have dine ejendele identificeret?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Desværre, blev der aldrig fundet noget spor efter dig..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr "Udslettet."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr "Det ser ud til at du fik du hoved udleveret til dig."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
@@ -3027,12 +3027,12 @@ msgstr "Kunne ikke stjæle noget som helst..."
 msgid "Poison had no effect..."
 msgstr "Giften havde ingen effekt..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 #, fuzzy
 msgid "Request for Trade"
 msgstr "Ansøg om lov til at handle"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, fuzzy, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr " vil gerne handle med dig, vil du acceptere?"
@@ -3077,142 +3077,142 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr "Fejlede i at tilføje genstand af en ukendt grund."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Handel annulleret."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Handel er komplet."
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 #, fuzzy
 msgid "You died"
 msgstr "Du giver:"
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 #, fuzzy
 msgid "No gameservers are available."
 msgstr "Ingen opsætning tilgængelig"
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Viljestyrke:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Viljestyrke:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 #, fuzzy
 msgid "Error creating guild."
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 #, fuzzy
 msgid "Failed to promote member."
 msgstr "Fejlede i at skifte til "
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 #, fuzzy
 msgid "Server is full"
 msgstr "Server"
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 #, fuzzy
 msgid "New email address incorrect"
 msgstr "Skift e-mail adresse"
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 #, fuzzy
 msgid "Old email address incorrect"
 msgstr "Skift e-mail adresse"
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
 msgid "The new Email Address already exists."
 msgstr "Skift e-mail adresse"
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 #, fuzzy
 msgid "Wrong username or password"
 msgstr "Skift adgangskode"
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 #, fuzzy
 msgid "Username already exists"
 msgstr "Brugernavn er %s"
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 #, fuzzy
 msgid "Accepting incoming trade requests."
 msgstr "Accepter indkomne handels anmodninger"
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 #, fuzzy
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorer indkomne handels anmodninger"
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, fuzzy, c-format
 msgid "Trading with %s"
 msgstr "Handel med "
diff --git a/po/de.po b/po/de.po
index e0644675..fcedfd8f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2122,8 +2122,8 @@ msgid " video mode: "
 msgstr " Auflösung: "
 
 #: src/main.cpp:575
-msgid "tmw"
-msgstr "tmw"
+msgid "mana"
+msgstr "mana"
 
 #: src/main.cpp:576
 msgid "Options:"
@@ -2257,27 +2257,27 @@ msgid "Failed to delete character."
 msgstr "Spieler konnte nicht gelöscht werden."
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Stärke:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Agilität:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitalität:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Intelligenz:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Geschicklichkeit:"
 
@@ -2309,27 +2309,27 @@ msgstr "Kann Gegenstand nicht Ausrüsten."
 msgid "Unable to unequip."
 msgstr "Kann Gegenstand nicht ablegen."
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr "Stärke %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr "Beweglichkeit %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr "Gesundheit %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligenz %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Ausdauer %+d"
@@ -2536,7 +2536,7 @@ msgstr "Gegenstand konnte nicht benutzt werden."
 msgid "Account was not found. Please re-login."
 msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr "Altes Passwort fehlerhaft"
 
@@ -2545,9 +2545,9 @@ msgid "New password too short"
 msgstr "Das neue Passwort ist zu kurz"
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -2638,24 +2638,24 @@ msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr "Ach ja: Du bist Tot."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Es tut uns leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr "Du bist nicht länger lebendig."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Die kalten Hände des Sensemanns greifen nach Deiner Seele."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr "Game Over!"
 
@@ -2663,7 +2663,7 @@ msgstr "Game Over!"
 msgid "Insert coin to continue."
 msgstr "Insert coin to continue."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2671,7 +2671,7 @@ msgstr ""
 "Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
 "besserem Ort gegangen."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -2679,27 +2679,27 @@ msgstr ""
 "Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
 "nicht ganz so genial, wie Du dachtest..."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr "Ich glaube, das war nicht so gut."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr "Vernichtet."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2863,11 +2863,11 @@ msgstr "Konnte nichts stehlen..."
 msgid "Poison had no effect..."
 msgstr "Das Gift hatte keine Wirkung..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s möchte mit dir handeln, stimmst du zu?"
@@ -2913,130 +2913,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Handel abgebrochen."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Handel abgeschlossen."
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr " Drücke \"OK\" um neu anzufangen."
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr "Du bist tot."
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr "Kein Server verfügbar"
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Willenskraft:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr "Thema: %s"
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr "Willensstärke %+d"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr "Gilde erstellt."
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr "Feheler beim Erstellen der Gilde."
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr "Einladung gesendet."
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr "Mitglied wurde erfolgreich Befördert."
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr "Beförderung des Mitglieds gescheitert."
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "Fehlerhaftes Magiemerkmal"
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr "Bereits angemeldet"
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr "Server ist voll"
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr "Neues Passwort fehlerhaft"
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr "Neue Emailadresse ist fehlerhaft"
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr "Alte Emailadresse ist fehlerhaft"
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr "Die neue Emailadresse ist bereits vorhanden."
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr "Die Version des Spiels ist zu alt"
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr "Benutzername oder Passwort falsch"
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr "Benutzername, Passwort oder Emailadresse falsch"
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr "Benutzername bereits vorhanden"
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr "Emailadresse bereits vorhanden"
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr "Der Party beigetreten."
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr "%s ist der Party beigetreten."
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr "Akzeptiere eingehende Handelsanfragen."
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr "Ignoriere eingehende Handelsanfragen."
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr "Handele mit %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index 44098456..670ae465 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,11 +1,11 @@
-# English (United Kingdom) translation for tmw
+# English (United Kingdom) translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-01-09 11:48+0000\n"
@@ -2101,7 +2101,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2234,27 +2234,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Strength:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Agility:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitality:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
@@ -2285,27 +2285,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Strength:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agility:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitality:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Dexterity:"
@@ -2498,7 +2498,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2507,9 +2507,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2596,23 +2596,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2620,39 +2620,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2808,11 +2808,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2855,130 +2855,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Willpower:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Willpower:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 91746c60..3320ae26 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,11 +1,11 @@
-# Esperanto translation for tmw
+# Esperanto translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-01-09 11:34+0000\n"
@@ -2092,7 +2092,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2224,27 +2224,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr ""
 
@@ -2275,27 +2275,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2488,7 +2488,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2497,9 +2497,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2586,23 +2586,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2610,39 +2610,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2798,11 +2798,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2845,130 +2845,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 5bd4848e..4286d484 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,11 +1,11 @@
-# Spanish translation for tmw
+# Spanish translation for mana
 # Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-05-31 11:16+0000\n"
@@ -2111,8 +2111,8 @@ msgid " video mode: "
 msgstr " modo de video "
 
 #: src/main.cpp:575
-msgid "tmw"
-msgstr "TMW"
+msgid "mana"
+msgstr "mana"
 
 #: src/main.cpp:576
 msgid "Options:"
@@ -2243,27 +2243,27 @@ msgid "Failed to delete character."
 msgstr "no se pudo borrar personaje"
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Fuerza:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Agilidad:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitalidad:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Destreza:"
 
@@ -2294,27 +2294,27 @@ msgstr "no se pudo equipar"
 msgid "Unable to unequip."
 msgstr "no se pudo desequipar"
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr "fuerza %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr "agilidad %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr "vitalidad %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr "inteligencia %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Destreza %+d"
@@ -2512,7 +2512,7 @@ msgstr "No se pudo utilzar el objeto."
 msgid "Account was not found. Please re-login."
 msgstr "La cuenta no se encontro. Por favor conectese de nuevo."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr "la contraseña antigua es incorrecta"
 
@@ -2521,9 +2521,9 @@ msgid "New password too short"
 msgstr "La nueva contraseña es demasiada corta"
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr "Error desconocido."
 
@@ -2614,23 +2614,23 @@ msgstr "Por el momento no está soportado invitar de esta forma."
 msgid "%s is not in your party!"
 msgstr "%s no es de su grupo !"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr "Estás muerto."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Sentimos informarte de que tu personaje fue muerto en batalla."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr "Te quedaste sin vida/"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Las manos heladas de la muerte se llevaron tu alma."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr "¡Fin del juego!"
 
@@ -2638,7 +2638,7 @@ msgstr "¡Fin del juego!"
 msgid "Insert coin to continue."
 msgstr "Inserta una moneda para continuar."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2646,34 +2646,34 @@ msgstr ""
 "No, niños. Tu personaje no murió realmente. Él... eeh... se marchó a un "
 "lugar mejor."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 "Falló tu plan de romper el arma de tus enemigos golpeándola con tu garganta."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr "Creo que esto no funcionó muy bien."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr "¿Quieres que tus posesiones sean identificadas?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Lamentablemente, ningún rastro tuyo fue encontrado nunca."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr "Parce que te volaron la cabeza."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2833,11 +2833,11 @@ msgstr "No pudiste robar nada"
 msgid "Poison had no effect..."
 msgstr "el veneno no tuvo efecto"
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr "Peticion de intercambio"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s desea realizar un intercambio con Usted. Accepta ?"
@@ -2882,130 +2882,130 @@ msgstr "no se pudo añadir el objeto , tu compañero no tiene espacio"
 msgid "Failed adding item for unknown reason."
 msgstr "no se pudo añadir el objeto , razon desconocida"
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "trato cancelado"
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "trato completado"
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr " pulsa OK para volver a la vida"
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr "Has muerto"
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr "no hay servidores de juego disponibles"
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Fuerza de voluntad:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr "Tema: %s"
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr "fuerza de voluntad: %+d"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr "Guild créada."
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr "Eror al crear la guild."
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr "Invitacion enviada."
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr "El miembro ha sido promovido con exito."
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr "Fallo al Promover el miembro"
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "ficha de magia erronea"
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr "ya estas conectado"
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr "el servidor esta lleno"
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr "la nueva contraseña es incorrecta"
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "cuenta no conectada , conectate primero"
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr "Nueva Direccion de E-mail erronea"
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr "Antigua dirreccion de E-mail erronea"
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr "la nueva direccion de E-mail ya existe"
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr "La version de tu cliente es demasiado antigua"
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr "nombre de usuario o contraseña incorrectos"
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr "nombre de usuario , contraseña o Email incorrectos"
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr "ese nombre ya existe"
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr "ese E-mail ya existe"
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr "Grupo juntado."
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr "%s se ha juntado al grupo."
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr "Acceptar las peticiones de intercambio."
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorar las peticiones de intercambio."
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr "Intercambiar con %s"
diff --git a/po/fi.po b/po/fi.po
index b6c4c61e..6b1186f0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,11 +1,11 @@
-# Finnish translation for tmw
+# Finnish translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-04-21 16:37+0000\n"
@@ -2101,7 +2101,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2234,27 +2234,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Voima:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Ketteryys:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Elinvoima:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Älykkyys:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Näppäryys:"
 
@@ -2285,27 +2285,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Voima:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Ketteryys:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Elinvoima:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Älykkyys:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Näppäryys:"
@@ -2498,7 +2498,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2507,9 +2507,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2596,23 +2596,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2620,39 +2620,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2808,11 +2808,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2855,130 +2855,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Tahdonvoima:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Tahdonvoima:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 867f8cdf..2461fc41 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2131,8 +2131,8 @@ msgid " video mode: "
 msgstr " mode d'affichage "
 
 #: src/main.cpp:575
-msgid "tmw"
-msgstr "tmw"
+msgid "mana"
+msgstr "mana"
 
 #: src/main.cpp:576
 msgid "Options:"
@@ -2271,27 +2271,27 @@ msgid "Failed to delete character."
 msgstr "La suppresion du personnage n'a pu s\"effectuer."
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Force :"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Agilité :"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitalité :"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Intelligence :"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Dextérité :"
 
@@ -2323,27 +2323,27 @@ msgstr "Impossible d'équiper cet objet."
 msgid "Unable to unequip."
 msgstr "Impossible de deséquiper cet objet."
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr "Force %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr "Agilité %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitalité %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Dextérité %+d"
@@ -2545,7 +2545,7 @@ msgstr "Impossible d'utiliser l'objet."
 msgid "Account was not found. Please re-login."
 msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr "Ancien mot de passe incorrect"
 
@@ -2554,9 +2554,9 @@ msgid "New password too short"
 msgstr "Nouveau mot de passe trop court"
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -2647,25 +2647,25 @@ msgstr "Cette manière d'inviter n'est pas en place actuellement."
 msgid "%s is not in your party!"
 msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr "Vous êtes mort."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Nous avons le regret de vous informer que votre personnage est mort sur le "
 "champ de bataille."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr "Vous n'êtes plus vraiment en vie."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr "Jeu terminé !"
 
@@ -2673,7 +2673,7 @@ msgstr "Jeu terminé !"
 msgid "Insert coin to continue."
 msgstr "veuillez insérer une pièce pour continuer."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2681,7 +2681,7 @@ msgstr ""
 "No, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
 "il... est parti dans un monde meilleur."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -2689,27 +2689,27 @@ msgstr ""
 "Votre plan de casser l'arme de votre ennemi en la frappant avec votre gorge "
 "a échoué."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr "Voulez-vous que vos biens soient identifiés ?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr "Vaporisé."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr "Il semble que l'on vous ait rendu votre tête."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2873,11 +2873,11 @@ msgstr "Vous n'avez rien pu voler..."
 msgid "Poison had no effect..."
 msgstr "Le poison fut sans effet..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
@@ -2924,130 +2924,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr "Impossible de rajouter un objet pour une raison inconnue."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Echange annulé."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Echange finalisé."
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr " Cliquer sur OK pour ressuciter"
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr "Vous êtes mort"
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr "Pas de serveur de jeu disponible."
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Volonté :"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr "Sujet : %s"
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr "Volonté %+d"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr "Guilde créée."
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr "Erreur lors de la création de la guilde."
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr "Invitation envoyée."
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr "La promotion de ce membre a réussie."
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr "Echec lors de la promotion du membre"
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "Mauvaise empreinte magique"
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr "Déjà connecté"
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr "Le serveur est plein"
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr "Nouveau mot de passe incorrect"
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "Compte non connecté. Identifiez-vous tout d'abord."
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr "Nouvelle adresse email incorrecte"
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr "Ancienne adresse email incorrecte"
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr "Cette nouvelle adresse email existe déjà."
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr "La version de votre client est trop ancienne."
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe."
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr "Mauvais nom d'utilisateur, mot de passe ou adrese email."
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr "Ce nom d'utilisateur existe déjà"
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr "Cette adresse email existe déjà"
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr "Groupe rejoind."
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr "%s a rejoind le groupe."
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr "Accepter les demandes d'échanges."
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorer les demandes d'échanges."
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr "Echange avec %s"
diff --git a/po/he.po b/po/he.po
index 8e092d75..c7bf14c6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,11 +1,11 @@
-# Hebrew translation for tmw
+# Hebrew translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-06-02 15:28+0000\n"
@@ -2104,8 +2104,8 @@ msgid " video mode: "
 msgstr " מצב וידאו: "
 
 #: src/main.cpp:575
-msgid "tmw"
-msgstr "tmw"
+msgid "mana"
+msgstr "mana"
 
 #: src/main.cpp:576
 msgid "Options:"
@@ -2236,27 +2236,27 @@ msgid "Failed to delete character."
 msgstr "נכשל במחיקת השחקן."
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "עוצמה:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "זריזות:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "חיוניות:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "תבונה:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "מיומנות:"
 
@@ -2287,27 +2287,27 @@ msgstr "לא ניתן ללבוש."
 msgid "Unable to unequip."
 msgstr "לא ניתן להסיר."
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr "עוצמה %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr "זריזות %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr "חיוניות %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr "תבונה %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr "מיומנות %+d"
@@ -2504,7 +2504,7 @@ msgstr "נכשל בשימוש בחפץ."
 msgid "Account was not found. Please re-login."
 msgstr "החשבון לא נמצא. אנא נסה להתחבר שנית."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr "הסיסמה הישנה שגויה"
 
@@ -2513,9 +2513,9 @@ msgid "New password too short"
 msgstr "הסיסמה החדשה קצרה מדי"
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr "שגיאה לא ידועה"
 
@@ -2604,23 +2604,23 @@ msgstr "הזמנה בדרך זו אינה נתמכת כרגע."
 msgid "%s is not in your party!"
 msgstr "%s אינו נמצא בחגיגתך!"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr "אתה מת."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "צר לנו לבשר לכם כי שחקנכם נהרג בקרב."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr "אינך חי כל־כך כרגע."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "קור ידיו של המוות הקודר אוחזים בנשמתך."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr "המשחק נגמר!"
 
@@ -2628,39 +2628,39 @@ msgstr "המשחק נגמר!"
 msgid "Insert coin to continue."
 msgstr "הכנס מטבע כדי להמשיך."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "לא, ילדים. השחקן שלכם לא באמת מת. הוא... אה... הלך למקום טוב יותר."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "תוכניתך לשבור את נשק האויב באמצות צווארך נכשלה."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr "אני מניח שלא הלך לך כל־כך טוב."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr "האם ברצונך שיאתרו את חלקי גופתך?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr "באופן מצער, מעולם לא נמצא זכר ממך..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr "הושמדתך."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr "נראה כאילו ראשך נמסר אליך."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "פישלת שוב, גופתך תיזרק לצינוק ותקבל אחת חדשה."
@@ -2816,11 +2816,11 @@ msgstr "לא היה ניתן לגנוב דבר..."
 msgid "Poison had no effect..."
 msgstr "לרעל לא הייתה כל השפעה..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr "בקשה למסחר"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
@@ -2863,130 +2863,130 @@ msgstr "נכשל בהוספת חפץ. לשותף למסחר אין מקומות
 msgid "Failed adding item for unknown reason."
 msgstr "נכשל בהוספת חפץ מסיבה לא ידועה."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "המסחר בוטל."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "המסחר הושלם."
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr " לחץ אישור כדי להשיב"
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr "נהרגת"
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr "אין שרתי משחק זמינים."
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "כח רצון:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr "כותרת: %s"
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr "כח רצון %+d"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr "גילדה נוצרה."
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr "שגיאה ביצירת גילדה."
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr "הזמנה נשלחה."
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr "החבר קודם בהצלחה."
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr "נכשל בקידום החבר."
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "magic_token שגוי"
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr "כבר מחובר"
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr "השרת מלא"
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr "הסיסמה החדשה שגויה"
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "החשבון אינו מחובר. אנא קודם־כל התחבר."
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr "כתובת דוא\"ל חדשה שגויה"
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr "כתובת דוא\"ל ישנה שגויה"
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr "כתובת הדוא\"ל החדשה כבר בשימוש."
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr "גרסת הקליינט ישנה מדי"
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr "שם משתמש או סיסמה שגויים"
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr "שם משתמש, סיסמה או דוא\"ל שגויים"
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr "שם המשתמש כבר בשימוש"
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr "כתובת הדוא\"ל כבר בשימוש"
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr "הצטרפת לחגיגה."
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr "%s הצטרף לחגיגה."
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr "מקבל בקשות מסחר נכנסות."
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr "מתעלם מבקשות סחר נכנסות."
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr "סוחר עם%s"
diff --git a/po/hr.po b/po/hr.po
index b0d9dc17..7388a741 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,11 +1,11 @@
-# Croatian translation for tmw
+# Croatian translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-04-21 16:37+0000\n"
@@ -2103,7 +2103,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2236,27 +2236,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Snaga:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Okretnost:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitalnost:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Inteligencija:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Spretnost:"
 
@@ -2287,27 +2287,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Snaga:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Okretnost:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalnost:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencija:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Spretnost:"
@@ -2500,7 +2500,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2509,9 +2509,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2598,23 +2598,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2622,39 +2622,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2810,11 +2810,11 @@ msgstr "Krađa nije uspjela..."
 msgid "Poison had no effect..."
 msgstr "Otrov nije uspio..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2857,131 +2857,131 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Snaga volje:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Snaga volje:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 #, fuzzy
 msgid "Error creating guild."
 msgstr "Neuspjelo stvaranje lika!"
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 74dfe8af..df3dde32 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,11 +1,11 @@
-# Indonesian translation for tmw
+# Indonesian translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-01-09 12:22+0000\n"
@@ -2100,7 +2100,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2233,27 +2233,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Kekuatan"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Daya/Tenaga Hidup"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Kecerdasan"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Ketangkasan"
 
@@ -2284,27 +2284,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Kekuatan"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Kecerdasan"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Ketangkasan"
@@ -2497,7 +2497,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2506,9 +2506,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2595,23 +2595,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2619,39 +2619,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2807,11 +2807,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2854,130 +2854,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Ketekunan"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Ketekunan"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index e58d1dc6..b93967af 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2103,7 +2103,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2236,27 +2236,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Forza:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Agilità:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitalità:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Intelligenza:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Destrezza:"
 
@@ -2287,27 +2287,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Forza:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agilità:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalità:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligenza:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Destrezza:"
@@ -2500,7 +2500,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2509,9 +2509,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2598,23 +2598,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr "Sei morto."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia. Ora dormi sepolto in un campo di grano, non è la rosa non è il tulipano che ti fan veglia dall'ombra dei fossi, ma sono mille papaveri rossi."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr "Non sei più cosi vivo."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Le fredde mani della morte nera si stanno aggrappando alla tua squallida anima."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2622,39 +2622,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "No, piccolo. Il tuo personaggio non è veramente morto. Lui... ehm... è andato in un posto migliore."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "Il tuo piano di rompere le armi nemiche colpendole con la tua gola è fallito."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr "Sembra proprio che non ha funzionato tanto bene."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr "Vuoi che i tuoi beni vengano identificati?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Tristemente, nessuna traccia di te è stata mai ritrovata..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr "Annichilato."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr "Sembra che almeno la tua testa ti sia stata restituita."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Sei stato accartocciato di nuovo, scarica il tuo corpo nelle fogne e cercatene un altro."
@@ -2810,11 +2810,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2857,130 +2857,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Scambio annullato."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Scambio completato."
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr "Sei morto"
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr "Nessun gameserver disponibile."
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Volontà:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr "Argomento: %s"
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Volontà:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr "Gilda creata."
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr "Errore nella creazione della gilda."
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr "Invito inviato."
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr "Membro promosso con successo."
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr "Impossibile promuovere membro."
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr "Login già effettuato"
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr "Il server è pieno"
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr "Nuova password non corretta"
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "Account non connesso. Per favore, effettuare prima il login"
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr "Nuovo indirizzo email non corretto"
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr "Vecchio indirizzo email non corretto"
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr "Nuovo indirizzo email già presente."
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr "Versione del client troppo vecchia"
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr "Username o password non corretti"
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr "Username, passowrd o indirizzo email non corretti"
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr "Username già presente"
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr "Indirizzo email già presente"
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr "Entrato nel party."
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr "%s è entrato nel party."
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr "Commercia con %s"
diff --git a/po/ja.po b/po/ja.po
index 23e40944..70320769 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,11 +1,11 @@
-# Japanese translation for tmw
+# Japanese translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-01-09 12:31+0000\n"
@@ -2096,7 +2096,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2228,27 +2228,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "筋力:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "素早さ:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "体力:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "知性:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "敏捷:"
 
@@ -2279,27 +2279,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "筋力:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "素早さ:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "体力:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "知性:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "敏捷:"
@@ -2492,7 +2492,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2501,9 +2501,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2590,23 +2590,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2614,39 +2614,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2802,11 +2802,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2849,130 +2849,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "精神:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "精神:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/tmw.pot b/po/mana.pot
index 68696187..b1946f02 100644
--- a/po/tmw.pot
+++ b/po/mana.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The Mana World Development Team
+# Copyright (C) YEAR Mana Development Team
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -2091,7 +2091,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2223,27 +2223,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr ""
 
@@ -2274,27 +2274,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2487,7 +2487,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2496,9 +2496,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2585,23 +2585,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2609,39 +2609,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2797,11 +2797,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2844,130 +2844,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/nds.po b/po/nds.po
index f3c7a8bd..5406aae9 100644
--- a/po/nds.po
+++ b/po/nds.po
@@ -1,11 +1,11 @@
-# German, Low translation for tmw
+# German, Low translation for mana
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-04-21 17:27+0200\n"
 "PO-Revision-Date: 2009-04-21 16:38+0000\n"
@@ -327,16 +327,16 @@ msgid "You give:"
 msgstr "Du gibst:"
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Stärke"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Intelligenz"
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Willenskraft"
 
@@ -2075,7 +2075,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:562
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:563
@@ -2207,17 +2207,17 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr ""
 
@@ -2248,27 +2248,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:90 src/net/tmwserv/generalhandler.cpp:80
+#: src/net/ea/generalhandler.cpp:90 src/net/manaserv/generalhandler.cpp:80
 #, c-format
 msgid "Strength: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Agility: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Vitality: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:96 src/net/manaserv/generalhandler.cpp:88
 #, c-format
 msgid "Intelligence: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:98 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity: %d"
 msgstr ""
@@ -2526,23 +2526,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2550,39 +2550,39 @@ msgstr ""
 msgid "Insert coin to continue"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:121 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:123 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:125 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:127 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:129 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2794,23 +2794,23 @@ msgstr ""
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:151
+#: src/net/manaserv/chathandler.cpp:151
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:90
+#: src/net/manaserv/generalhandler.cpp:90
 #, c-format
 msgid "Willpower: %d"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 7a737a29..965f9b97 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2103,7 +2103,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2236,27 +2236,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Sterkte:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Agiliteit:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
@@ -2287,27 +2287,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Sterkte:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agiliteit:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitaliteit:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligentie:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Dexteriteit:"
@@ -2500,7 +2500,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2509,9 +2509,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2598,23 +2598,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2622,39 +2622,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2810,11 +2810,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2857,130 +2857,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Wilskracht:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Wilskracht:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 7f20952a..b57b8707 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2112,8 +2112,8 @@ msgid " video mode: "
 msgstr " tryb wideo: "
 
 #: src/main.cpp:575
-msgid "tmw"
-msgstr "tmw"
+msgid "mana"
+msgstr "mana"
 
 #: src/main.cpp:576
 msgid "Options:"
@@ -2245,27 +2245,27 @@ msgid "Failed to delete character."
 msgstr "Usunięcie gracza nie powiodło się."
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Siła:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Zwinność:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Witalność:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Inteligencja:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Zręczność:"
 
@@ -2296,27 +2296,27 @@ msgstr "Nie można założyć."
 msgid "Unable to unequip."
 msgstr "Nie można zdjąć."
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr "Siła %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr "Zwinność %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr "Witalność %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencja %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Zręczność %+d"
@@ -2514,7 +2514,7 @@ msgstr "Użycie przedmiotu nie powiodło się."
 msgid "Account was not found. Please re-login."
 msgstr "Nie znaleziono Konta. Proszę zalogować się ponownie."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr "Stare hasło jest nieprawidłowe"
 
@@ -2523,9 +2523,9 @@ msgid "New password too short"
 msgstr "Nowe hasło jest za krótkie"
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
@@ -2614,23 +2614,23 @@ msgstr "Zapraszanie w ten sposób nie jest obecnie wspierane."
 msgid "%s is not in your party!"
 msgstr "%s nie jest w twojej grupie!"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr "Jesteś martwy."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr "Już nie jesteś taki żywy."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr "Koniec gry!"
 
@@ -2638,7 +2638,7 @@ msgstr "Koniec gry!"
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2646,7 +2646,7 @@ msgstr ""
 "Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
 "do lepszego miejsca."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -2654,27 +2654,27 @@ msgstr ""
 "Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem "
 "zawiódł."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr "Czy chesz zidentyfikować twoje rzeczy?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Niestety, ślad po tobie zaginął..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr "Unicestwiony."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr "Wygląda na to, że podano tobie twoją głowę."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe."
@@ -2830,11 +2830,11 @@ msgstr "Nie mogę nic ukraść..."
 msgid "Poison had no effect..."
 msgstr "Trucizna nie zadziałała..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr "Prośba o Handel"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s chce handlować z tobą, zgadzasz się?"
@@ -2878,130 +2878,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr "Dodanie przedmiotu nie powiodło się z nieznanego powodu."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Handel anulowany."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Handel zakończony."
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr " Naciśnij OK, aby się odrodzić"
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr "Umarłeś"
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr "Brak dostępnych serwerów gier"
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Siła woli:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr "Temat: %s"
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr "Siła woli %+d"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr "Gildia została utworzona."
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr "Błąd podczas tworzenia gildii."
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr "Zaproszenie wysłane."
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr "Członek został pomyślnie wypromowany."
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr "Promocja Członka nie powiodła się."
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "Zły magic_token"
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr "Już zalogowany"
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr "Serwer jest pełny"
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr "Nowe hasło jest nieprawidłowe"
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "Konto niepołączone. Proszę najpierw się zalogować."
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr "Nowy adres email jest niepoprawny"
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr "Stary adres email jest niepoprawny"
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr "Nowy Adres Email już istnieje"
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr "Wersja klienta jest zbyt stara"
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr "Zła nazwa użytkownika lub hasło"
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr "Zła nazwa użytkownika, hasło, lub adres email"
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr "Nazwa użytkownika już istnieje"
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr "Adres email już istnieje"
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr "Dołączono do grupy."
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr "%s dołączył do grupy."
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr "Akceptowanie nadchodzących próśb o handel."
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorowanie nadchodzących próśb o handel."
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr "Handel z %s"
diff --git a/po/pt.po b/po/pt.po
index 4a5c014c..6e1089e4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,11 +1,11 @@
-# Portuguese translation for tmw
+# Portuguese translation for mana
 # Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-06-06 21:57+0000\n"
@@ -2092,7 +2092,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2224,27 +2224,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Força:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Agilidade:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Destreza:"
 
@@ -2275,27 +2275,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2488,7 +2488,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2497,9 +2497,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2586,23 +2586,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2610,39 +2610,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2798,11 +2798,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2845,130 +2845,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Força de Vontade:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cd586825..d299b655 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,11 +1,11 @@
-# Brazilian Portuguese translation for tmw
+# Brazilian Portuguese translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-05-19 23:56+0000\n"
@@ -2099,7 +2099,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2232,27 +2232,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Força:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Agilidade:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Destreza:"
 
@@ -2283,27 +2283,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2496,7 +2496,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2505,9 +2505,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2594,23 +2594,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2618,39 +2618,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2806,11 +2806,11 @@ msgstr "Não foi possível roubar nada..."
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2853,131 +2853,131 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Força de Vontade:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 #, fuzzy
 msgid "Error creating guild."
 msgstr "Falha ao criar Chat!"
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 000ca5ba..8d92a547 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,11 +1,11 @@
-# Russian translation for tmw
+# Russian translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-05-11 20:01+0000\n"
@@ -2094,7 +2094,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2227,27 +2227,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Сила:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Выносливость:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Живучесть:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Интеллект:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Ловкость:"
 
@@ -2278,27 +2278,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Сила"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Выносливость:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Живучесть:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Интеллект"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Ловкость"
@@ -2491,7 +2491,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2500,9 +2500,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2589,23 +2589,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2613,39 +2613,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2801,11 +2801,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2848,130 +2848,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Сила волиr:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Сила волиr:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index c8951b0a..27ddbcbe 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,11 +1,11 @@
-# Slovak translation for tmw
+# Slovak translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-04-07 18:10+0000\n"
@@ -2102,7 +2102,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2235,27 +2235,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Sila:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr ""
 
@@ -2286,27 +2286,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Sila:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencia:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2499,7 +2499,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2508,9 +2508,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2597,23 +2597,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2621,39 +2621,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2809,11 +2809,11 @@ msgstr "Nedá sa kradnúť ..."
 msgid "Poison had no effect..."
 msgstr "Jed nemá žiaden účinnok ..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2856,131 +2856,131 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 #, fuzzy
 msgid "Error creating guild."
 msgstr "Vytvorenie postavy sa nepodarilo"
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 6b10cff2..87eab448 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,11 +1,11 @@
-# Swedish translation for tmw
+# Swedish translation for mana
 # Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-06-02 14:28+0000\n"
@@ -2115,8 +2115,8 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
-msgstr "tmw"
+msgid "mana"
+msgstr "mana"
 
 #: src/main.cpp:576
 msgid "Options:"
@@ -2247,27 +2247,27 @@ msgid "Failed to delete character."
 msgstr "Kunde inte ta bort karaktär."
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Styrka:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Smidighet:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Hälsa:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Intelligens:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Skicklighet:"
 
@@ -2298,27 +2298,27 @@ msgstr "Kan inte utrusta."
 msgid "Unable to unequip."
 msgstr "Kan inte avrusta."
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr "Styrka %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr "Livskraft %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligens %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2519,7 +2519,7 @@ msgstr "Kunde inte använda föremål."
 msgid "Account was not found. Please re-login."
 msgstr "Kontot kunde inte hittas. Var vänlig att logga in på nytt."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr "Det gamla lösenordet är fel"
 
@@ -2528,9 +2528,9 @@ msgid "New password too short"
 msgstr "Det nya lösenordet är för kort"
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -2620,24 +2620,24 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%s är inte med i din grupp!"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr "Du är död."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Vi beklagar att behöva meddela dig om att din karaktär dödades i strid."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr "Du är inte så värst levande längre."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Liemannens svala händer sträcker sig efter din själ."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr "Spelet är slut!"
 
@@ -2645,7 +2645,7 @@ msgstr "Spelet är slut!"
 msgid "Insert coin to continue."
 msgstr "Stoppa i mynt för att fortsätta."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2653,7 +2653,7 @@ msgstr ""
 "Barn, barn. Din karaktär dog egentligen inte. Den… öh… kom till ett bättre "
 "ställe."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -2661,27 +2661,27 @@ msgstr ""
 "Din plan att ha sönder dina fiendens vapen genom att krossa dem med din hals "
 "misslyckades."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr "Jag antar att det kunde gått bättre."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr "Vill du att dina tillhörigheter ska identifieras?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Ledsamt nog så kunde inga spår efter dig någonsin hittas…"
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr "Tillintetgjord."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr "Verkar som att som att någon gav dig ditt huvud."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2840,11 +2840,11 @@ msgstr "Kunde inte stjäla något..."
 msgid "Poison had no effect..."
 msgstr "Giftet tog inte..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr "Förfrågan om byteshandel"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vill byteshandla med dig, accepterar du?"
@@ -2887,130 +2887,130 @@ msgstr "Kunde inte lägga till föremål. Bytespartnern har inget ledigt utrymme
 msgid "Failed adding item for unknown reason."
 msgstr "Kunde inte lägga till föremål av okänd anledning."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Byteshandel avbruten."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Byteshandel genomförd."
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr " Klicka okej för att återuppstå"
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr "Du dog"
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr "Ingen spelserver finns tillgänglig."
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Viljestyrka:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr "Ämne: %s"
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr "Viljekraft %+d"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr "Gille skapat."
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr "Kunde inte skapa gille."
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr "Inbjudan skickad."
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr "Medlem befordrad."
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr "Kunde inte befordra medlem."
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "Fel magic_token"
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr "Redan inloggad"
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr "Servern är full"
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr "Det nya lösenordet stämmer inte överens"
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "Kontot är inte anslutet. Var god logga in först."
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr "Den nya epostadressen är felaktig."
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr "Den gamla epostadressen är fel."
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr "Den nya epostadressen används redan."
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr "Du har en för gammal version av klienten"
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr "Felaktigt användarnamn eller lösenord"
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr "Felaktigt användarnamn, lösenord eller epostadress"
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr "Användarnamnet finns redan"
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr "Epostadressen finns redan"
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr "Anslöt dig till grupp."
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr "%s anslöt sig till gruppen."
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr "Accepterar byteshandelsförfrågningar."
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorerar byteshandelsförfrågningar."
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr "Byteshandlar med %s"
diff --git a/po/th.po b/po/th.po
index 5216b17c..70ab1cb9 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,11 +1,11 @@
-# Thai translation for tmw
+# Thai translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-01-09 12:37+0000\n"
@@ -2095,7 +2095,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2228,27 +2228,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "Strength:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "Agility:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "Vitality:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
@@ -2279,27 +2279,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Strength:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agility:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitality:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Dexterity:"
@@ -2492,7 +2492,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2501,9 +2501,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2590,23 +2590,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2614,39 +2614,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2802,11 +2802,11 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2849,130 +2849,130 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "Willpower:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Willpower:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index adedbee3..36a591a6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,12 +1,12 @@
-# Simplified Chinese translation for tmw
+# Simplified Chinese translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 #
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 # Hong Hao <oahong@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-06-05 16:09+0000\n"
@@ -2098,7 +2098,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2230,27 +2230,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "力量："
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "敏捷："
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "生命："
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "智力："
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "智慧："
 
@@ -2281,27 +2281,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr "力量 %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr "敏捷 %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr "生命 %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr "智慧 %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr "敏捷 %+d"
@@ -2494,7 +2494,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr "原密码错误"
 
@@ -2503,9 +2503,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2592,23 +2592,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2616,39 +2616,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2804,11 +2804,11 @@ msgstr "无法偷取任何物品..."
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2851,130 +2851,130 @@ msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
 msgid "Failed adding item for unknown reason."
 msgstr "添加项目失败，原因未知。"
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "交易取消。"
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "交易完成。"
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr "无 游戏服务器 可用。"
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "意志力："
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr "意志力 %+d"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "错误的 magic_token"
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr "已经登录"
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr "服务器满载"
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr "新密码错误"
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "账户未连接。请先登录。"
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr "新电子邮件地址不正确"
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr "原电子邮件地址不正确"
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr "新电子邮件地址已经存在。"
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr "客户端版本太旧"
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr "错误的用户名或密码"
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr "错误的用户名，密码或者电子邮件地址"
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr "用户名已存在"
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr "电子邮件地址已存在"
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 7e9d1aff..392378fd 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,12 +1,12 @@
-# Traditional Chinese translation for tmw
+# Traditional Chinese translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 # SECOND AUTHOR <NETWAREBOSS>,2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-05-05 10:15+0000\n"
@@ -2111,7 +2111,7 @@ msgid " video mode: "
 msgstr ""
 
 #: src/main.cpp:575
-msgid "tmw"
+msgid "mana"
 msgstr ""
 
 #: src/main.cpp:576
@@ -2245,27 +2245,27 @@ msgid "Failed to delete character."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr ""
 
@@ -2296,27 +2296,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "力量"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "敏捷"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "體力"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "智力"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "閃躲"
@@ -2509,7 +2509,7 @@ msgstr ""
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr ""
 
@@ -2518,9 +2518,9 @@ msgid "New password too short"
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
@@ -2607,23 +2607,23 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
@@ -2631,39 +2631,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -2819,11 +2819,11 @@ msgstr "無法偷取任何物品..."
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2866,131 +2866,131 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr ""
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "意志力:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "意志力:"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 #, fuzzy
 msgid "Error creating guild."
 msgstr "聊天新增失敗！"
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, c-format
 msgid "Trading with %s"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 75dd29e5..610bea5e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,12 +1,12 @@
-# Traditional Chinese translation for tmw
+# Traditional Chinese translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the tmw package.
+# This file is distributed under the same license as the mana package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 # SECOND AUTHOR <NETWAREBOSS>,2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tmw\n"
+"Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2009-06-09 21:24+0200\n"
 "PO-Revision-Date: 2009-05-15 02:25+0000\n"
@@ -2106,8 +2106,8 @@ msgid " video mode: "
 msgstr " 視訊模式: "
 
 #: src/main.cpp:575
-msgid "tmw"
-msgstr "tmw"
+msgid "mana"
+msgstr "mana"
 
 #: src/main.cpp:576
 msgid "Options:"
@@ -2246,27 +2246,27 @@ msgid "Failed to delete character."
 msgstr "刪除角色失敗。"
 
 #: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
+#: src/net/manaserv/charserverhandler.cpp:253
 msgid "Strength:"
 msgstr "力量:"
 
 #: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
+#: src/net/manaserv/charserverhandler.cpp:254
 msgid "Agility:"
 msgstr "敏捷:"
 
 #: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
+#: src/net/manaserv/charserverhandler.cpp:256
 msgid "Vitality:"
 msgstr "體力:"
 
 #: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
+#: src/net/manaserv/charserverhandler.cpp:257
 msgid "Intelligence:"
 msgstr "智力:"
 
 #: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
+#: src/net/manaserv/charserverhandler.cpp:255
 msgid "Dexterity:"
 msgstr "閃躲:"
 
@@ -2299,27 +2299,27 @@ msgstr "無法裝備。"
 msgid "Unable to unequip."
 msgstr "無法卸下裝備。"
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr "力量 %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr "敏捷 %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr "體力 %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr "智力 %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr "閃躲 %+d"
@@ -2519,7 +2519,7 @@ msgstr "使用物品失敗"
 msgid "Account was not found. Please re-login."
 msgstr "帳號還沒連線,請先登入"
 
-#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
 msgid "Old password incorrect"
 msgstr "舊密碼輸入錯誤"
 
@@ -2529,9 +2529,9 @@ msgid "New password too short"
 msgstr "新密碼不正確"
 
 #: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/tmwserv/loginhandler.cpp:89 src/net/tmwserv/loginhandler.cpp:119
-#: src/net/tmwserv/loginhandler.cpp:152 src/net/tmwserv/loginhandler.cpp:188
-#: src/net/tmwserv/loginhandler.cpp:220
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
+#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
+#: src/net/manaserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
@@ -2620,23 +2620,23 @@ msgstr "此時無法支援邀請"
 msgid "%s is not in your party!"
 msgstr "%s 不在您的隊伍中！"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr "您已經死亡。"
 
-#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "我們很遺憾的通知您，您的角色已經在戰鬥中被殺了。"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr "您不再是那麼有活力。"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "殘酷的死神用冰冷的手正在抽出你的靈魂。"
 
-#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr "遊戲結束！"
 
@@ -2644,39 +2644,39 @@ msgstr "遊戲結束！"
 msgid "Insert coin to continue."
 msgstr "請投入金幣"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "不，孩子。您的角色並沒有真的死掉。他...呃...去了更好的地方。"
 
-#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "您想讓敵人的武器插入您的喉嚨好折斷它的計畫失敗了。"
 
-#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr "我猜這並沒有跑得很好"
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr "您想要鑑定你的財產嗎？"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr "很悲傷的，沒有人發現你的蹤跡..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr "灰飛煙滅了。"
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr "看起來你把你的頭拿在手上。"
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "你又被幹掉啦!!!躺在地上一次又一次!!"
@@ -2833,12 +2833,12 @@ msgstr "無法偷取任何物品..."
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
 #, fuzzy
 msgid "Request for Trade"
 msgstr "交易的要求"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
 #, fuzzy, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr " 想要跟您交易，您接受嗎？"
@@ -2882,135 +2882,135 @@ msgstr "加入物品失敗。交易對象沒有空的欄位。"
 msgid "Failed adding item for unknown reason."
 msgstr "由於不明的原因加入物品失敗。"
 
-#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "交易已取消。"
 
-#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "交易已完成。"
 
-#: src/net/tmwserv/beinghandler.cpp:328
+#: src/net/manaserv/beinghandler.cpp:328
 msgid " Press OK to respawn"
 msgstr " 請按確認啟動"
 
-#: src/net/tmwserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "You died"
 msgstr "您已經死亡"
 
-#: src/net/tmwserv/charserverhandler.cpp:219
+#: src/net/manaserv/charserverhandler.cpp:219
 msgid "No gameservers are available."
 msgstr "沒有可用的遊戲伺服器。"
 
-#: src/net/tmwserv/charserverhandler.cpp:258
+#: src/net/manaserv/charserverhandler.cpp:258
 msgid "Willpower:"
 msgstr "意志力:"
 
-#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
 #, fuzzy, c-format
 msgid "Topic: %s"
 msgstr "主題: "
 
-#: src/net/tmwserv/generalhandler.cpp:87
+#: src/net/manaserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr "意志力 %+d"
 
-#: src/net/tmwserv/guildhandler.cpp:74
+#: src/net/manaserv/guildhandler.cpp:74
 msgid "Guild created."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:79
 #, fuzzy
 msgid "Error creating guild."
 msgstr "建立更新目錄失敗！"
 
-#: src/net/tmwserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:89
 #, fuzzy
 msgid "Invite sent."
 msgstr "邀請使用者"
 
-#: src/net/tmwserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:194
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/tmwserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:199
 #, fuzzy
 msgid "Failed to promote member."
 msgstr "使用物品失敗"
 
-#: src/net/tmwserv/loginhandler.cpp:80
+#: src/net/manaserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "錯誤的魔法代號"
 
-#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
 msgid "Already logged in"
 msgstr "已經登入"
 
-#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
 msgid "Server is full"
 msgstr "伺服器人數已滿"
 
-#: src/net/tmwserv/loginhandler.cpp:110
+#: src/net/manaserv/loginhandler.cpp:110
 msgid "New password incorrect"
 msgstr "新密碼不正確"
 
-#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "帳號還沒連線,請先登入"
 
-#: src/net/tmwserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:140
 msgid "New email address incorrect"
 msgstr "新的郵件位址不正確"
 
-#: src/net/tmwserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:143
 msgid "Old email address incorrect"
 msgstr "舊得郵件位址不正確"
 
-#: src/net/tmwserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "The new Email Address already exists."
 msgstr "電子郵件已經被註冊"
 
-#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
 msgid "Client version is too old"
 msgstr "遊戲版本太老舊!!"
 
-#: src/net/tmwserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:179
 msgid "Wrong username or password"
 msgstr "錯誤的帳號或密碼"
 
-#: src/net/tmwserv/loginhandler.cpp:211
+#: src/net/manaserv/loginhandler.cpp:211
 msgid "Wrong username, password or email address"
 msgstr "錯誤的帳號或密碼及電子郵件"
 
-#: src/net/tmwserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:214
 msgid "Username already exists"
 msgstr "名字已經有人使用"
 
-#: src/net/tmwserv/loginhandler.cpp:217
+#: src/net/manaserv/loginhandler.cpp:217
 msgid "Email address already exists"
 msgstr "電子郵件已經存在"
 
-#: src/net/tmwserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
 msgstr ""
 
-#: src/net/tmwserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:103
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/tmwserv/tradehandler.cpp:93
+#: src/net/manaserv/tradehandler.cpp:93
 #, fuzzy
 msgid "Accepting incoming trade requests."
 msgstr "接受收到的交易要求"
 
-#: src/net/tmwserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:95
 #, fuzzy
 msgid "Ignoring incoming trade requests."
 msgstr "忽略收到的交易要求"
 
-#: src/net/tmwserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:133
 #, fuzzy, c-format
 msgid "Trading with %s"
 msgstr "交易對象: "