Updated translation files

28 files changed, 7755 insertions, 5202 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index fc5de932..0ff7bda6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@
 
 src/commandhandler.cpp
 src/commandhandler.h
+src/engine.cpp
 src/game.cpp
 src/gui/buddywindow.cpp
 src/gui/buy.cpp
@@ -78,7 +79,11 @@ 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/resources/itemdb.cpp
 src/resources/monsterdb.cpp
 src/utils/gettext.h
diff --git a/po/ar.po b/po/ar.po
index dd07b41f..e7f2c98b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-09 11:47+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +405,22 @@ msgstr "بيع"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "إلغاء"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -416,7 +430,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -464,7 +478,7 @@ msgid "Please distribute %d points"
 msgstr "رجاء أن توزّع %d نقطة"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "خطأ"
@@ -482,78 +496,75 @@ msgstr "إحصائيات الشخصيّة جيّدة"
 msgid "Please remove %d points"
 msgstr "رجاء حذف %d نقطة"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "إنتقاء الشخصيّة"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "موافق"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "السّابق"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "التّالي"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "الاسم: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "جديد"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "حذف"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "إلغاء التسجيل"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "النقود: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +574,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +604,12 @@ msgstr "لا"
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "العتاد"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
@@ -635,12 +642,12 @@ msgid "Inventory"
 msgstr "الجردة"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "استعمال العتاد"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "استخدام"
 
@@ -652,7 +659,7 @@ msgstr "إسقاط"
 msgid "Split"
 msgstr "قسم"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +667,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "موافق"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +720,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "تسجيل"
@@ -735,7 +741,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "خارطة صغيرة"
@@ -757,10 +763,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -962,6 +976,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1147,15 +1189,15 @@ msgstr "رجاء طباعة عنوان ومنفذ الخادوم."
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "تثبيت"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "تطبيق"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "تصفير النوافذ"
 
@@ -1475,10 +1517,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1613,10 +1651,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "اقتراح متاجرة"
@@ -1663,7 +1697,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1788,10 +1822,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1919,8 +1949,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "العتاد"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2049,103 +2080,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2158,23 +2190,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2198,8 +2230,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "إحصائيات الشخصيّة جيّدة"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2235,17 +2268,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2447,57 +2480,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2678,7 +2730,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2761,59 +2813,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2833,8 +2884,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "قوّة الذات:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2842,6 +2894,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "قوّة الذات:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2858,10 +2930,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2898,6 +2966,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2918,11 +3008,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2930,13 +3020,8 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "إنتقاء الشخصيّة"
 
 #~ msgid "Scroll radius"
 #~ msgstr "نصف قطر اللفّ"
diff --git a/po/ca.po b/po/ca.po
index 6e40b28e..af5113b2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-09 11:46+0000\n"
 "Last-Translator: Habari <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "sortir"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +405,22 @@ msgstr ""
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -416,7 +430,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -464,7 +478,7 @@ msgid "Please distribute %d points"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr ""
@@ -482,78 +496,75 @@ msgstr ""
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +574,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +604,12 @@ msgstr "no"
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr ""
 
@@ -635,12 +642,12 @@ msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr ""
 
@@ -652,7 +659,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +667,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +720,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr ""
@@ -735,7 +741,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr ""
 
@@ -756,10 +762,18 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -958,6 +972,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1142,15 +1184,15 @@ msgstr ""
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr ""
 
@@ -1469,10 +1511,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1607,10 +1645,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr ""
@@ -1657,7 +1691,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1782,10 +1816,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1913,7 +1943,7 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
+msgid "Equipment Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:75
@@ -2042,103 +2072,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2151,23 +2182,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2191,7 +2222,7 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
+msgid "Character deleted."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:140
@@ -2228,17 +2259,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2440,57 +2471,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2671,7 +2721,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2754,59 +2804,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2826,8 +2875,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2835,6 +2885,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr ""
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2851,10 +2921,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2891,6 +2957,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2911,22 +2999,14 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
 #: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
-
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 58df5e2a..2eee1c0b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-03-26 13:00+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Nápověda --"
@@ -90,7 +94,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "Pro více informací napište /help <příkaz>"
 
 #: src/commandhandler.cpp:174
@@ -265,10 +270,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +278,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +311,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +406,22 @@ msgstr "Prodej"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Zrušit"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "Změnit e-mail"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "Účet: %s"
@@ -416,7 +431,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "Změnit heslo"
 
@@ -464,7 +479,7 @@ msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Chyba"
@@ -482,78 +497,75 @@ msgstr ""
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů."
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Potvrďte vymazání postavy"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "Správa účtu a postavy"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Vyber postavu"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Předchozí"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Další"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Nová"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Zrušit registraci"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Peníze: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +575,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +605,12 @@ msgstr "Ne"
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Vybavení"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr ""
 
@@ -635,12 +643,12 @@ msgid "Inventory"
 msgstr "Inventář"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Vybavit"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr ""
 
@@ -652,7 +660,7 @@ msgstr "Upustit"
 msgid "Split"
 msgstr "Rozdělit"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +668,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +721,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr "Zapamatovat uživatelské jméno"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Registrace"
@@ -735,7 +742,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "MiniMapa"
@@ -756,10 +763,18 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -960,6 +975,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1144,15 +1187,15 @@ msgstr ""
 msgid "Select Server"
 msgstr "Vyber server"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr ""
 
@@ -1472,10 +1515,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1610,10 +1649,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Nabídnout obchod"
@@ -1660,7 +1695,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1785,10 +1820,6 @@ msgstr "Globální oznámení od %s:"
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1916,8 +1947,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Vybavení"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2045,103 +2077,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2154,23 +2187,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2194,8 +2227,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Potvrďte vymazání postavy"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2231,17 +2265,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2443,57 +2477,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:82
+msgid "New password too short"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: 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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2674,7 +2727,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2757,59 +2810,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2829,8 +2881,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2838,6 +2891,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr ""
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2854,10 +2927,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2894,6 +2963,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2914,11 +3005,11 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2926,10 +3017,5 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Vyber postavu"
diff --git a/po/da.po b/po/da.po
index b3648b98..aa1d6ef0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: GonzoDark AKA IchigoBlack <Gonzo.Dark@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "Ukendt kommando"
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "--Hjælp--"
@@ -100,7 +104,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr "/announce: Global meddelelse (Kun for GM)"
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "For at få mere information, skriv /help <kommando>"
 
 #: src/commandhandler.cpp:174
@@ -300,10 +305,6 @@ msgid "This command displays the number of players currently online."
 msgstr ""
 "Denne kommando viser det antal af online brugere, der nuværende er online."
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "Ukendt kommando"
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help for at få en liste med kommandoer"
@@ -313,26 +314,31 @@ msgstr "Skriv /help for at få en liste med kommandoer"
 msgid "Cannot send empty whispers!"
 msgstr "Kan ikke råbe!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr "Retur bringer focus på chatten."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr "Besked lukker chat."
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr "Enter bringer nu focus på chatten."
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
@@ -343,46 +349,56 @@ msgstr ""
 "Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", \"0"
 "\"."
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "Kunne ikke tilslutte sig gruppen!"
+
+#: src/engine.cpp:89
+#, fuzzy, c-format
+msgid "Error while loading %s"
+msgstr "NPC Database: Fejl under indlæsning af npcs.xml!"
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr "Skærmbillede gemt under ~/"
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr "Netværk Fejl"
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Er du sikker på at du gerne vil stoppe?"
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr "nej"
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer indkomne handels anmodninger"
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr "Accepter indkomne handels anmodninger"
 
@@ -433,22 +449,22 @@ msgstr "Sælg"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Fortryd"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "Skift e-mail adresse"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "Bruger: %s"
@@ -459,7 +475,7 @@ msgid "Type New Email Address twice:"
 msgstr "Skift e-mail adresse"
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
@@ -507,7 +523,7 @@ msgid "Please distribute %d points"
 msgstr "Du mangler at fordele %d points"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Fejl"
@@ -525,78 +541,75 @@ msgstr "Du har brugt alle dine points"
 msgid "Please remove %d points"
 msgstr "Du skal fjerne %d points"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Bekræft sletning af karakter"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakter?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "Ret konto og karakter"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Vælg Karakter"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr ""
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr "OK"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Forrige"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Næste"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Opret"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Slet"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Frameld"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Penge: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, fuzzy, c-format
 msgid "Money: %s"
@@ -607,20 +620,20 @@ msgstr "Penge: %d"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr "Til stede: "
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr "Fremmøde skrives til loggen"
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, fuzzy, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til "
@@ -637,16 +650,12 @@ msgstr "Nej"
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr "Kan ikke loade valgte-billede.png"
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Udstyr"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Tag af"
 
@@ -682,12 +691,12 @@ msgid "Inventory"
 msgstr "Inventarliste"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Tag på"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Brug"
 
@@ -699,7 +708,7 @@ msgstr "Smid"
 msgid "Split"
 msgstr "Opdel"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 #, fuzzy
 msgid "Slots:"
 msgstr " g Pladser: "
@@ -709,6 +718,10 @@ msgstr " g Pladser: "
 msgid "Weight:"
 msgstr "Vægt: "
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr ""
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -762,11 +775,6 @@ msgstr "Nuværende:"
 msgid "Remember Username"
 msgstr "Husk Brugernavn"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "OK"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Registrer"
@@ -788,7 +796,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "MiniKort"
@@ -811,11 +819,19 @@ msgstr "NPC"
 msgid "Reset"
 msgstr "Nuværende:"
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 #, fuzzy
 msgid "Send"
 msgstr "Lyd"
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 #, fuzzy
 msgid "Text"
@@ -1031,6 +1047,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr "Gruppe"
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, fuzzy, c-format
+msgid "%s has invited you to join their party."
+msgstr "Kunne ikke tilslutte sig gruppen!"
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, fuzzy, c-format
+msgid "Rejected invite from %s."
+msgstr "Blev smidt af serveren!"
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1221,15 +1265,15 @@ msgstr "Skriv både adressen og porten på serveren."
 msgid "Select Server"
 msgstr "Vælg Server"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Anvend"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Nulstil Vinduer"
 
@@ -1563,11 +1607,6 @@ msgstr "Partikel effekt opsætningen er ændret"
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-#, fuzzy
-msgid "skills.xml"
-msgstr "Færdigheder"
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1716,11 +1755,6 @@ msgstr "Stop"
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-#, fuzzy
-msgid "Slots: "
-msgstr " g Pladser: "
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Foreslå handel"
@@ -1773,7 +1807,7 @@ msgstr ""
 
 #: src/gui/trade.cpp:311
 #, fuzzy
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr "Du har ingen memorandaer!"
 
 #: src/gui/updatewindow.cpp:91
@@ -1907,10 +1941,6 @@ msgstr "Global meddelelse fra "
 msgid "%s whispers: "
 msgstr "Tillad hviskere"
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr "Ukendt genstand"
-
 #: src/gui/widgets/whispertab.cpp:49
 #, fuzzy
 msgid "Cannot send empty chat!"
@@ -2054,7 +2084,7 @@ msgstr "Inventarliste"
 
 #: src/keyboardconfig.cpp:74
 #, fuzzy
-msgid "Equipment WIndow"
+msgid "Equipment Window"
 msgstr "Udstyr"
 
 #: src/keyboardconfig.cpp:75
@@ -2199,117 +2229,118 @@ msgstr "Opret"
 msgid "Unknown Skill"
 msgstr "Ukendt genstand"
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr "Ugyldigt opdaterings host: "
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr " kan ikke laves, men det findes ikke! Lukker."
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr "Kunne ikke definere "
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr " skærm opsætning: "
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 #, fuzzy
 msgid "Options:"
 msgstr "Opsætning: "
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 #, fuzzy
 msgid "  -C --config-file : Configuration file to use"
 msgstr "  -C --configfile : Configurations fil til brug"
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 #, fuzzy
 msgid "  -d --data        : Directory to load game data from"
 msgstr "  -d --data       : Mappen at indlæse spillets data fra"
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 #, fuzzy
 msgid "  -h --help        : Display this help"
 msgstr "  -h --help       : Viser denne hjælp"
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 #, fuzzy
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr "  -d --data       : Mappen at indlæse spillets data fra"
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 #, fuzzy
 msgid "  -H --update-host : Use this update host"
 msgstr "  -H --updatehost : Brug denne opdaterings host"
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 #, fuzzy
 msgid "  -P --password    : Login with this password"
 msgstr "  -P --password   : Logind med denne adgangskode"
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 #, fuzzy
 msgid "  -c --character   : Login with this character"
 msgstr "  -p --playername : Logind med denne bruger"
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
-msgstr ""
+#: src/main.cpp:586
+#, fuzzy
+msgid "  -p --port        : Login server port"
+msgstr "  -U --username   : Logind med dette brugernavn"
 
-#: src/main.cpp:578
+#: src/main.cpp:587
 #, fuzzy
-msgid "  -s --server      : Login Server name or IP"
+msgid "  -s --server      : Login server name or IP"
 msgstr "  -U --username   : Logind med dette brugernavn"
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 #, fuzzy
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr "  -u --skipupdate : Spring opdateringerne over"
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 #, fuzzy
 msgid "  -U --username    : Login with this username"
 msgstr "  -U --username   : Logind med dette brugernavn"
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 #, fuzzy
 msgid "  -v --version     : Display the version"
 msgstr "  -v --version    : Viser den nuværende version"
 
-#: src/main.cpp:589
-#, fuzzy
-msgid "The Mana World "
+#: src/main.cpp:598
+#, fuzzy, c-format
+msgid "The Mana World %s"
 msgstr "Vælg din Mana World Server"
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Opretter forbindelse til bane serveren..."
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "Opretter forbindelse til karakter serveren..."
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "Opretter forbindelse til bruger serveren..."
 
@@ -2323,24 +2354,26 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
-msgstr ""
+#, fuzzy
+msgid "Nothing to sell."
+msgstr "Kan ikke loade valgte-billede.png"
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
-msgstr ""
+#, fuzzy
+msgid "Unable to buy."
+msgstr "Tag af"
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
 #, fuzzy
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr "Kan ikke loade valgte-billede.png"
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2366,8 +2399,8 @@ msgstr "nej"
 
 #: src/net/ea/charserverhandler.cpp:135
 #, fuzzy
-msgid "Player deleted"
-msgstr "Bruger"
+msgid "Character deleted."
+msgstr "Bekræft sletning af karakter"
 
 #: src/net/ea/charserverhandler.cpp:140
 #, fuzzy
@@ -2410,17 +2443,17 @@ msgid "Luck:"
 msgstr "Held"
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2646,64 +2679,83 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
+#: src/net/ea/inventoryhandler.cpp:185
 #, fuzzy
-msgid "Unable to pick up item"
+msgid "Unable to pick up item."
 msgstr "Kunne ikke skabe mThread"
 
-#: src/net/ea/inventoryhandler.cpp:194
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
 #, fuzzy, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr "Du samlede op "
 
-#: src/net/ea/inventoryhandler.cpp:240
+#: src/net/ea/inventoryhandler.cpp:245
 #, fuzzy
-msgid "Failed to use item"
+msgid "Failed to use item."
 msgstr "Fejlede i at skifte til "
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+#, fuzzy
+msgid "Unknown error"
+msgstr "Ukendt genstand"
+
+#: src/net/ea/loginhandler.cpp:142
 #, fuzzy
 msgid "Unregistered ID"
 msgstr "Frameld"
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 #, fuzzy
 msgid "Wrong password"
 msgstr "Skift adgangskode"
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 #, fuzzy
 msgid "Account expired"
 msgstr "Bruger: %s"
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 #, fuzzy
 msgid "Rejected from server"
 msgstr "Blev smidt af serveren!"
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-#, fuzzy
-msgid "Unknown error"
-msgstr "Ukendt genstand"
-
 #: src/net/ea/partyhandler.cpp:77
 #, fuzzy
 msgid "Could not create party."
@@ -2894,7 +2946,8 @@ msgid "You picked up "
 msgstr "Du samlede op "
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+#, fuzzy
+msgid "Equip arrows first."
 msgstr "Tag først pile på"
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2978,62 +3031,61 @@ msgstr "Kunne ikke stjæle noget som helst..."
 msgid "Poison had no effect..."
 msgstr "Giften havde ingen effekt..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#, fuzzy
+msgid "Request for Trade"
 msgstr "Ansøg om lov til at handle"
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/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?"
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Du kan ikke handle. Handle partneren er for langt væk."
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Du kan ikke handle. Karakteren findes ikke."
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handlen blev annulleret af en ukendt grund."
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
+#: src/net/ea/tradehandler.cpp:132
+#, fuzzy, c-format
+msgid "Trade: You and %s"
 msgstr "Handel: Dig og "
 
-#: src/net/ea/tradehandler.cpp:137
-#, fuzzy
-msgid "Trade with "
-msgstr "Handel med "
+#: src/net/ea/tradehandler.cpp:139
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel annulleret."
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:148
 #, fuzzy
-msgid " cancelled"
-msgstr " afbrudt"
-
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+msgid "Unhandled trade cancel packet."
 msgstr "Ubehandlet handel annullerede pakken"
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Fejlede i at tilføje genstand. Handels partneren bære på for meget."
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser."
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr "Fejlede i at tilføje genstand af en ukendt grund."
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Handel annulleret."
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Handel er komplet."
 
@@ -3055,8 +3107,9 @@ msgstr "Ingen opsætning tilgængelig"
 msgid "Willpower:"
 msgstr "Viljestyrke:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -3064,6 +3117,28 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Viljestyrke:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "Fejl under oprettelsen af opdateringen mappen!"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+#, fuzzy
+msgid "Failed to promote member."
+msgstr "Fejlede i at skifte til "
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -3081,10 +3156,6 @@ msgstr "Server"
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -3126,6 +3197,30 @@ msgstr "Brugernavn er %s"
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+#, fuzzy
+msgid "Accepting incoming trade requests."
+msgstr "Accepter indkomne handels anmodninger"
+
+#: src/net/tmwserv/tradehandler.cpp:95
+#, fuzzy
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorer indkomne handels anmodninger"
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, fuzzy, c-format
+msgid "Trading with %s"
+msgstr "Handel med "
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3146,11 +3241,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
-msgstr ""
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
+msgstr "Ukendt genstand"
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "Unavngivet"
 
@@ -3158,13 +3253,27 @@ msgstr "Unavngivet"
 msgid "unnamed"
 msgstr "unavngivet"
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Vælg Karakter"
 
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr "NPC Database: Fejl under indlæsning af npcs.xml!"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Kan ikke loade valgte-billede.png"
+
+#, fuzzy
+#~ msgid "skills.xml"
+#~ msgstr "Færdigheder"
+
+#, fuzzy
+#~ msgid "Slots: "
+#~ msgstr " g Pladser: "
+
+#, fuzzy
+#~ msgid "Player deleted"
+#~ msgstr "Bruger"
+
+#, fuzzy
+#~ msgid " cancelled"
+#~ msgstr " afbrudt"
 
 #~ msgid "Save player list"
 #~ msgstr "Gem bruger liste"
diff --git a/po/de.po b/po/de.po
index e8df17dc..020bba9f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-05-12 20:04+0000\n"
 "Last-Translator: Terwarf <Unknown>\n"
 "Language-Team: German\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-13 18:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "Unbekannter Befehl."
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Hilfe --"
@@ -93,7 +97,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globale Ansage (Nur von GM's nutzbar)"
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "Um mehr Informationen zu erhalten /help <Befehel> eingeben"
 
 #: src/commandhandler.cpp:174
@@ -284,10 +289,6 @@ msgstr "Befehl: /who"
 msgid "This command displays the number of players currently online."
 msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "Unbekannter Befehl."
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
@@ -296,28 +297,33 @@ msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:347
-#, c-format
+#: src/commandhandler.cpp:348
+#, fuzzy, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 "Kann keinen neuen Tab für Spieler '%s' erstellen - entweder es existiert "
 "bereits einer, oder der Spieler bist Du."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr "Nachricht schließt Chatzeile."
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
@@ -327,46 +333,56 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "Kann der Gruppe nicht beitreten!"
+
+#: src/engine.cpp:89
+#, fuzzy, c-format
+msgid "Error while loading %s"
+msgstr "NPC Datenbank: Fehler beim Laden von npcs.xml!"
+
+#: src/game.cpp:237
 msgid "General"
 msgstr "Öffentlich"
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 "Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr "Nein"
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
@@ -414,22 +430,22 @@ msgstr "Verkaufen"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "Email-Adresse ändern"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "Account: %s"
@@ -439,7 +455,7 @@ msgid "Type New Email Address twice:"
 msgstr "Gib die neue Email Adresse zweimal ein:"
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "Passwort ändern"
 
@@ -487,7 +503,7 @@ msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Fehler"
@@ -505,78 +521,75 @@ msgstr "Spielfigurattribute OK"
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Bestätige Charakter-Löschung"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "Account- und Charakterverwaltung"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Spielfigur auswählen"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
 msgstr "Ok"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Zurück"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Weiter"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Neu"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Abmelden"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "Beruf Stufe: %d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -586,20 +599,20 @@ msgstr "Geld: %s"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr "%d Spieler sind anwesend."
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr "Anwesend: "
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr "Anwesenheitsliste wurde ins Chatlog geschrieben."
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -616,16 +629,12 @@ msgstr "Nein"
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr "Konnte selection.png nicht laden"
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Ausrüstung"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -658,12 +667,12 @@ msgid "Inventory"
 msgstr "Inventar"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Benutzen"
 
@@ -675,7 +684,7 @@ msgstr "Wegwerfen"
 msgid "Split"
 msgstr "Aufteilen"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr "Plätze:"
 
@@ -683,6 +692,10 @@ msgstr "Plätze:"
 msgid "Weight:"
 msgstr "Gewicht:"
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "Alle"
@@ -732,11 +745,6 @@ msgstr "Zuletzt benutzt:"
 msgid "Remember Username"
 msgstr "Benutzernamen merken"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Ok"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Registrieren"
@@ -758,7 +766,7 @@ msgstr "Spruch 2 sprechen"
 msgid "Cast Test Spell 3"
 msgstr "Spruch 3 sprechen"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr "Karte"
 
@@ -778,10 +786,19 @@ msgstr "NPC"
 msgid "Reset"
 msgstr "Zurücksetzten"
 
+#: src/gui/npcpostdialog.cpp:44
+#, fuzzy
+msgid "To:"
+msgstr "Thema: "
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr "Senden"
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr "Text"
@@ -980,6 +997,34 @@ msgstr "1/4 HP Leiste"
 msgid "Party (%s)"
 msgstr "Party"
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, fuzzy, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s hat Deine Party verlassen."
+
+#: src/gui/partywindow.cpp:185
+#, fuzzy, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s hat Deine Party verlassen."
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, fuzzy, c-format
+msgid "Rejected invite from %s."
+msgstr "Vom Server zurückgewiesen"
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Füge Namen zu Chat hinzu@@"
@@ -1164,15 +1209,15 @@ msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 msgid "Select Server"
 msgstr "Server auswählen"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Anwenden"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
@@ -1493,10 +1538,6 @@ msgstr "Partikeleffekteinstellungen geändert."
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr "skills.xml"
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "Unbekannter Skill"
@@ -1631,10 +1672,6 @@ msgstr "Einlagern"
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr "Plätze: "
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Handel vorschlagen"
@@ -1683,7 +1720,8 @@ msgstr ""
 "Gegenstände hinzufügen."
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+#, fuzzy
+msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
 #: src/gui/updatewindow.cpp:91
@@ -1810,10 +1848,6 @@ msgstr "Globale Ansage von %s:"
 msgid "%s whispers: "
 msgstr "%s flüstert: "
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr "Unbekannter Gegenstand"
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr "Kann keine leere Nachricht senden!"
@@ -1942,7 +1976,8 @@ msgid "Inventory Window"
 msgstr "Inventarfenster"
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
+#, fuzzy
+msgid "Equipment Window"
 msgstr "Ausrüstungsfenster"
 
 #: src/keyboardconfig.cpp:75
@@ -2071,104 +2106,107 @@ msgstr "Handwerk"
 msgid "Unknown Skill"
 msgstr "Unbekannte Fähigkeit"
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr "Ungültiger Updateserver: "
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verszeichnisses für Updates!"
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr "Konnte Einstellung nicht setzen: "
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr " Auflösung: "
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr "tmw"
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr "  -C --config-file : zu benutzende Konfigurationsdatei"
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr "  -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr "  -D --default : Wähle zuletzt benutzten Server und Spieler aus"
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr "  - --help : Display this help"
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 "  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr "  -H --update-host : Benutze angegebenen Updateserver"
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr "  -P --password : Angegebenes Passwort benutzen"
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr "  -c --charakter : Mit angegebenem Spieler anmelden"
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+#, fuzzy
+msgid "  -p --port        : Login server port"
 msgstr "  -p --port : Port des Anmeldungsservers"
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+#, fuzzy
+msgid "  -s --server      : Login server name or IP"
 msgstr "  -s --server : Name oder IP des Anmeldungsservers"
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr "  -u --skip-update : Überspringe das Herunterladen von Updates"
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr "  -U --username : Mit angegebenem Benutzernamen anmelden"
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : OpenGL-Erweiterungen deaktivieren"
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr "  -v --version : Die Version des Spieles anzeigen"
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, fuzzy, c-format
+msgid "The Mana World %s"
 msgstr "The Mana World "
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "Verbinde zu [map server]..."
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "Verbinde zu [character server]..."
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "Verbinde zu [account server]..."
 
@@ -2181,23 +2219,28 @@ msgid "Kick succeeded!"
 msgstr "Spieler aus dem Kanal geworfen!"
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+#, fuzzy
+msgid "Nothing to sell."
 msgstr "Nichts zu verkaufen"
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+#, fuzzy
+msgid "Thanks for buying."
 msgstr "Danke für deinen Einkauf"
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+#, fuzzy
+msgid "Unable to buy."
 msgstr "Kann das nicht kaufen"
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+#, fuzzy
+msgid "Thanks for selling."
 msgstr "Danke fürs verkaufen"
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+#, fuzzy
+msgid "Unable to sell."
 msgstr "Kann das nicht verkaufen"
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2223,8 +2266,9 @@ msgid "Info"
 msgstr "Info"
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr "Spieler gelöscht"
+#, fuzzy
+msgid "Character deleted."
+msgstr "Bestätige Charakter-Löschung"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2260,17 +2304,19 @@ msgid "Luck:"
 msgstr "Glück:"
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+#, fuzzy
+msgid "Whisper could not be sent, user is offline."
 msgstr "Nachricht konnte nicht gesendet werden, Spieler ist offline."
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+#, fuzzy
+msgid "Whisper could not be sent, ignored by user."
 msgstr "Nachricht konnte nicht gesendet werden, vom Spieler ignoriert."
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr "Kanäle werden nicht unterstützt!"
 
@@ -2486,61 +2532,84 @@ msgstr "Teilen der Erfahrungspunkte deaktiviert."
 msgid "Experience sharing not possible."
 msgstr "Teilen der Erfahrungspunkte nicht möglich."
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+#, fuzzy
+msgid "Unable to pick up item."
 msgstr "Kann Gegenstand nicht aufheben"
 
-#: src/net/ea/inventoryhandler.cpp:194
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
+#, fuzzy, c-format
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr "Du hast %s [@@%d|%s@@] aufgehoben"
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+#, fuzzy
+msgid "Failed to use item."
 msgstr "Konnte Gegenstand nicht benutzen"
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+#, fuzzy
+msgid "Account was not found. Please re-login."
+msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr "Altes Passwort fehlerhaft"
+
+#: src/net/ea/loginhandler.cpp:82
+#, fuzzy
+msgid "New password too short"
+msgstr "Neues Passwort fehlerhaft"
+
+#: 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
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr "Unbekannte ID"
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr "Fallsches Passwort"
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr "Account abgelaufen"
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr "Vom Server zurückgewiesen"
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 "Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM "
 "Team."
 
-#: src/net/ea/loginhandler.cpp:127
-#, c-format
+#: src/net/ea/loginhandler.cpp:159
+#, fuzzy, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 "Du wurdest bis %s vom Spiel ausgeschlossen.\n"
 " Bitte wende Dich über das Forum an das GM Team."
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr "Dieser Spielername ist bereits vergeben"
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr "Konnte Party nicht erstellen."
@@ -2734,7 +2803,8 @@ msgid "You picked up "
 msgstr "Aufgehoben "
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+#, fuzzy
+msgid "Equip arrows first."
 msgstr "Zuerst solltest Du ein paar Pfeile ausrüsten"
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2817,62 +2887,63 @@ msgstr "Konnte nichts stehlen..."
 msgid "Poison had no effect..."
 msgstr "Das Gift hatte keine Wirkung..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#, fuzzy
+msgid "Request for Trade"
 msgstr "Anfrage für einen Handel"
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, fuzzy, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr " möchte mit Dir Handeln, bist Du einverstanden?"
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Handel nicht möglich. Handelspartner ist zu weit weg."
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Handel nicht möglich. Spieler existiert nicht."
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handel aus unbekanntem Grund abgebrochen"
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
+#: src/net/ea/tradehandler.cpp:132
+#, fuzzy, c-format
+msgid "Trade: You and %s"
 msgstr "Handeln: Du und "
 
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
-msgstr "Handeln mit "
-
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
-msgstr " abgebrochen"
+#: src/net/ea/tradehandler.cpp:139
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel abgebrochen."
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+#, fuzzy
+msgid "Unhandled trade cancel packet."
 msgstr "Nicht verwertbare Handelsanfrage"
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Handelspartnet ist überladen."
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien "
 "Platz mehr."
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Handel abgebrochen."
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Handel abgeschlossen."
 
@@ -2892,8 +2963,9 @@ msgstr "Kein Server verfügbar"
 msgid "Willpower:"
 msgstr "Willenskraft:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, fuzzy, c-format
+msgid "Topic: %s"
 msgstr "Thema: "
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2901,6 +2973,29 @@ msgstr "Thema: "
 msgid "Willpower %+d"
 msgstr "Willensstärke %+d"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "Fehler beim Erstellen des Verszeichnisses für Updates!"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+#, fuzzy
+msgid "Invite sent."
+msgstr "Spieler einladen"
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+#, fuzzy
+msgid "Failed to promote member."
+msgstr "Konnte Gegenstand nicht benutzen"
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "Fehlerhaftes Magiemerkmal"
@@ -2917,10 +3012,6 @@ msgstr "Server ist voll"
 msgid "New password incorrect"
 msgstr "Neues Passwort fehlerhaft"
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr "Altes Passwort fehlerhaft"
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
@@ -2957,6 +3048,30 @@ msgstr "Benutzername bereits vorhanden"
 msgid "Email address already exists"
 msgstr "Emailadresse bereits vorhanden"
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+#, fuzzy
+msgid "Accepting incoming trade requests."
+msgstr "Akzeptiere eingehende Handelsanfragen"
+
+#: src/net/tmwserv/tradehandler.cpp:95
+#, fuzzy
+msgid "Ignoring incoming trade requests."
+msgstr "Ignoriere eingehende Handelsanfragen"
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, fuzzy, c-format
+msgid "Trading with %s"
+msgstr "Handeln mit "
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2977,11 +3092,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
-msgstr "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
+msgstr "Unbekannter Gegenstand"
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "Unbenannt"
 
@@ -2989,13 +3104,29 @@ msgstr "Unbenannt"
 msgid "unnamed"
 msgstr "unbenannt"
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr "monsters.xml"
+#~ msgid "Select Character"
+#~ msgstr "Spielfigur auswählen"
 
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr "NPC Datenbank: Fehler beim Laden von npcs.xml!"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Konnte selection.png nicht laden"
+
+#~ msgid "skills.xml"
+#~ msgstr "skills.xml"
+
+#~ msgid "Slots: "
+#~ msgstr "Plätze: "
+
+#~ msgid "Player deleted"
+#~ msgstr "Spieler gelöscht"
+
+#~ msgid " cancelled"
+#~ msgstr " abgebrochen"
+
+#~ msgid "items.xml"
+#~ msgstr "items.xml"
+
+#~ msgid "monsters.xml"
+#~ msgstr "monsters.xml"
 
 #~ msgid "MiniMap"
 #~ msgstr "Übersichtskarte"
diff --git a/po/en_GB.po b/po/en_GB.po
index 1b9c6f97..2aca1724 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-09 11:48+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Exit"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +405,22 @@ msgstr "Sell"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Cancel"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -416,7 +430,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -464,7 +478,7 @@ msgid "Please distribute %d points"
 msgstr "Please distribute %d points"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Error"
@@ -482,78 +496,75 @@ msgstr "Character stats OK"
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Select Character"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Previous"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Next"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "New"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Unregister"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Money: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +574,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +604,12 @@ msgstr "No"
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Equipment"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Unequip"
 
@@ -635,12 +642,12 @@ msgid "Inventory"
 msgstr "Inventory"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Equip"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Use"
 
@@ -652,7 +659,7 @@ msgstr "Drop"
 msgid "Split"
 msgstr "Split"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +667,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +720,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Register"
@@ -735,7 +741,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "MiniMap"
@@ -757,10 +763,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -962,6 +976,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1147,15 +1189,15 @@ msgstr "Please type both the address and the port of a server."
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Setup"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
@@ -1475,10 +1517,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1613,10 +1651,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Propose trade"
@@ -1663,7 +1697,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1788,10 +1822,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1919,8 +1949,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Equipment"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2049,103 +2080,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2158,23 +2190,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2198,8 +2230,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Character stats OK"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2235,17 +2268,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2447,57 +2480,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2678,7 +2730,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2761,59 +2813,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2833,8 +2884,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Willpower:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2842,6 +2894,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Willpower:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2858,10 +2930,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2898,6 +2966,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2918,11 +3008,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2930,13 +3020,8 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Select Character"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Scroll radius"
diff --git a/po/eo.po b/po/eo.po
index 13751eb3..12c8fa7c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-09 11:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +405,22 @@ msgstr ""
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -416,7 +430,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -464,7 +478,7 @@ msgid "Please distribute %d points"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr ""
@@ -482,78 +496,75 @@ msgstr ""
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +574,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +604,12 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr ""
 
@@ -635,12 +642,12 @@ msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr ""
 
@@ -652,7 +659,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +667,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr ""
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +720,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr ""
@@ -735,7 +741,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr ""
 
@@ -755,10 +761,18 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -957,6 +971,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1141,15 +1183,15 @@ msgstr ""
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr ""
 
@@ -1468,10 +1510,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1606,10 +1644,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr ""
@@ -1656,7 +1690,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1781,10 +1815,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1912,7 +1942,7 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
+msgid "Equipment Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:75
@@ -2041,103 +2071,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2150,23 +2181,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2190,7 +2221,7 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
+msgid "Character deleted."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:140
@@ -2227,17 +2258,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2439,57 +2470,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2670,7 +2720,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2753,59 +2803,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2825,8 +2874,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2834,6 +2884,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr ""
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2850,10 +2920,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2890,6 +2956,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2910,22 +2998,14 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
 #: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
-
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
diff --git a/po/es.po b/po/es.po
index 6e882b75..6eacd415 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-05-13 17:21+0000\n"
 "Last-Translator: Habari <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-13 18:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "Orden desconocida."
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "ayuda"
@@ -93,7 +97,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr "/announce >Mensaje global (Solo MJ's)"
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "Par mas ayuda teclea el comando /help"
 
 #: src/commandhandler.cpp:174
@@ -278,10 +283,6 @@ msgid "This command displays the number of players currently online."
 msgstr ""
 "este comando muestra el numero de jugadores que actualmente estan conectados"
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "Orden desconocida."
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "teclea /help para una lista de comandos"
@@ -290,28 +291,33 @@ msgstr "teclea /help para una lista de comandos"
 msgid "Cannot send empty whispers!"
 msgstr "no se pueden enviar mensajes vacios"
 
-#: src/commandhandler.cpp:347
-#, c-format
+#: src/commandhandler.cpp:348
+#, fuzzy, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 "no se puede crear una pestaña de susurros para el apodo '%s'! o existe ya o "
 "eres tu!"
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr "la tecla de retorno alterna el chat"
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr "el mensaje cierra el chat"
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr "ahora la tecla de retorno alterna el chat"
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr "el mensaje ahora cierra el chat"
 
@@ -320,45 +326,55 @@ msgstr "el mensaje ahora cierra el chat"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "las opciones de /%s son yes , no , true , false , 1 , 0"
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "no pudiste unirte al grupo"
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr "general"
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr "foto de la pantalla guardada en ~/"
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr "no se pudo guardar la foto de pantalla"
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr "la conexion al servidor se perdio , ahora se cerrara el programa"
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr "error de red"
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Salir"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr "seguro que quieres salir?"
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr "no"
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr "actualmente se estan ignorando las peticiones de comercio recibidas"
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr "ahora se estan aceptando las peticiones de comercio"
 
@@ -406,22 +422,22 @@ msgstr "Vender"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "cambiar direccion de correo electronico"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "cuenta %s"
@@ -431,7 +447,7 @@ msgid "Type New Email Address twice:"
 msgstr "teclee 2 veces la nueva direccion de correo electronico"
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "cambiar contraseña"
 
@@ -479,7 +495,7 @@ msgid "Please distribute %d points"
 msgstr "Distribuya %d puntos"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Error"
@@ -497,78 +513,75 @@ msgstr "Estatus personaje OK"
 msgid "Please remove %d points"
 msgstr "por favor quita %d puntos"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "confirmar borrado de personaje"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "administracion de cuenta y avatar"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Seleccionar personaje"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
 msgstr "Aceptar"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Nuevo"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Cancelar Cuenta"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Dinero: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "nivel de trabajo %d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -578,20 +591,20 @@ msgstr "dinero %s"
 msgid "Chat"
 msgstr "chat"
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr "%d jugadores estan presentes"
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr "Presente: "
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr "asistencia grabada en el registro"
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "susurrando a %s: %s"
@@ -608,16 +621,12 @@ msgstr "No"
 msgid "Connecting..."
 msgstr "Conectando…"
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr "no se pudo cargar selection.png"
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Equipo"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "quitarselo"
 
@@ -650,12 +659,12 @@ msgid "Inventory"
 msgstr "Inventario"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Usar"
 
@@ -667,7 +676,7 @@ msgstr "tirar"
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr "ranuras"
 
@@ -675,6 +684,10 @@ msgstr "ranuras"
 msgid "Weight:"
 msgstr "peso"
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Aceptar"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "todo"
@@ -724,11 +737,6 @@ msgstr "reciente:"
 msgid "Remember Username"
 msgstr "recordar nombre de usuario"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Aceptar"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Registrar"
@@ -750,7 +758,7 @@ msgstr "usar hechizo de prueba 2"
 msgid "Cast Test Spell 3"
 msgstr "usar hechizo de prueba 3"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr "mapa"
 
@@ -770,10 +778,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr "resetear"
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr "enviar"
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr "texto"
@@ -972,6 +988,34 @@ msgstr "barra de salud a un cuarto"
 msgid "Party (%s)"
 msgstr "grupo"
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|añadir nombre al chatt@@"
@@ -1156,15 +1200,15 @@ msgstr "Escriba la dirección y el puerto de un servidor."
 msgid "Select Server"
 msgstr "Seleccionar servidor"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Reiniciar ventanas"
 
@@ -1483,10 +1527,6 @@ msgstr "efectos de particulas cambiados"
 msgid "Changes will take effect on map change."
 msgstr "los cambios tienen efecto en cuanto cambies de mapa"
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr "skills.xml"
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "habilidad mis"
@@ -1621,10 +1661,6 @@ msgstr "almacenar"
 msgid "Retrieve"
 msgstr "recuperar"
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr "ranuras: "
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Proponer"
@@ -1673,7 +1709,8 @@ msgstr ""
 "ventana"
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+#, fuzzy
+msgid "You don't have enough money."
 msgstr "no tienes suficiente dinero"
 
 #: src/gui/updatewindow.cpp:91
@@ -1798,10 +1835,6 @@ msgstr "Anuncio global de %s"
 msgid "%s whispers: "
 msgstr "%s susurra: "
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr "objeto desconocido"
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr "no se pude enviar un chat vacio!!"
@@ -1930,7 +1963,8 @@ msgid "Inventory Window"
 msgstr "ventana del inventorio"
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
+#, fuzzy
+msgid "Equipment Window"
 msgstr "ventana del equipo"
 
 #: src/keyboardconfig.cpp:75
@@ -2059,103 +2093,106 @@ msgstr "artesanal"
 msgid "Unknown Skill"
 msgstr "habilidad desconocida"
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr "error al crear directorio de actualizaciones"
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr "no se pudo configurar: "
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr " modo de video "
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr "TMW"
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr "Opciones:"
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr "  -D --default : elige un servidor y personaje por defecto"
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr "  -h --help : muestra esta ayuda"
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr "  -S --home-dir : Directorio a usar como directorio raiz"
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr "  -H --update-host : Usar este servidor de actualizaciones"
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr "  -c --character : conectarse con este personaje"
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+#, fuzzy
+msgid "  -p --port        : Login server port"
 msgstr "  -p --port : puerto de servidor de conexion"
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+#, fuzzy
+msgid "  -s --server      : Login server name or IP"
 msgstr "  -s --server : nombre o IP del servidor de conexion"
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr "  -u --skip-update : saltarse bajar las actualizaciones"
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr "  -U --username : conectarse con este nombre se usuario"
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, fuzzy, c-format
+msgid "The Mana World %s"
 msgstr "El mundo Mana "
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "conectando al servidor de mapas...."
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "conectando al servidor de personajes..."
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "conectando al servidor de cuentas de usuario..."
 
@@ -2168,23 +2205,28 @@ msgid "Kick succeeded!"
 msgstr "se le expulso"
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+#, fuzzy
+msgid "Nothing to sell."
 msgstr "no hay nada que vender"
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+#, fuzzy
+msgid "Thanks for buying."
 msgstr "gracias por su compra"
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+#, fuzzy
+msgid "Unable to buy."
 msgstr "no se pudo comprar"
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+#, fuzzy
+msgid "Thanks for selling."
 msgstr "gracias por su venta"
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+#, fuzzy
+msgid "Unable to sell."
 msgstr "no se pudo vender"
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2208,8 +2250,9 @@ msgid "Info"
 msgstr "informacion"
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr "personaje borrado"
+#, fuzzy
+msgid "Character deleted."
+msgstr "confirmar borrado de personaje"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2245,17 +2288,17 @@ msgid "Luck:"
 msgstr "suerte:"
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2457,57 +2500,78 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+#, fuzzy
+msgid "Unable to pick up item."
+msgstr "no se pudo comprar"
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+#, fuzzy
+msgid "Failed to use item."
+msgstr "no se pudo cambiar a: "
+
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2688,7 +2752,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2771,59 +2835,58 @@ msgstr "No pudiste robar nada"
 msgid "Poison had no effect..."
 msgstr "el veneno no tuvo efecto"
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
-msgstr ""
+#: src/net/ea/tradehandler.cpp:132
+#, fuzzy, c-format
+msgid "Trade: You and %s"
+msgstr "intercambiar: tu"
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2843,8 +2906,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Fuerza de voluntad:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2852,6 +2916,29 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr ""
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "error al crear directorio de actualizaciones"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+#, fuzzy
+msgid "Invite sent."
+msgstr "invitar a jugador"
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+#, fuzzy
+msgid "Failed to promote member."
+msgstr "no se pudo empezar a grabar"
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2868,10 +2955,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2908,6 +2991,30 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+#, fuzzy
+msgid "Accepting incoming trade requests."
+msgstr "ahora se estan aceptando las peticiones de comercio"
+
+#: src/net/tmwserv/tradehandler.cpp:95
+#, fuzzy
+msgid "Ignoring incoming trade requests."
+msgstr "actualmente se estan ignorando las peticiones de comercio recibidas"
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2928,11 +3035,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
-msgstr ""
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
+msgstr "objeto desconocido"
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "sin nombre"
 
@@ -2940,13 +3047,20 @@ msgstr "sin nombre"
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Seleccionar personaje"
 
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Unable to load selection.png"
+#~ msgstr "no se pudo cargar selection.png"
+
+#~ msgid "skills.xml"
+#~ msgstr "skills.xml"
+
+#~ msgid "Slots: "
+#~ msgstr "ranuras: "
+
+#~ msgid "Player deleted"
+#~ msgstr "personaje borrado"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Ratio de scroll"
diff --git a/po/fi.po b/po/fi.po
index d327c317..f17cccec 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-04-21 16:37+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +405,22 @@ msgstr "Myy"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Peru"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "Vaihda sähköpostiosoite"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "Tili: %s"
@@ -416,7 +430,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
@@ -464,7 +478,7 @@ msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Virhe"
@@ -482,78 +496,75 @@ msgstr "Hahmon pistejako OK"
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Vahvista hahmon poistopyyntö"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "Tilin ja hahmojen hallinta"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Valitse hahmo"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
 msgstr "Ok"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Edellinen"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Uusi"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Poista palvelimelta"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Rahatilanne: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +574,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +604,12 @@ msgstr "Ei"
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Varusteet"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -635,12 +642,12 @@ msgid "Inventory"
 msgstr "Tavaraluettelo"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Ota käyttöön"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Käytä"
 
@@ -652,7 +659,7 @@ msgstr "Pudota"
 msgid "Split"
 msgstr "Jaa"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +667,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +720,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr "Muista käyttäjätunnus"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Ok"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Rekisteröidy"
@@ -735,7 +741,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "Apukartta"
@@ -757,10 +763,18 @@ msgstr "Epäpelattava hahmo"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -962,6 +976,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1147,15 +1189,15 @@ msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 msgid "Select Server"
 msgstr "Valitse palvelin"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Käytä"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
@@ -1475,10 +1517,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1613,10 +1651,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Ehdota vaihtokauppaa"
@@ -1663,7 +1697,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1788,10 +1822,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1919,8 +1949,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Varusteet"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2049,103 +2080,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2158,23 +2190,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2198,8 +2230,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Vahvista hahmon poistopyyntö"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2235,17 +2268,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2447,57 +2480,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2678,7 +2730,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2761,59 +2813,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2833,8 +2884,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Tahdonvoima:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2842,6 +2894,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Tahdonvoima:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2858,10 +2930,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2898,6 +2966,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2918,11 +3008,11 @@ msgstr "Iskupisteet %+d"
 msgid "MP %+d"
 msgstr "Taikapisteet %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2930,13 +3020,8 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Valitse hahmo"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Kameran perässälaahaus"
diff --git a/po/fr.po b/po/fr.po
index c42efa9f..a9be6ed3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-05-13 12:56+0000\n"
 "Last-Translator: Jumpy <Unknown>\n"
 "Language-Team: French\n"
@@ -18,6 +18,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-13 18:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "Commande inconnue."
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Aide --"
@@ -97,7 +101,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Annonce globale (MJ uniquement)"
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "Pour plus d'informations sur une commande, tapez /help <commande>"
 
 #: src/commandhandler.cpp:174
@@ -287,10 +292,6 @@ msgstr "Commande : /who"
 msgid "This command displays the number of players currently online."
 msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "Commande inconnue."
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
@@ -299,28 +300,33 @@ msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
 
-#: src/commandhandler.cpp:347
-#, c-format
+#: src/commandhandler.cpp:348
+#, fuzzy, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 "Vous ne pouvez pas créer une fenêtre de dialogue privée avec '%s' ! Elle "
 "existe déjà ou il s'agit de vous même."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr "Ce message ferme la conversation."
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr "La touche enter ferme la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr "Ce message ferme maintenant la conversation."
 
@@ -331,46 +337,57 @@ msgstr ""
 "Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
 "\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "Vous n'avez pas pu rejoindre le groupe !"
+
+#: src/engine.cpp:89
+#, fuzzy, c-format
+msgid "Error while loading %s"
+msgstr ""
+"Base de donnée des PNJ : Erreur pendant le chargement du fichier npcs.xml !"
+
+#: src/game.cpp:237
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr "Capture d'écran sauvegardée dans ~/"
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr "Impossible de sauvegarder la capture d'écran !"
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr "Êtes-vous sûr de vouloir sortir ?"
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr "non"
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
@@ -418,22 +435,22 @@ msgstr "Vendre"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Annuler"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "Modifier l'adresse mail"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "Compte : %s"
@@ -443,7 +460,7 @@ msgid "Type New Email Address twice:"
 msgstr "Entrer de nouveau la nouvelle adresse mail :"
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
@@ -491,7 +508,7 @@ msgid "Please distribute %d points"
 msgstr "Veuillez distribuer %d points"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Erreur"
@@ -509,78 +526,75 @@ msgstr "Caractéristiques du personnage Ok"
 msgid "Please remove %d points"
 msgstr "Veuillez retirer %d points"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Confirmer la suppression du personnage"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "Gestion du compte et du personnage"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Sélectionner votre personnnage"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
 msgstr "Ok"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Précédent"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Suivant"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Nouveau"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Se désinscrire"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Argent : %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "Niveau de Compétences : %d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -590,20 +604,20 @@ msgstr "Argent : %s"
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr "%d joueurs sont présents."
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr "Présent : "
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr "Présence inscrite dans le fichier d'enregistrement."
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message privé envoyé à %s : %s"
@@ -620,16 +634,12 @@ msgstr "Non"
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr "Impossible de charger le fichier selection.png"
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Équipement"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -662,12 +672,12 @@ msgid "Inventory"
 msgstr "Inventaire"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Utiliser"
 
@@ -679,7 +689,7 @@ msgstr "Jeter"
 msgid "Split"
 msgstr "Partager"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr "Cases :"
 
@@ -687,6 +697,10 @@ msgstr "Cases :"
 msgid "Weight:"
 msgstr "Poids :"
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "Tout"
@@ -736,11 +750,6 @@ msgstr "Récent :"
 msgid "Remember Username"
 msgstr "Se souvenir du nom d'utilisateur"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Ok"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "S'inscrire"
@@ -762,7 +771,7 @@ msgstr "Jeter le sort d'essai 2"
 msgid "Cast Test Spell 3"
 msgstr "Jeter le sort d'essai 3"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr "Plan"
 
@@ -782,10 +791,19 @@ msgstr "PNJ"
 msgid "Reset"
 msgstr "Réinitialiser"
 
+#: src/gui/npcpostdialog.cpp:44
+#, fuzzy
+msgid "To:"
+msgstr "Sujet : "
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr "Envoyer"
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr "Texte"
@@ -984,6 +1002,34 @@ msgstr "1/4 Barre de vie"
 msgid "Party (%s)"
 msgstr "Groupe"
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, fuzzy, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s a quitté le groupe."
+
+#: src/gui/partywindow.cpp:185
+#, fuzzy, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s a quitté le groupe."
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, fuzzy, c-format
+msgid "Rejected invite from %s."
+msgstr "Rejeté par le server"
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Ajouter le nom dans la conversation@@"
@@ -1168,15 +1214,15 @@ msgstr "Veuillez entrer l'adresse et le port du serveur."
 msgid "Select Server"
 msgstr "Sélectionner un serveur"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
@@ -1498,10 +1544,6 @@ msgstr "Paramètres d'effet de particules changés."
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr "skills.xml"
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "Aptitude mystérieuse"
@@ -1636,10 +1678,6 @@ msgstr "Entreposer"
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr "Cases : "
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Proposer un troc"
@@ -1688,7 +1726,8 @@ msgstr ""
 "dans cette fenêtre."
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+#, fuzzy
+msgid "You don't have enough money."
 msgstr "Vous n'avez pas assez d'argent"
 
 #: src/gui/updatewindow.cpp:91
@@ -1816,10 +1855,6 @@ msgstr "Annonce globale de %s :"
 msgid "%s whispers: "
 msgstr "Message privé de %s : "
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr "Objet inconnu"
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr "Impossible d'envoyer une conversation vide !"
@@ -1948,7 +1983,8 @@ msgid "Inventory Window"
 msgstr "Fenêtre de l'inventaire"
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
+#, fuzzy
+msgid "Equipment Window"
 msgstr "Fenêtre de l'équipement"
 
 #: src/keyboardconfig.cpp:75
@@ -2077,109 +2113,112 @@ msgstr "Métier"
 msgid "Unknown Skill"
 msgstr "Compétence inconnue"
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr "Hôte de mise à jour incorrect : "
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 " ne peut pas être créé, mais il n'existe pourtant pas ! Fermeture du "
 "programme."
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr "Impossibler d'assigner "
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr " mode d'affichage "
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr "tmw"
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr "Options :"
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr "  -C --config-file : Fichier de configuration a utiliser"
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 "  -d --data : Repertoire dans lequel les données du jeu se trouvent et "
 "seront chargées"
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 "  -D --default : Choisir le serveur de personnages et le personnage par "
 "défaut"
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr "  -h --help : Montre cette aide"
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr "  -S --home-dir : Répertoire a utiliser comme répertoire principal"
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr "  -H --update-host : Utilise cette mise à jour d'Hôte"
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr "  -P --password : Se connecter avec ce mot de passe"
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr "  -c --character : Se connecter avec ce personnage"
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+#, fuzzy
+msgid "  -p --port        : Login server port"
 msgstr "  -p --port : Port de connexion au serveur"
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+#, fuzzy
+msgid "  -s --server      : Login server name or IP"
 msgstr "  -s --server : Ip ou nom du serveur pour la connection"
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr "  -u --skip-update : Passer les téléchargements de mise à jour"
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : Désactive OpenGL pour cette session"
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr "  -v --version : Affiche la version"
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, fuzzy, c-format
+msgid "The Mana World %s"
 msgstr "Le Monde de Mana "
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "Connexion au serveur de cartes..."
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "Connexion au serveur de personnages..."
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "Connexion au serveur de comptes..."
 
@@ -2192,23 +2231,28 @@ msgid "Kick succeeded!"
 msgstr "Sortie de la personne effectuée avec succès !"
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+#, fuzzy
+msgid "Nothing to sell."
 msgstr "Rien à vendre"
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+#, fuzzy
+msgid "Thanks for buying."
 msgstr "Merci pour votre achat"
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+#, fuzzy
+msgid "Unable to buy."
 msgstr "Impossible d'acheter"
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+#, fuzzy
+msgid "Thanks for selling."
 msgstr "Merci d'avoir vendu"
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+#, fuzzy
+msgid "Unable to sell."
 msgstr "Impossible de vendre"
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2234,8 +2278,9 @@ msgid "Info"
 msgstr "Informations"
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr "Personnage supprimé"
+#, fuzzy
+msgid "Character deleted."
+msgstr "Confirmer la suppression du personnage"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2271,19 +2316,21 @@ msgid "Luck:"
 msgstr "Chance :"
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+#, fuzzy
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 "Le message privé ne peut pas être envoyé, l'utilisateur n'est pas connecté."
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+#, fuzzy
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 "Le message privé ne peut pas être envoyé, vous êtes ignoré par l'utilisateur"
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr "Les salons ne sont pas gérés !"
 
@@ -2494,61 +2541,84 @@ msgstr "Partage d'expérience non authorisé."
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+#, fuzzy
+msgid "Unable to pick up item."
 msgstr "Impossible de ramasser l'objet"
 
-#: src/net/ea/inventoryhandler.cpp:194
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
+#, fuzzy, c-format
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr "Vous avez ramassé %s [@@%d|%s@@]"
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+#, fuzzy
+msgid "Failed to use item."
 msgstr "Impossible d'utiliser cet objet"
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+#, fuzzy
+msgid "Account was not found. Please re-login."
+msgstr "Compte non connecté. Identifiez-vous tout d'abord."
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr "Ancien mot de passe incorrect"
+
+#: src/net/ea/loginhandler.cpp:82
+#, fuzzy
+msgid "New password too short"
+msgstr "Nouveau mot de passe incorrect"
+
+#: 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
+msgid "Unknown error"
+msgstr "Erreur inconnue"
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr "ID non enregistrée"
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr "Mauvais mot de passe"
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr "Compte expiré"
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr "Rejeté par le server"
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 "Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
 "contact avec l'équipe des MJ."
 
-#: src/net/ea/loginhandler.cpp:127
-#, c-format
+#: src/net/ea/loginhandler.cpp:159
+#, fuzzy, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 "Vous avez été banni temporairement du jeu jusqu'au %s.\n"
 " Merci de contacter l'équipe de MJ par le forum."
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr "Ce nom d'utilisateur est déjà utilisé"
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr "Erreur inconnue"
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr "Le groupe n'a pu être créé."
@@ -2743,7 +2813,8 @@ msgid "You picked up "
 msgstr "Vous avez ramassé "
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+#, fuzzy
+msgid "Equip arrows first."
 msgstr "Equiper les flêches en premier"
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2826,63 +2897,64 @@ msgstr "Vous n'avez rien pu voler..."
 msgid "Poison had no effect..."
 msgstr "Le poison fut sans effet..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#, fuzzy
+msgid "Request for Trade"
 msgstr "Demande d'échange"
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, fuzzy, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr " souhaite troquer avec vous. Acceptez-vous ?"
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Echange impossible. Ce personnage n'existe pas."
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Echange annulé pour une raison inconnue."
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
+#: src/net/ea/tradehandler.cpp:132
+#, fuzzy, c-format
+msgid "Trade: You and %s"
 msgstr "Echange : Vous et "
 
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
-msgstr "Echanger avec "
-
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
-msgstr " annulé"
+#: src/net/ea/tradehandler.cpp:139
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Echange annulé."
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+#, fuzzy
+msgid "Unhandled trade cancel packet."
 msgstr "Paquet de troc non pris en charge"
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 "Impossible de rajouter un objet. Votre partenaire pour cet échange est "
 "surchargé."
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
 "de place libre."
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr "Impossible de rajouter un objet pour une raison inconnue."
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Echange annulé."
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Echange finalisé."
 
@@ -2902,8 +2974,9 @@ msgstr "Pas de serveur de jeu disponible."
 msgid "Willpower:"
 msgstr "Volonté :"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, fuzzy, c-format
+msgid "Topic: %s"
 msgstr "Sujet : "
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2911,6 +2984,29 @@ msgstr "Sujet : "
 msgid "Willpower %+d"
 msgstr "Volonté %+d"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "Impossible de créer le dossier de mise à jour !"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+#, fuzzy
+msgid "Invite sent."
+msgstr "Inviter un utilisateur"
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+#, fuzzy
+msgid "Failed to promote member."
+msgstr "Impossible d'utiliser cet objet"
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "Mauvaise empreinte magique"
@@ -2927,10 +3023,6 @@ msgstr "Le serveur est plein"
 msgid "New password incorrect"
 msgstr "Nouveau mot de passe incorrect"
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr "Ancien mot de passe incorrect"
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "Compte non connecté. Identifiez-vous tout d'abord."
@@ -2967,6 +3059,30 @@ msgstr "Ce nom d'utilisateur existe déjà"
 msgid "Email address already exists"
 msgstr "Cette adresse email existe déjà"
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+#, fuzzy
+msgid "Accepting incoming trade requests."
+msgstr "Accepter les requêtes d'échanges entrantes"
+
+#: src/net/tmwserv/tradehandler.cpp:95
+#, fuzzy
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorer les requêtes d'échanges entrantes"
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, fuzzy, c-format
+msgid "Trading with %s"
+msgstr "Echanger avec "
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2987,11 +3103,11 @@ msgstr "PV %+d"
 msgid "MP %+d"
 msgstr "PM %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
-msgstr "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
+msgstr "Objet inconnu"
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "Aonyme"
 
@@ -2999,14 +3115,29 @@ msgstr "Aonyme"
 msgid "unnamed"
 msgstr "anonyme"
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr "monsters.xml"
+#~ msgid "Select Character"
+#~ msgstr "Sélectionner votre personnnage"
 
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
-"Base de donnée des PNJ : Erreur pendant le chargement du fichier npcs.xml !"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Impossible de charger le fichier selection.png"
+
+#~ msgid "skills.xml"
+#~ msgstr "skills.xml"
+
+#~ msgid "Slots: "
+#~ msgstr "Cases : "
+
+#~ msgid "Player deleted"
+#~ msgstr "Personnage supprimé"
+
+#~ msgid " cancelled"
+#~ msgstr " annulé"
+
+#~ msgid "items.xml"
+#~ msgstr "items.xml"
+
+#~ msgid "monsters.xml"
+#~ msgstr "monsters.xml"
 
 #~ msgid "MiniMap"
 #~ msgstr "Plan"
diff --git a/po/he.po b/po/he.po
index 2dec47e4..e52951c8 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-09 12:19+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +405,22 @@ msgstr "מכר"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "ביטול"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "שנה כתובת דואר אלקטרוני"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "משתמש: %s"
@@ -416,7 +430,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "שנה סיסמה"
 
@@ -464,7 +478,7 @@ msgid "Please distribute %d points"
 msgstr "אנא חלק %d נקודות"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "שגיאה"
@@ -482,78 +496,75 @@ msgstr "נתוני שחקן - אישור"
 msgid "Please remove %d points"
 msgstr "אנא הסר %d נקודות"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "אשר מחיקת שחקן"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "ניהול משתמש ושחקן"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "אישור"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "הקודם"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "הבא"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "שם: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "חדש"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "מחק"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "בטל רישום"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "זהב: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +574,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +604,12 @@ msgstr "לא"
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "ציוד"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "הורד"
 
@@ -635,12 +642,12 @@ msgid "Inventory"
 msgstr "ציוד"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "החזק"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "השתמש"
 
@@ -652,7 +659,7 @@ msgstr "השלך"
 msgid "Split"
 msgstr "פצל"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +667,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "אישור"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +720,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr "זכור שם משתמש"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "הרשם"
@@ -735,7 +741,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "מיני-מפה"
@@ -757,10 +763,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -962,6 +976,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1147,15 +1189,15 @@ msgstr "אנא הכנס גם את כתובת וגם את פורט השרת."
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "הגדרות"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "אשר"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "אתחל חלונות"
 
@@ -1475,10 +1517,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1613,10 +1651,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "מציע לחור"
@@ -1663,7 +1697,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1788,10 +1822,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1919,8 +1949,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "ציוד"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2049,103 +2080,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2158,23 +2190,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2198,8 +2230,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "אשר מחיקת שחקן"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2235,17 +2268,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2447,57 +2480,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2678,7 +2730,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2761,59 +2813,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2833,8 +2884,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "כח רצון:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2842,6 +2894,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "כח רצון:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2858,10 +2930,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2898,6 +2966,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2918,11 +3008,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2930,14 +3020,6 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
-
 #~ msgid "Scroll radius"
 #~ msgstr "תווך גלילה"
 
diff --git a/po/hr.po b/po/hr.po
index e175b7e9..bc396d50 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-04-21 16:37+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Pomoć --"
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,55 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "Neuspjelo priključivanje družini!"
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +406,22 @@ msgstr "Prodaj"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Poništi"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "Promijeni Email Adresu"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "Korisnički račun: %s"
@@ -416,7 +431,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "Promijeni Lozinku"
 
@@ -464,7 +479,7 @@ msgid "Please distribute %d points"
 msgstr "Molimo, rasporedi %d bodova"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Greška"
@@ -482,78 +497,75 @@ msgstr "Podaci lika su u redu"
 msgid "Please remove %d points"
 msgstr "Molimo, oduzmi %d bodova"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Potvrdi Brisanje Lika"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "Upravljanje Računom i Likovima"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Odaberi lika"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
 msgstr "U redu"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Prethodni"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Slijedeći"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Ime: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Novi"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Odjavi"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Novac: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "Nivo poslaČ %d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +575,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -593,16 +605,12 @@ msgstr "Ne"
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Oprema"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Skini opremu"
 
@@ -635,12 +643,12 @@ msgid "Inventory"
 msgstr "Zalihe"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Upotrijebi"
 
@@ -652,7 +660,7 @@ msgstr "Ispusti"
 msgid "Split"
 msgstr "Razdvoji"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +668,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "U redu"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +721,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "U redu"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Registriraj se"
@@ -735,7 +742,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "Karta"
@@ -757,10 +764,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -962,6 +977,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1147,15 +1190,15 @@ msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 msgid "Select Server"
 msgstr "Odaberi poslužitelj"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Primjeni"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
@@ -1475,10 +1518,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1613,10 +1652,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Predloži razmjenu"
@@ -1663,8 +1698,9 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
-msgstr ""
+#, fuzzy
+msgid "You don't have enough money."
+msgstr "Nemaš podsjetnika!"
 
 #: src/gui/updatewindow.cpp:91
 msgid "Updating..."
@@ -1788,10 +1824,6 @@ msgstr "Javna obavijest od %s:"
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1919,8 +1951,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Oprema"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2049,103 +2082,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2158,23 +2192,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2198,8 +2232,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Potvrdi Brisanje Lika"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2235,17 +2270,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2447,57 +2482,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2678,7 +2732,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2761,59 +2815,58 @@ msgstr "Krađa nije uspjela..."
 msgid "Poison had no effect..."
 msgstr "Otrov nije uspio..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2833,8 +2886,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Snaga volje:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2842,6 +2896,27 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Snaga volje:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "Neuspjelo stvaranje lika!"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2858,10 +2933,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2898,6 +2969,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2918,11 +3011,11 @@ msgstr "Zdravlje %+d"
 msgid "MP %+d"
 msgstr "Mana %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2930,13 +3023,8 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Odaberi lika"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Polumjer klizanja"
diff --git a/po/id.po b/po/id.po
index 52188965..843ee13d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-09 12:22+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +405,22 @@ msgstr "Jual"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Batal"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -416,7 +430,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -464,7 +478,7 @@ msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Kesalahan"
@@ -482,78 +496,75 @@ msgstr "Stats Karakter OK"
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d point"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Pilih Karakter"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Berikutnya"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Buat baru"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Tidak terdaftar"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Uang: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +574,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +604,12 @@ msgstr "Tidak"
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Perlengkapan"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr ""
 
@@ -635,12 +642,12 @@ msgid "Inventory"
 msgstr "Inventaris"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Gunakan"
 
@@ -652,7 +659,7 @@ msgstr "Jatuh"
 msgid "Split"
 msgstr "Pecah"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +667,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +720,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Mendaftar"
@@ -735,7 +741,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "MiniMap"
@@ -757,10 +763,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -962,6 +976,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1147,15 +1189,15 @@ msgstr "Tolong tulis address dan port dari server"
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Atur"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr ""
 
@@ -1475,10 +1517,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1613,10 +1651,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Menawarkan tukar menukar"
@@ -1663,7 +1697,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1788,10 +1822,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1919,8 +1949,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Perlengkapan"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2048,103 +2079,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2157,23 +2189,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2197,8 +2229,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Stats Karakter OK"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2234,17 +2267,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2446,57 +2479,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2677,7 +2729,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2760,59 +2812,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2832,8 +2883,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Ketekunan"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2841,6 +2893,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Ketekunan"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2857,10 +2929,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2897,6 +2965,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2917,11 +3007,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2929,13 +3019,8 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Pilih Karakter"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Radius gulungan"
diff --git a/po/it.po b/po/it.po
index 4704df57..20bb4d9a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-09 12:36+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -19,6 +19,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -92,7 +96,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -267,10 +271,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -279,26 +279,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -307,45 +312,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Esci"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -393,22 +407,22 @@ msgstr "Vendi"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Cancella"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -418,7 +432,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -466,7 +480,7 @@ msgid "Please distribute %d points"
 msgstr "Prego distribuisci %d points"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Errore"
@@ -484,78 +498,75 @@ msgstr "Statistiche personaggio OK"
 msgid "Please remove %d points"
 msgstr "Prego rimuovi %d punti"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Scelta Personaggio"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Precedente"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Prossimo"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Nome : %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Nuovo"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Cancella registrazione"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Monete: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -565,20 +576,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -595,16 +606,12 @@ msgstr "No"
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Rimuovi"
 
@@ -637,12 +644,12 @@ msgid "Inventory"
 msgstr "Inventario"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Equipaggia"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Usa"
 
@@ -654,7 +661,7 @@ msgstr "Lascia"
 msgid "Split"
 msgstr "Lascia"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -662,6 +669,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -711,11 +722,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Registra"
@@ -737,7 +743,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "Mini mappa"
@@ -759,10 +765,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -964,6 +978,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1149,15 +1191,15 @@ msgstr "Per favore inserisci l'indirizzo e la porta del server."
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Applica"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
@@ -1477,10 +1519,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1615,10 +1653,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Inizia uno scambio"
@@ -1665,7 +1699,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1790,10 +1824,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1921,8 +1951,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Equipaggiamento"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2051,103 +2082,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2160,23 +2192,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2200,8 +2232,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Statistiche personaggio OK"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2237,17 +2270,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2449,57 +2482,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2680,7 +2732,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2763,59 +2815,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2835,8 +2886,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Volontà:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2844,6 +2896,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Volontà:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2860,10 +2932,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2900,6 +2968,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2920,11 +3010,11 @@ msgstr "PF %+d"
 msgid "MP %+d"
 msgstr "PM %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2932,13 +3022,8 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Scelta Personaggio"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Raggio dello scroll"
diff --git a/po/ja.po b/po/ja.po
index 20094d78..d8592575 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-09 12:31+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "終了"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +405,22 @@ msgstr ""
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "取消"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -416,7 +430,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -464,7 +478,7 @@ msgid "Please distribute %d points"
 msgstr "%d ポイントを取り分けください"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "エラー"
@@ -482,78 +496,75 @@ msgstr ""
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラは消してもいいですか?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "キャラを選択"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "了解"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "前へ"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "次へ"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "新規"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "削除"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "登録削除"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "GP: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +574,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +604,12 @@ msgstr "いいえ"
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr ""
 
@@ -635,12 +642,12 @@ msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "使う"
 
@@ -652,7 +659,7 @@ msgstr ""
 msgid "Split"
 msgstr "分割"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +667,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "了解"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +720,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr ""
@@ -735,7 +741,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr ""
 
@@ -756,10 +762,18 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -960,6 +974,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1145,15 +1187,15 @@ msgstr ""
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "セットアップ"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr ""
 
@@ -1472,10 +1514,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1610,10 +1648,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr ""
@@ -1660,7 +1694,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1785,10 +1819,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1916,7 +1946,7 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
+msgid "Equipment Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:75
@@ -2045,103 +2075,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2154,23 +2185,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2194,7 +2225,7 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
+msgid "Character deleted."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:140
@@ -2231,17 +2262,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2443,57 +2474,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2674,7 +2724,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2757,59 +2807,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2829,8 +2878,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "精神:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2838,6 +2888,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "精神:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2854,10 +2924,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2894,6 +2960,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2914,11 +3002,11 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2926,10 +3014,5 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "キャラを選択"
diff --git a/po/nl.po b/po/nl.po
index 30ae28da..d78da96f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-18 16:53+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,8 +94,9 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
-msgstr ""
+#, fuzzy
+msgid "For more information, type /help <command>."
+msgstr "Commando: /help <commando>"
 
 #: src/commandhandler.cpp:174
 msgid "Command: /help"
@@ -265,10 +270,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Type /help voor een lijst van commando's."
@@ -277,26 +278,31 @@ msgstr "Type /help voor een lijst van commando's."
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +311,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +406,22 @@ msgstr "Verkopen"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Annuleren"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -416,7 +431,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -464,7 +479,7 @@ msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Fout"
@@ -482,78 +497,75 @@ msgstr "Attributen van personage OK"
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Kies Personage"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
 msgstr "OK"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Vorige"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Volgende"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Nieuw"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Registreren"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +575,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +605,12 @@ msgstr "Nee"
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -635,12 +643,12 @@ msgid "Inventory"
 msgstr "Inventaris"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -652,7 +660,7 @@ msgstr "Neerleggen"
 msgid "Split"
 msgstr "Splitsen"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +668,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "OK"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +721,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr "Onthoud Naam"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "OK"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Aanmelden"
@@ -735,7 +742,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "Kaartje"
@@ -757,10 +764,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -962,6 +977,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1147,15 +1190,15 @@ msgstr ""
 msgid "Select Server"
 msgstr "Server Selecteren"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
@@ -1476,10 +1519,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1614,10 +1653,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr ""
@@ -1664,7 +1699,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1789,10 +1824,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1920,8 +1951,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Uitrusting"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2050,103 +2082,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "Verbinden met de map server..."
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "Verbinden met de karakter server..."
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "Verbinden met de account server..."
 
@@ -2159,23 +2192,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2199,8 +2232,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Attributen van personage OK"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2236,17 +2270,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2448,57 +2482,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:82
+msgid "New password too short"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: 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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2679,7 +2732,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2762,59 +2815,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2834,8 +2886,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Wilskracht:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2843,6 +2896,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Wilskracht:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2859,10 +2932,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2899,6 +2968,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2919,11 +3010,11 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "Naamloos"
 
@@ -2931,13 +3022,8 @@ msgstr "Naamloos"
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Kies Personage"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Scroll radius"
diff --git a/po/pl.po b/po/pl.po
index 2815a5ec..74e20fc8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-05-11 22:56+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -19,6 +19,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-13 18:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "Nieznane polecenie."
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Pomoc --"
@@ -95,7 +99,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalne ogłoszenie (tylko GM)"
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "Aby uzyskać więcej informacji wpisz /help <komenda>"
 
 #: src/commandhandler.cpp:174
@@ -280,10 +285,6 @@ msgstr "Komenda: /who"
 msgid "This command displays the number of players currently online."
 msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "Nieznane polecenie."
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Wpisz /help aby usyskać listę komend."
@@ -292,26 +293,31 @@ msgstr "Wpisz /help aby usyskać listę komend."
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
@@ -320,45 +326,55 @@ msgstr "Wiadomość od teraz zamyka czat."
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "Nie można dołączyć do grupy!"
+
+#: src/engine.cpp:89
+#, fuzzy, c-format
+msgid "Error while loading %s"
+msgstr "Baza NPC: Błąd podczas wczytywania npcs.xml!"
+
+#: src/game.cpp:237
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr "Zrzut ekranu zapisany do ~/"
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr "Połączenie z serwerem zostało utracone, program zakończy pracę"
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr "Czy na pewno chcesz wyjść?"
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr "nie"
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
@@ -406,22 +422,22 @@ msgstr "Sprzedaj"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Anuluj"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "Zmień adres Email"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "Konto: %s"
@@ -431,7 +447,7 @@ msgid "Type New Email Address twice:"
 msgstr "Wpisz dwukrotnie nowy adres email:"
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "Zmień hasło"
 
@@ -479,7 +495,7 @@ msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Błąd"
@@ -497,78 +513,75 @@ msgstr "Statystyki postaci w porządku."
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Potwierdź usunięcie postaci"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "Zarządzanie kontem i postaciami"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Wybierz postać"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
 msgstr "Ok"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Poprzednia"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Następna"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Nowa"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Wyrejestruj"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Pieniądze: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "Poziom Pracy: %d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -578,20 +591,20 @@ msgstr "Pieniądze: %s"
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr "Obecny: "
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr "Dozór wpisany do dziennika zapisu"
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -608,16 +621,12 @@ msgstr "Nie"
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr "Nie można załadować selection.png"
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Ekwipunek"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -650,12 +659,12 @@ msgid "Inventory"
 msgstr "Inwentarz"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Załóż"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Użyj"
 
@@ -667,7 +676,7 @@ msgstr "Upuść"
 msgid "Split"
 msgstr "Podziel"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr "Miejsc:"
 
@@ -675,6 +684,10 @@ msgstr "Miejsc:"
 msgid "Weight:"
 msgstr "Waga:"
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "wszystkie"
@@ -724,11 +737,6 @@ msgstr "Ostatni:"
 msgid "Remember Username"
 msgstr "Zapamiętaj użytkownika"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Ok"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Rejestruj"
@@ -750,7 +758,7 @@ msgstr "Test Rzucania Zaklęcia 2"
 msgid "Cast Test Spell 3"
 msgstr "Test Rzucania Zaklęcia 3"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr ""
 
@@ -770,10 +778,19 @@ msgstr "NPC"
 msgid "Reset"
 msgstr "Resetuj"
 
+#: src/gui/npcpostdialog.cpp:44
+#, fuzzy
+msgid "To:"
+msgstr "Temat: "
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr "Wyślij"
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr "Tekst"
@@ -972,6 +989,34 @@ msgstr "1/4 Paska HP"
 msgid "Party (%s)"
 msgstr "Grupa"
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, fuzzy, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s opuścił twoją grupę."
+
+#: src/gui/partywindow.cpp:185
+#, fuzzy, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s opuścił twoją grupę."
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, fuzzy, c-format
+msgid "Rejected invite from %s."
+msgstr "Odrzucony z serwera"
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Dodaj imię do czatu@@"
@@ -1156,15 +1201,15 @@ msgstr "Proszę wpisać adres i port serwera"
 msgid "Select Server"
 msgstr "Wybierz serwer"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
@@ -1483,10 +1528,6 @@ msgstr "Zmieniono ustawienia efektów cząsteczek"
 msgid "Changes will take effect on map change."
 msgstr "Zmiany nastąpią po zmianie mapy."
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr "skills.xml"
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "Tajemnicza umiejętność"
@@ -1621,10 +1662,6 @@ msgstr "Przechowaj"
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr "Miejsca: "
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Oferuj handel"
@@ -1673,7 +1710,8 @@ msgstr ""
 "rodzaj przedmiotu w okienku."
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+#, fuzzy
+msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy"
 
 #: src/gui/updatewindow.cpp:91
@@ -1798,10 +1836,6 @@ msgstr "Ogłoszenie ogólne od %s:"
 msgid "%s whispers: "
 msgstr "%s szepcze: "
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr "Nieznany przedmiot"
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr "Nie można wysłać pustego czatu!"
@@ -1930,7 +1964,8 @@ msgid "Inventory Window"
 msgstr "Okno Inwentarza"
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
+#, fuzzy
+msgid "Equipment Window"
 msgstr "Okno Ekwipunku"
 
 #: src/keyboardconfig.cpp:75
@@ -2059,103 +2094,104 @@ msgstr "Rrzemiosło"
 msgid "Unknown Skill"
 msgstr "Nieznana Umiejętność"
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr "Nieprawidłowy host aktualizacji: "
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr " nie może być utworzony, ale nie istnieje! Kończenie."
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr "Nie można ustawić "
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr " tryb wideo: "
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr "tmw"
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, fuzzy, c-format
+msgid "The Mana World %s"
 msgstr "The Mana World "
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "Łączenie z serwerem map..."
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "Łączenie z serwerem postaci..."
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "Łączenie z serwerem kont..."
 
@@ -2168,23 +2204,28 @@ msgid "Kick succeeded!"
 msgstr "Wykopanie powiodło się!"
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+#, fuzzy
+msgid "Nothing to sell."
 msgstr "Nic do sprzedania"
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+#, fuzzy
+msgid "Thanks for buying."
 msgstr "Dzięki za zakup"
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+#, fuzzy
+msgid "Unable to buy."
 msgstr "Nie można kupić"
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+#, fuzzy
+msgid "Thanks for selling."
 msgstr "Dzięki za sprzedaż"
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+#, fuzzy
+msgid "Unable to sell."
 msgstr "Nie można sprzedać"
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2209,8 +2250,9 @@ msgid "Info"
 msgstr "Info"
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr "Gracz usunięty"
+#, fuzzy
+msgid "Character deleted."
+msgstr "Potwierdź usunięcie postaci"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2246,17 +2288,19 @@ msgid "Luck:"
 msgstr "Szczęście:"
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+#, fuzzy
+msgid "Whisper could not be sent, user is offline."
 msgstr "Szept nie mógł zostać wysłany, uzytkownik nie jest połączony"
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+#, fuzzy
+msgid "Whisper could not be sent, ignored by user."
 msgstr "Szept nie mógł zostać wysłany, został zignorowany przez użytkownika"
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr "Kanały nie są wspierane!"
 
@@ -2463,59 +2507,80 @@ msgstr "Podział doświadczenia wyłączony."
 msgid "Experience sharing not possible."
 msgstr "Podział doświadczenia nie jest możliwy."
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+#, fuzzy
+msgid "Unable to pick up item."
 msgstr "Nie można podnieść przedmiotu"
 
-#: src/net/ea/inventoryhandler.cpp:194
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:199
+#, fuzzy, c-format
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr "Podniosłeś "
+
+#: src/net/ea/inventoryhandler.cpp:245
+#, fuzzy
+msgid "Failed to use item."
 msgstr "Użycie przedmiotu nie powiodło się"
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr "Nieznany błąd"
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr "Niezarejestrowany ID"
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr "Nieprawidłowe hasło"
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr "Konto wygasło"
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr "Odrzucony z serwera"
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr "Zostałeś tymczasowo zbanowany. Proszę skontaktować się z zespołem GM."
 
-#: src/net/ea/loginhandler.cpp:127
-#, c-format
+#: src/net/ea/loginhandler.cpp:159
+#, fuzzy, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 "Zostałeś tymczasowo zbanowany aż do %s.\n"
 " Proszę skontaktować się z zespołem GM poprzez forum."
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr "Ta nazwa użytkownika jest już zajęta"
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr "Nieznany błąd"
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr "Nie można utworzyć grupy."
@@ -2700,7 +2765,8 @@ msgid "You picked up "
 msgstr "Podniosłeś "
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+#, fuzzy
+msgid "Equip arrows first."
 msgstr "Najpierw załóż strzały"
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2783,60 +2849,61 @@ msgstr "Nie mogę nic ukraść..."
 msgid "Poison had no effect..."
 msgstr "Trucizna nie zadziałała..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#, fuzzy
+msgid "Request for Trade"
 msgstr "Prośba o handel"
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, fuzzy, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr " chce handlować z tobą, zgadzasz się?"
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Handlowanie nie jest możlwe. Kontrahent jest za daleko."
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Handlowanie nie jest możliwe. Postać nie istnieje."
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handel anulowany z nieznanego powodu."
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
+#: src/net/ea/tradehandler.cpp:132
+#, fuzzy, c-format
+msgid "Trade: You and %s"
 msgstr "Handel: Ty i "
 
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
-msgstr "Handel z "
-
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
-msgstr " anulował"
+#: src/net/ea/tradehandler.cpp:139
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel anulowany."
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+#, fuzzy
+msgid "Unhandled trade cancel packet."
 msgstr "Nieobsługiwany pakiet anulowania handlu"
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Dodanie przedmiotu nie powiodło się. Kontrahent jest przeciążony."
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Kontrahent nie posiada wolnego miejsca."
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr "Dodanie przedmiotu nie powiodło się z nieznanego powodu."
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Handel anulowany."
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Handel zakończony."
 
@@ -2856,8 +2923,9 @@ msgstr "Brak dostępnych serwerów gier"
 msgid "Willpower:"
 msgstr "Siła woli:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, fuzzy, c-format
+msgid "Topic: %s"
 msgstr "Temat: "
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2865,6 +2933,29 @@ msgstr "Temat: "
 msgid "Willpower %+d"
 msgstr "Siłą woli: %d"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+#, fuzzy
+msgid "Invite sent."
+msgstr "Zaproś Użytkownika"
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+#, fuzzy
+msgid "Failed to promote member."
+msgstr "Użycie przedmiotu nie powiodło się"
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2881,10 +2972,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2921,6 +3008,30 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+#, fuzzy
+msgid "Accepting incoming trade requests."
+msgstr "Akceptowanie przychodzących próśb o handel"
+
+#: src/net/tmwserv/tradehandler.cpp:95
+#, fuzzy
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorowanie przychodzących próśb o handel"
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, fuzzy, c-format
+msgid "Trading with %s"
+msgstr "Handel z "
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2941,11 +3052,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
-msgstr "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
+msgstr "Nieznany przedmiot"
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "Nienazwany"
 
@@ -2953,13 +3064,29 @@ msgstr "Nienazwany"
 msgid "unnamed"
 msgstr "nienazwany"
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr "monsters.xml"
+#~ msgid "Select Character"
+#~ msgstr "Wybierz postać"
 
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr "Baza NPC: Błąd podczas wczytywania npcs.xml!"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Nie można załadować selection.png"
+
+#~ msgid "skills.xml"
+#~ msgstr "skills.xml"
+
+#~ msgid "Slots: "
+#~ msgstr "Miejsca: "
+
+#~ msgid "Player deleted"
+#~ msgstr "Gracz usunięty"
+
+#~ msgid " cancelled"
+#~ msgstr " anulował"
+
+#~ msgid "items.xml"
+#~ msgstr "items.xml"
+
+#~ msgid "monsters.xml"
+#~ msgstr "monsters.xml"
 
 #~ msgid "MiniMap"
 #~ msgstr "MiniMapa"
diff --git a/po/pt.po b/po/pt.po
index b26cb052..020610e1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-09 12:36+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Sair"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +405,22 @@ msgstr "Vender"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -416,7 +430,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -464,7 +478,7 @@ msgid "Please distribute %d points"
 msgstr "Por favor distribua %d potos"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Erro"
@@ -482,78 +496,75 @@ msgstr "Estatisticas da personagem OK"
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Seleccione um Personagem"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Novo"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Remover o Registo"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +574,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +604,12 @@ msgstr "Não"
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -635,12 +642,12 @@ msgid "Inventory"
 msgstr "Inventário"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Usar"
 
@@ -652,7 +659,7 @@ msgstr "Largar"
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +667,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +720,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Registo"
@@ -735,7 +741,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "MiniMapa"
@@ -757,10 +763,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -962,6 +976,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1147,15 +1189,15 @@ msgstr "Por favor escreva o endereço e a porta do servidor."
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Configuração"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Reiniciar Janelas"
 
@@ -1475,10 +1517,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1613,10 +1651,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Propor Negócio"
@@ -1663,7 +1697,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1788,10 +1822,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1919,8 +1949,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Equipamento"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2049,103 +2080,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2158,23 +2190,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2198,8 +2230,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Estatisticas da personagem OK"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2235,17 +2268,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2449,57 +2482,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2680,7 +2732,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2763,59 +2815,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2835,8 +2886,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Força de Vontade:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2844,6 +2896,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Força de Vontade:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2860,10 +2932,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2900,6 +2968,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2924,11 +3014,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2936,10 +3026,5 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Seleccione um Personagem"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4579283f..0ba90749 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-21 20:48+0000\n"
 "Last-Translator: Bruno <brunorafaelcardoso@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "Comando desconhecido."
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "--Ajuda--"
@@ -90,7 +94,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "Para mais informações, digite /help <comando>"
 
 #: src/commandhandler.cpp:174
@@ -265,10 +270,6 @@ msgstr "Comando: /who"
 msgid "This command displays the number of players currently online."
 msgstr "Exibe o total de jogadores online."
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "Comando desconhecido."
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Digite /help para uma lista de todos os comandos."
@@ -277,26 +278,31 @@ msgstr "Digite /help para uma lista de todos os comandos."
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +311,55 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "Impossivel entrar no grupo!"
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Sair"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +407,22 @@ msgstr "Vender"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "Alterar e-mail"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "Conta: %s"
@@ -416,7 +432,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -464,7 +480,7 @@ msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Erro"
@@ -482,78 +498,75 @@ msgstr "Status do personagem OK"
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "Gerenciamento de Conta e Personagem"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Selecionar personagem"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr "OK"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Próximo"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Novo"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "Nível de Trabalho: %d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +576,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurrando para %s: %s"
@@ -593,16 +606,12 @@ msgstr "Não"
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -635,12 +644,12 @@ msgid "Inventory"
 msgstr "Inventório"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Usar"
 
@@ -652,7 +661,7 @@ msgstr "Descartar"
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +669,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +722,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr "Lembrar nome de usuário"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "OK"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Registrar"
@@ -735,7 +743,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "MiniMapa"
@@ -757,10 +765,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -962,6 +978,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1146,15 +1190,15 @@ msgstr "Por favor especifique ambos os Endereços e a Porta do servidor"
 msgid "Select Server"
 msgstr "Selecionar Servidor"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
@@ -1475,10 +1519,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "Habilidade Mistério"
@@ -1613,10 +1653,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Propor negócio"
@@ -1664,8 +1700,9 @@ msgstr ""
 "Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
-msgstr ""
+#, fuzzy
+msgid "You don't have enough money."
+msgstr "Você não tem nenhuma nota armazenada"
 
 #: src/gui/updatewindow.cpp:91
 msgid "Updating..."
@@ -1789,10 +1826,6 @@ msgstr "Anúncio geral de %s:"
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1920,8 +1953,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Equipamento"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2050,103 +2084,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "Conectando ao servidor de mapas..."
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "Conectando ao servidor de personagens..."
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "Conectando ao servidor de contas..."
 
@@ -2159,23 +2194,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2199,8 +2234,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Confimar exclusão do personagem"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2236,17 +2272,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2448,57 +2484,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:82
+msgid "New password too short"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: 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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2679,7 +2734,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2762,59 +2817,58 @@ msgstr "Não foi possível roubar nada..."
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2834,8 +2888,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Força de Vontade:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2843,6 +2898,27 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Força de Vontade:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "Falha ao criar Chat!"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2859,10 +2935,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2899,6 +2971,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2919,11 +3013,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "Sem nome"
 
@@ -2931,13 +3025,8 @@ msgstr "Sem nome"
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Selecionar personagem"
 
 #~ msgid "Save player list"
 #~ msgstr "Salvar lista de jogadores"
diff --git a/po/ru.po b/po/ru.po
index 85e99b14..99331d21 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-05-11 20:01+0000\n"
 "Last-Translator: Koptev Oleg <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "Неизвесная команда"
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Помощь --"
@@ -90,7 +94,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "Чтобы получить больше информации, наберите /help <команда>"
 
 #: src/commandhandler.cpp:174
@@ -265,10 +270,6 @@ msgstr "Команда: /who"
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "Неизвесная команда"
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Введите /help для получения списка команд."
@@ -277,26 +278,31 @@ msgstr "Введите /help для получения списка команд
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +311,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Выход"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +406,22 @@ msgstr "Продать"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Отмена"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -416,7 +431,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -464,7 +479,7 @@ msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Ошибка"
@@ -482,78 +497,75 @@ msgstr "Данные персонажа в порядке"
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Подтвердите удаление героя"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Выбор персонажа"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr "ОК"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Следующий"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Новый"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Удалить регистрацию"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Деньги: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +575,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +605,12 @@ msgstr "Нет"
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Снаряжение"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Снять"
 
@@ -635,12 +643,12 @@ msgid "Inventory"
 msgstr "Инвентарь"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Использовать"
 
@@ -652,7 +660,7 @@ msgstr "Сбросить"
 msgid "Split"
 msgstr "Разделить"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +668,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +721,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "ОК"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Зарегистрироваться"
@@ -735,7 +742,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr ""
 
@@ -755,10 +762,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -957,6 +972,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1141,15 +1184,15 @@ msgstr "Следует указать адрес и порт сервера."
 msgid "Select Server"
 msgstr "Выберите сервер"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Применить"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Восстановить расположение окон"
 
@@ -1468,10 +1511,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1606,10 +1645,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Предложить торговлю"
@@ -1656,7 +1691,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1781,10 +1816,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1912,8 +1943,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Снаряжение"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2041,103 +2073,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "Подключение к серверу карт..."
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "Соединение с сервером авторизации..."
 
@@ -2150,23 +2183,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2190,8 +2223,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Подтвердите удаление героя"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2227,17 +2261,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2439,57 +2473,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2670,7 +2723,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2753,59 +2806,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2825,8 +2877,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Сила волиr:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2834,6 +2887,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Сила волиr:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2850,10 +2923,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2890,6 +2959,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2910,11 +3001,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "Мана %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2922,13 +3013,8 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Выбор персонажа"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Радиус прокрутки"
diff --git a/po/sk.po b/po/sk.po
index 99b37726..d0ca7b1a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-04-07 18:10+0000\n"
 "Last-Translator: Dalanos <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "Neznámy príkaz."
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Pomoc --"
@@ -90,7 +94,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "Pre viac informácií, napíšte /help <príkaz>"
 
 #: src/commandhandler.cpp:174
@@ -265,10 +270,6 @@ msgstr "Príkaz: /who"
 msgid "This command displays the number of players currently online."
 msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "Neznámy príkaz."
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Napíš /help pre zoznam príkazov."
@@ -277,26 +278,31 @@ msgstr "Napíš /help pre zoznam príkazov."
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +311,55 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "Nie je možné  vstúpiť do párty!"
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +407,22 @@ msgstr "Predaj"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Zrušiť"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "Zmeniť Emailovú adresu"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "Účet: %s"
@@ -416,7 +432,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
@@ -464,7 +480,7 @@ msgid "Please distribute %d points"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Chyba"
@@ -482,78 +498,75 @@ msgstr ""
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Potvrďte zmazanie postavy"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "Účet a správa postáv"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Vyberte postavu"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "Ano"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr "Potvrdiť"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Predchádzajúci"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Meno: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Nový"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Vymazať"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Zrušiť registráciu"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Peniaze: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "Pracovná úroveň: %d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +576,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
@@ -593,16 +606,12 @@ msgstr "Nie"
 msgid "Connecting..."
 msgstr "Pripájam sa..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Vybavenie"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Odstrojiť"
 
@@ -635,12 +644,12 @@ msgid "Inventory"
 msgstr "Inventár"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Vystrojiť"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Použiť"
 
@@ -652,7 +661,7 @@ msgstr "Zahodiť"
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +669,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ano"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +722,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr "Zapamätať si používateľské meno"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Potvrdiť"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Registrovať"
@@ -735,7 +743,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "MiniMapa"
@@ -757,10 +765,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -962,6 +978,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1146,15 +1190,15 @@ msgstr ""
 msgid "Select Server"
 msgstr "Vyberte Server"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Nastavenie"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Použiť"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr ""
 
@@ -1474,10 +1518,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1612,10 +1652,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr ""
@@ -1662,8 +1698,9 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
-msgstr ""
+#, fuzzy
+msgid "You don't have enough money."
+msgstr "Nemáš žiadne poznámky!"
 
 #: src/gui/updatewindow.cpp:91
 msgid "Updating..."
@@ -1787,10 +1824,6 @@ msgstr "Globálne oznámenie od %s:"
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1918,8 +1951,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Vybavenie"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2047,103 +2081,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2156,23 +2191,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2196,8 +2231,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "Potvrďte zmazanie postavy"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2233,17 +2269,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2445,57 +2481,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:82
+msgid "New password too short"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: 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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2676,7 +2731,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2759,59 +2814,58 @@ msgstr "Nedá sa kradnúť ..."
 msgid "Poison had no effect..."
 msgstr "Jed nemá žiaden účinnok ..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2831,8 +2885,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2840,6 +2895,27 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr ""
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "Vytvorenie postavy sa nepodarilo"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2856,10 +2932,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2896,6 +2968,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2916,11 +3010,11 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
@@ -2928,10 +3022,5 @@ msgstr ""
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Vyberte postavu"
diff --git a/po/sv.po b/po/sv.po
index f9b86bb5..3faf42e0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-04-22 11:32+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "Okänt kommando."
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Hjälp --"
@@ -93,7 +97,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalt meddelande (endast för GM)"
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "För mer information skriv /help <kommando>"
 
 #: src/commandhandler.cpp:174
@@ -278,10 +283,6 @@ msgstr "Kommando: /who"
 msgid "This command displays the number of players currently online."
 msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "Okänt kommando."
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help för en lista med kommandon."
@@ -291,28 +292,33 @@ msgstr "Skriv /help för en lista med kommandon."
 msgid "Cannot send empty whispers!"
 msgstr "Kan inte skicka tomma viskningar!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, fuzzy, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 "Kan inte skapa en ny flik för viskningar till spelaren ”%s”! Antingen finns "
 "den fliken redan eller så angav du dig själv."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr "Retur visar/döljer chattfönstret."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr "Meddelande stänger chattfönstret."
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr "Retur växlar nu chattfönstrets synlighet."
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr "Meddelanden stänger nu chattfönstret."
 
@@ -321,46 +327,56 @@ msgstr "Meddelanden stänger nu chattfönstret."
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Alternativ till /%s är ”yes”, ”no”, ”true”, ”false”, ”1”, ”0”."
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "Kan inte ansluta till gruppen!"
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr "Allmänt"
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr "Skärmbild sparades till ~/"
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 "Förbindelsen till servern förlorades, programmet kommer nu att avslutas."
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr "Nätverksfel"
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr "Är du säker på att du vill avsluta?"
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr "nej"
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerar handelserbjudanden"
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
@@ -408,22 +424,22 @@ msgstr "Sälj"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "Ändra epostadress"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "Konto: %s"
@@ -433,7 +449,7 @@ msgid "Type New Email Address twice:"
 msgstr "Ange den nya epostadressen två gånger:"
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "Ändra lösenord"
 
@@ -481,7 +497,7 @@ msgid "Please distribute %d points"
 msgstr "Var vänlig fördela %d poäng"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "Fel"
@@ -499,78 +515,75 @@ msgstr "Karaktärens värden OK"
 msgid "Please remove %d points"
 msgstr "Var vänlig ta bort %d poäng"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "Bekräfta borttagning av karaktär"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "Hantering av konto och karaktärer"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "Välj karaktär"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
 msgstr "Ok"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "Föregående"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "Nästa"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "Ny"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "Avregistrera"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "Pengar: %d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "Jobbnivå: %d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -580,20 +593,20 @@ msgstr "Pengar: %s"
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr "Närvarande: "
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr "Närvaro loggades till fil."
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -610,16 +623,12 @@ msgstr "Nej"
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr "Kan inte ladda selection.png"
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Utrustning"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "Avrusta"
 
@@ -652,12 +661,12 @@ msgid "Inventory"
 msgstr "Inventarium"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "Utrusta"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Använd"
 
@@ -669,7 +678,7 @@ msgstr "Släpp"
 msgid "Split"
 msgstr "Dela"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr "Utrymme:"
 
@@ -677,6 +686,10 @@ msgstr "Utrymme:"
 msgid "Weight:"
 msgstr "Vikt:"
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "Ok"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "Alla"
@@ -726,11 +739,6 @@ msgstr "Senaste:"
 msgid "Remember Username"
 msgstr "Kom ihåg användarnamnet"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Ok"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "Registrera"
@@ -752,7 +760,7 @@ msgstr "Använd testmagi 2"
 msgid "Cast Test Spell 3"
 msgstr "Använd testmagi 3"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "Max"
@@ -774,10 +782,19 @@ msgstr "NPC"
 msgid "Reset"
 msgstr "Återställ"
 
+#: src/gui/npcpostdialog.cpp:44
+#, fuzzy
+msgid "To:"
+msgstr "Ämne: "
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr "Skicka"
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr "Text"
@@ -984,6 +1001,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr "Grupp"
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, fuzzy, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s har lämnat din grupp."
+
+#: src/gui/partywindow.cpp:185
+#, fuzzy, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s har lämnat din grupp."
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Använd namn i chatt@@"
@@ -1170,15 +1215,15 @@ msgstr "Var vänlig skriv både adressen och porten till en server."
 msgid "Select Server"
 msgstr "Välj server"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "Verkställ"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
@@ -1499,10 +1544,6 @@ msgstr "Inställningar för partikeleffekter ändrade."
 msgid "Changes will take effect on map change."
 msgstr "Förändringar kommer att börja gälla när du byter karta."
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "Mystisk förmåga"
@@ -1637,10 +1678,6 @@ msgstr "Lagra"
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "Föreslå handel"
@@ -1689,7 +1726,8 @@ msgstr ""
 "sak flera gånger."
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+#, fuzzy
+msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar"
 
 #: src/gui/updatewindow.cpp:91
@@ -1817,10 +1855,6 @@ msgstr "Globalt meddelande från %s:"
 msgid "%s whispers: "
 msgstr "%s viskar: "
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr "Kan inte skicka ett tomt chattmeddelande!"
@@ -1949,8 +1983,9 @@ msgid "Inventory Window"
 msgstr "Inventorium"
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Utrustning"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2079,116 +2114,117 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr "tmw"
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 #, fuzzy
 msgid "Options:"
 msgstr "Flaggor: "
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 #, fuzzy
 msgid "  -C --config-file : Configuration file to use"
 msgstr "  -C --configfile : Konfigurationsfil"
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 #, fuzzy
 msgid "  -d --data        : Directory to load game data from"
 msgstr "  -d --data       : Katalog att läsa speldata från"
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 #, fuzzy
 msgid "  -h --help        : Display this help"
 msgstr "  -h --help       : Visa den här hjälpen"
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 #, fuzzy
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr "  -S --homedir    : Hemkatalog"
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 #, fuzzy
 msgid "  -H --update-host : Use this update host"
 msgstr "  -H --updatehost : Uppdateringsvärd"
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 #, fuzzy
 msgid "  -P --password    : Login with this password"
 msgstr "  -P --password   : Lösenord för inloggning"
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 #, fuzzy
 msgid "  -c --character   : Login with this character"
 msgstr "  -c --character  : Karaktär att logga in med"
 
-#: src/main.cpp:577
+#: src/main.cpp:586
 #, fuzzy
-msgid "  -p --port        : Login Server Port"
+msgid "  -p --port        : Login server port"
 msgstr "  -o --port       : Port att logga in på"
 
-#: src/main.cpp:578
+#: src/main.cpp:587
 #, fuzzy
-msgid "  -s --server      : Login Server name or IP"
+msgid "  -s --server      : Login server name or IP"
 msgstr "  -s --server     : Servernamn eller IP-adress att logga in på"
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 #, fuzzy
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr "  -u --skipupdate : Hoppa över att ladda ned uppdateringar"
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 #, fuzzy
 msgid "  -U --username    : Login with this username"
 msgstr "  -U --username   : Användarnamn att logga in med"
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 #, fuzzy
 msgid "  -v --version     : Display the version"
 msgstr "  -v --version    : Visa version"
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, fuzzy, c-format
+msgid "The Mana World %s"
 msgstr "Manavärlden "
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "Ansluter till kartservern..."
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "Ansluter till karaktärsservern..."
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "Ansluter till kontoservern..."
 
@@ -2201,23 +2237,28 @@ msgid "Kick succeeded!"
 msgstr "Klarade av att sparka ut!"
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+#, fuzzy
+msgid "Nothing to sell."
 msgstr "Inget att sälja."
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+#, fuzzy
+msgid "Thanks for buying."
 msgstr "Tack för köpet."
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+#, fuzzy
+msgid "Unable to buy."
 msgstr "Kan inte köpa."
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+#, fuzzy
+msgid "Thanks for selling."
 msgstr "Tack för försäljningen."
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+#, fuzzy
+msgid "Unable to sell."
 msgstr "Kan inte sälja."
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2241,8 +2282,9 @@ msgid "Info"
 msgstr "Information"
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr "Karaktär borttagen."
+#, fuzzy
+msgid "Character deleted."
+msgstr "Bekräfta borttagning av karaktär"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2278,17 +2320,19 @@ msgid "Luck:"
 msgstr "Tur:"
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+#, fuzzy
+msgid "Whisper could not be sent, user is offline."
 msgstr "Kunde inte viska eftersom spelaren inte är inloggad."
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+#, fuzzy
+msgid "Whisper could not be sent, ignored by user."
 msgstr "Kunde inte viska, ignorerad av spelaren."
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr "Chattkanaler stöds inte!"
 
@@ -2490,57 +2534,79 @@ msgstr "Fördelning av erfarenhet inaktiverad."
 msgid "Experience sharing not possible."
 msgstr "Fördelning av erfarenhet ej möjlig."
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+#, fuzzy
+msgid "Unable to pick up item."
+msgstr "Kan inte utrusta."
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, fuzzy, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr "Du plockade upp %s [%s]."
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+#, fuzzy
+msgid "Failed to use item."
+msgstr "Kunde inte byta till "
+
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+#, fuzzy
+msgid "New password too short"
+msgstr "Ange det nya lösenordet två gånger:"
+
+#: 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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr "Kunde inte skapa grupp."
@@ -2727,7 +2793,8 @@ msgid "You picked up "
 msgstr "Du plockade upp "
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+#, fuzzy
+msgid "Equip arrows first."
 msgstr "Utrusta dig med pilar först."
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2810,59 +2877,59 @@ msgstr "Kunde inte stjäla något..."
 msgid "Poison had no effect..."
 msgstr "Giftet tog inte..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#, fuzzy
+msgid "Request for Trade"
 msgstr "Erbjudande till byteshandel"
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, fuzzy, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr " vill handla med dig, är det okej?"
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Byteshandel är inte möjligt. Handelspartnern är för långt borta."
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Byteshandel är inte möjligt. Karaktären existerar inte."
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Byteshandel avbröts av okänd anledning."
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
+#: src/net/ea/tradehandler.cpp:132
+#, fuzzy, c-format
+msgid "Trade: You and %s"
 msgstr "Byteshandel mellan dig och "
 
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
-msgstr "Byteshandla med "
-
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
-msgstr ""
+#: src/net/ea/tradehandler.cpp:139
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "Byteshandel avbruten."
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "Byteshandel avbruten."
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "Byteshandel genomförd."
 
@@ -2882,8 +2949,9 @@ msgstr "Ingen spelserver finns tillgänglig."
 msgid "Willpower:"
 msgstr "Viljestyrka:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, fuzzy, c-format
+msgid "Topic: %s"
 msgstr "Ämne: "
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2891,6 +2959,29 @@ msgstr "Ämne: "
 msgid "Willpower %+d"
 msgstr "Viljestyrka:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "Kan inte skicka chattmeddelande!"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+#, fuzzy
+msgid "Invite sent."
+msgstr "Bjud in spelare"
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+#, fuzzy
+msgid "Failed to promote member."
+msgstr "Misslyckades att börja logga chattmeddelanden."
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2910,10 +3001,6 @@ msgstr "Server"
 msgid "New password incorrect"
 msgstr "Ange det nya lösenordet två gånger:"
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2953,6 +3040,30 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+#, fuzzy
+msgid "Accepting incoming trade requests."
+msgstr "Accepterar handelserbjudanden"
+
+#: src/net/tmwserv/tradehandler.cpp:95
+#, fuzzy
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorerar handelserbjudanden"
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, fuzzy, c-format
+msgid "Trading with %s"
+msgstr "Byteshandla med "
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2973,11 +3084,11 @@ msgstr "Hälsa %+d"
 msgid "MP %+d"
 msgstr "Mana %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "Namnlös"
 
@@ -2985,13 +3096,14 @@ msgstr "Namnlös"
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "Välj karaktär"
 
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Kan inte ladda selection.png"
+
+#~ msgid "Player deleted"
+#~ msgstr "Karaktär borttagen."
 
 #~ msgid "Save player list"
 #~ msgstr "Kom ihåg spelarlista"
diff --git a/po/th.po b/po/th.po
index 40143621..06923d27 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-09 12:37+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,6 +17,10 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -90,7 +94,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -265,10 +269,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -277,26 +277,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -305,45 +310,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "ออก"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,22 +405,22 @@ msgstr ""
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "ยกเลิก"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "เปลี่ยนที่อยู่ Email"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -416,7 +430,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
@@ -464,7 +478,7 @@ msgid "Please distribute %d points"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "ผิดพลาด"
@@ -482,78 +496,75 @@ msgstr ""
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "ยืนยันการลบตัวละคร"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "ตกลง"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "ถัดไป"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "ชื่อ: %s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "สร้างใหม่"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -563,20 +574,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -593,16 +604,12 @@ msgstr "ไม่"
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr ""
 
@@ -635,12 +642,12 @@ msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "ใช้"
 
@@ -652,7 +659,7 @@ msgstr "ทิ้ง"
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -660,6 +667,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "ตกลง"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -709,11 +720,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "สมัครสมาชิก"
@@ -735,7 +741,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr ""
 
@@ -756,10 +762,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -960,6 +974,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1144,15 +1186,15 @@ msgstr ""
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "ตั้งค่า"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr ""
 
@@ -1471,10 +1513,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1609,10 +1647,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr ""
@@ -1659,7 +1693,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1784,10 +1818,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1915,7 +1945,7 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
+msgid "Equipment Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:75
@@ -2044,103 +2074,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2153,23 +2184,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2193,8 +2224,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "ยืนยันการลบตัวละคร"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2230,17 +2262,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2442,57 +2474,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2673,7 +2724,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2756,59 +2807,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2828,8 +2878,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "Willpower:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2837,6 +2888,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "Willpower:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2853,10 +2924,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2893,6 +2960,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2913,22 +3002,14 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
 #: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
-
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
diff --git a/po/tmw.pot b/po/tmw.pot
index 5c57bbca..d407225c 100644
--- a/po/tmw.pot
+++ b/po/tmw.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr ""
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
@@ -89,7 +93,7 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+msgid "For more information, type /help <command>."
 msgstr ""
 
 #: src/commandhandler.cpp:174
@@ -264,10 +268,6 @@ msgstr ""
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
@@ -276,26 +276,31 @@ msgstr ""
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -304,45 +309,54 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+msgid "Could not load map"
+msgstr ""
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -390,22 +404,22 @@ msgstr ""
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -415,7 +429,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -463,7 +477,7 @@ msgid "Please distribute %d points"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr ""
@@ -481,78 +495,75 @@ msgstr ""
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -562,20 +573,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -592,16 +603,12 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr ""
 
@@ -634,12 +641,12 @@ msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr ""
 
@@ -651,7 +658,7 @@ msgstr ""
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -659,6 +666,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr ""
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -708,11 +719,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr ""
@@ -734,7 +740,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr ""
 
@@ -754,10 +760,18 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -956,6 +970,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1140,15 +1182,15 @@ msgstr ""
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr ""
 
@@ -1467,10 +1509,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
@@ -1605,10 +1643,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr ""
@@ -1655,7 +1689,7 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+msgid "You don't have enough money."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:91
@@ -1780,10 +1814,6 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1911,7 +1941,7 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
+msgid "Equipment Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:75
@@ -2040,103 +2070,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -2149,23 +2180,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2189,7 +2220,7 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
+msgid "Character deleted."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:140
@@ -2226,17 +2257,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2438,57 +2469,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
+msgstr ""
+
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82
+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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2669,7 +2719,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2752,59 +2802,58 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2824,8 +2873,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2833,6 +2883,26 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr ""
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2849,10 +2919,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2889,6 +2955,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2909,22 +2997,14 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr ""
 
 #: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
-
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 79608dd8..bcbb67ec 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-13 19:40+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-01-25 23:09+0000\n"
 "Last-Translator: Hong Hao <Unknown>\n"
 "Language-Team: Simplified Chinese <themanaworld-devel@lists.sourceforge."
@@ -21,6 +21,10 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "未知命令"
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- 帮助 --"
@@ -94,7 +98,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "输入/help <指令> 获取更多帮助信息"
 
 #: src/commandhandler.cpp:174
@@ -269,10 +274,6 @@ msgstr "指令： /who"
 msgid "This command displays the number of players currently online."
 msgstr "该条指令可显现当前在线用户总数。"
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "未知命令"
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "输入 /help 获取指令列表。"
@@ -281,26 +282,31 @@ msgstr "输入 /help 获取指令列表。"
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -309,45 +315,55 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "不能加入工会！"
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "退出"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -395,22 +411,22 @@ msgstr "出售"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "取消"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -420,7 +436,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -468,7 +484,7 @@ msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1503
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "错误"
@@ -486,78 +502,75 @@ msgstr "角色状态可以"
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "确认删除角色"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色？"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "选择角色"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "确认"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr "确定"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "上一个"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "下一个"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "姓名：%s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "新建"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "注销"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "金钱：%d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "职业等级：%d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -567,20 +580,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s窃窃私语：%s"
@@ -597,16 +610,12 @@ msgstr "否"
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -639,12 +648,12 @@ msgid "Inventory"
 msgstr "物品栏"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "装备"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "使用"
 
@@ -656,7 +665,7 @@ msgstr "丢弃"
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -664,6 +673,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "确认"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -713,11 +726,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr "保存用户名"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "确定"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "注册"
@@ -739,7 +747,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "小地图"
@@ -761,10 +769,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -966,6 +982,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1151,15 +1195,15 @@ msgstr "请输入服务器的IP地址和端口"
 msgid "Select Server"
 msgstr "选择服务器"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "设置"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "重置窗口"
 
@@ -1480,10 +1524,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "神秘技能"
@@ -1618,10 +1658,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "打算交易"
@@ -1668,8 +1704,9 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
-msgstr ""
+#, fuzzy
+msgid "You don't have enough money."
+msgstr "没有备忘录"
 
 #: src/gui/updatewindow.cpp:91
 msgid "Updating..."
@@ -1793,10 +1830,6 @@ msgstr "%s 全局公告："
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1924,8 +1957,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "装备"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2054,103 +2088,104 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr ""
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1515
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "正在连接 地图 服务器..."
 
-#: src/main.cpp:1523
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "正在连接 角色 服务器..."
 
-#: src/main.cpp:1531
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "正在连接 帐号 服务器..."
 
@@ -2163,23 +2198,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2203,8 +2238,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "确认删除角色"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2240,17 +2276,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2452,57 +2488,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:82
+msgid "New password too short"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: 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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2683,7 +2738,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2766,59 +2821,58 @@ msgstr "无法偷取任何物品..."
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2838,8 +2892,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "意志力:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2847,6 +2902,27 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "意志力:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "聊天创建失败！"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2863,10 +2939,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2903,6 +2975,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2923,11 +3017,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "未知物品"
 
@@ -2935,13 +3029,8 @@ msgstr "未知物品"
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "选择角色"
 
 #~ msgid "Save player list"
 #~ msgstr "保存玩家列表"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 68718879..c9e140c5 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-13 19:40+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-05-05 10:15+0000\n"
 "Last-Translator: lok0919 <lok0919@gmail.com>\n"
 "Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
@@ -22,6 +22,10 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "不明指令"
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- 說明 --"
@@ -96,7 +100,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 公告 (GM only)"
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "輸入/help <指令> 獲取更多幫助訊息"
 
 #: src/commandhandler.cpp:174
@@ -271,10 +276,6 @@ msgstr "指令： /who"
 msgid "This command displays the number of players currently online."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "不明指令"
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "輸入 /help 獲取指令列表。"
@@ -283,26 +284,31 @@ msgstr "輸入 /help 獲取指令列表。"
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:348
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -311,45 +317,55 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "不能加入隊伍！"
+
+#: src/engine.cpp:89
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/game.cpp:237
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "離開"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -397,22 +413,22 @@ msgstr "出售"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "取消"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr ""
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr ""
@@ -422,7 +438,7 @@ msgid "Type New Email Address twice:"
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr ""
 
@@ -470,7 +486,7 @@ msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1503
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "錯誤"
@@ -488,78 +504,75 @@ msgstr "角色狀態確定"
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "選擇角色"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "確認"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr "確定"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "上一個"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "新增"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "註冊"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "金錢：%d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "職業等級：%d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -569,20 +582,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -599,16 +612,12 @@ msgstr "否"
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr ""
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "裝備"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "卸下裝備"
 
@@ -641,12 +650,12 @@ msgid "Inventory"
 msgstr "物品攔"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "裝備"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "使用"
 
@@ -658,7 +667,7 @@ msgstr "丟棄"
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr ""
 
@@ -666,6 +675,10 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "確認"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
@@ -715,11 +728,6 @@ msgstr ""
 msgid "Remember Username"
 msgstr "保存用戶名"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "確定"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "註冊"
@@ -741,7 +749,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 #, fuzzy
 msgid "Map"
 msgstr "小地圖"
@@ -763,10 +771,18 @@ msgstr "NPC"
 msgid "Reset"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:44
+msgid "To:"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -968,6 +984,34 @@ msgstr ""
 msgid "Party (%s)"
 msgstr ""
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:185
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, c-format
+msgid "Rejected invite from %s."
+msgstr ""
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
@@ -1153,15 +1197,15 @@ msgstr "請輸入伺服氣得IP地址和Port"
 msgid "Select Server"
 msgstr "選擇伺服器"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "設定"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "確定"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "重置視窗"
 
@@ -1482,10 +1526,6 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr ""
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "神秘技能"
@@ -1620,10 +1660,6 @@ msgstr ""
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr ""
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "是否交易"
@@ -1670,8 +1706,9 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
-msgstr ""
+#, fuzzy
+msgid "You don't have enough money."
+msgstr "沒有備忘錄"
 
 #: src/gui/updatewindow.cpp:91
 msgid "Updating..."
@@ -1795,10 +1832,6 @@ msgstr "%s 主要公告："
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr ""
@@ -1926,8 +1959,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "裝備"
 
 #: src/keyboardconfig.cpp:75
 msgid "Skill Window"
@@ -2056,104 +2090,105 @@ msgstr ""
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 #, fuzzy
 msgid "  -h --help        : Display this help"
 msgstr "/help > 顯示幫助"
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr ""
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+msgid "  -p --port        : Login server port"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+msgid "  -s --server      : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, c-format
+msgid "The Mana World %s"
 msgstr ""
 
-#: src/main.cpp:1515
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "正在連接到地圖伺服器..."
 
-#: src/main.cpp:1523
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "正在連接角色伺服器..."
 
-#: src/main.cpp:1531
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "正在連接帳號伺服器..."
 
@@ -2166,23 +2201,23 @@ msgid "Kick succeeded!"
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+msgid "Nothing to sell."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+msgid "Thanks for buying."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+msgid "Unable to buy."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+msgid "Thanks for selling."
 msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+msgid "Unable to sell."
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2206,8 +2241,9 @@ msgid "Info"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr ""
+#, fuzzy
+msgid "Character deleted."
+msgstr "確認刪除角色"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2243,17 +2279,17 @@ msgid "Luck:"
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2455,57 +2491,76 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+msgid "You picked up %s [@@%d|%s@@]."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:245
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:76
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/loginhandler.cpp:82
+msgid "New password too short"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:110
+#: 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
+msgid "Unknown error"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:159
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr ""
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr ""
@@ -2686,7 +2741,7 @@ msgid "You picked up "
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+msgid "Equip arrows first."
 msgstr ""
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2769,59 +2824,58 @@ msgstr "無法偷取任何物品..."
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
+#: src/net/ea/tradehandler.cpp:132
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
+#: src/net/ea/tradehandler.cpp:139
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr ""
 
@@ -2841,8 +2895,9 @@ msgstr ""
 msgid "Willpower:"
 msgstr "意志力:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2850,6 +2905,27 @@ msgstr ""
 msgid "Willpower %+d"
 msgstr "意志力:"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "聊天新增失敗！"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+msgid "Failed to promote member."
+msgstr ""
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr ""
@@ -2866,10 +2942,6 @@ msgstr ""
 msgid "New password incorrect"
 msgstr ""
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr ""
@@ -2906,6 +2978,28 @@ msgstr ""
 msgid "Email address already exists"
 msgstr ""
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:95
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2926,11 +3020,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "未知物品"
 
@@ -2938,13 +3032,8 @@ msgstr "未知物品"
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
-
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Select Character"
+#~ msgstr "選擇角色"
 
 #~ msgid "Save player list"
 #~ msgstr "保存玩家列表"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 114b4819..523080b4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-14 01:21+0200\n"
+"POT-Creation-Date: 2009-05-28 22:55+0200\n"
 "PO-Revision-Date: 2009-05-13 02:58+0000\n"
 "Last-Translator: netwareboss <netwareboss@gmail.com>\n"
 "Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
@@ -22,6 +22,10 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "不明指令"
+
 #: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- 說明 --"
@@ -95,7 +99,8 @@ msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 全域廣播 (GM 專用)"
 
 #: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#, fuzzy
+msgid "For more information, type /help <command>."
 msgstr "輸入/help <指令> 獲取更多幫助訊息"
 
 #: src/commandhandler.cpp:174
@@ -272,10 +277,6 @@ msgstr "指令： /who"
 msgid "This command displays the number of players currently online."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "不明指令"
-
 #: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "輸入 /help 獲取指令列表。"
@@ -284,26 +285,31 @@ msgstr "輸入 /help 獲取指令列表。"
 msgid "Cannot send empty whispers!"
 msgstr "傳送密語失敗"
 
-#: src/commandhandler.cpp:347
-#, c-format
+#: src/commandhandler.cpp:348
+#, fuzzy, c-format
 msgid ""
-"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
+msgstr "不能建立 nick 「%s」的悄悄話分頁！它已經存在，或者對象是你自己。"
+
+#: src/commandhandler.cpp:362
+#, c-format
+msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:403
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: src/commandhandler.cpp:407
 msgid "Message now closes chat."
 msgstr ""
 
@@ -312,45 +318,55 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"、\"0\"。"
 
-#: src/game.cpp:236
+#: src/engine.cpp:88
+#, fuzzy
+msgid "Could not load map"
+msgstr "不能加入隊伍！"
+
+#: src/engine.cpp:89
+#, fuzzy, c-format
+msgid "Error while loading %s"
+msgstr "NPC 資料庫：當載入 npcs.xml 時發生錯誤！"
+
+#: src/game.cpp:237
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:400
+#: src/game.cpp:404
 msgid "Screenshot saved to ~/"
 msgstr "抓圖存到 ~/"
 
-#: src/game.cpp:405
+#: src/game.cpp:409
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
-#: src/game.cpp:481
+#: src/game.cpp:485
 msgid "The connection to the server was lost, the program will now quit"
 msgstr "已中斷連線到伺服器,程式將要離開"
 
-#: src/game.cpp:487
+#: src/game.cpp:491
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
 #: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "離開"
 
-#: src/game.cpp:654
+#: src/game.cpp:658
 msgid "Are you sure you want to quit?"
 msgstr "您確定要離開?"
 
-#: src/game.cpp:661
+#: src/game.cpp:665
 msgid "no"
 msgstr "否"
 
-#: src/game.cpp:801
+#: src/game.cpp:805
 msgid "Ignoring incoming trade requests"
 msgstr "忽略收到的交易要求"
 
-#: src/game.cpp:808
+#: src/game.cpp:812
 msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
@@ -398,22 +414,22 @@ msgstr "出售"
 
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
 #: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
 #: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "取消"
 
 #: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:121
+#: src/gui/charselectdialog.cpp:115
 msgid "Change Email Address"
 msgstr "變更郵件地址"
 
 #: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
-#: src/gui/charselectdialog.cpp:123
+#: src/gui/charselectdialog.cpp:107
 #, c-format
 msgid "Account: %s"
 msgstr "帳號: %s"
@@ -423,7 +439,7 @@ msgid "Type New Email Address twice:"
 msgstr "輸入新的電子郵件地址兩次:"
 
 #: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:120
+#: src/gui/charselectdialog.cpp:110
 msgid "Change Password"
 msgstr "變更密碼"
 
@@ -471,7 +487,7 @@ msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
 #: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1501
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1516
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "錯誤"
@@ -489,78 +505,75 @@ msgstr "角色狀態確定"
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
-#: src/gui/charselectdialog.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/charselectdialog.cpp:97
+#: src/gui/charselectdialog.cpp:95
 msgid "Account and Character Management"
 msgstr "帳號與角色管理"
 
-#: src/gui/charselectdialog.cpp:104
-msgid "Select Character"
-msgstr "選擇角色"
-
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103
-msgid "Ok"
-msgstr "確認"
+#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr "確定"
 
-#: src/gui/charselectdialog.cpp:112
+#: src/gui/charselectdialog.cpp:105
 msgid "Previous"
 msgstr "上一個"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
-#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
 #: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
-#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
+#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
 #: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
 msgid "New"
 msgstr "新增"
 
-#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
-#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
+#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
 #: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "取消註冊"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:119
 #, c-format
 msgid "Money: %d"
 msgstr "金錢：%d"
 
-#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
-#: src/gui/charselectdialog.cpp:325
+#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
+#: src/gui/charselectdialog.cpp:320
 #, c-format
 msgid "Job Level: %d"
 msgstr "職業等級：%d"
 
-#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
-#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
+#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
 #: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
@@ -570,20 +583,20 @@ msgstr "金錢: %s"
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chat.cpp:324
+#: src/gui/chat.cpp:326
 #, c-format
 msgid "%d players are present."
 msgstr "%d 位玩家的清單"
 
-#: src/gui/chat.cpp:325
+#: src/gui/chat.cpp:327
 msgid "Present: "
 msgstr "上線: "
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:344
 msgid "Attendance written to record log."
 msgstr "將上線訊息寫入錄製紀錄。"
 
-#: src/gui/chat.cpp:467
+#: src/gui/chat.cpp:471
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -600,16 +613,12 @@ msgstr "否"
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/emotepopup.cpp:64
-msgid "Unable to load selection.png"
-msgstr "無法讀取 selection.png"
-
 #: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "裝備"
 
 #: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
 msgid "Unequip"
 msgstr "卸下裝備"
 
@@ -642,12 +651,12 @@ msgid "Inventory"
 msgstr "物品攔"
 
 #: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:270
+#: src/gui/inventorywindow.cpp:271
 msgid "Equip"
 msgstr "裝備"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "使用"
 
@@ -659,7 +668,7 @@ msgstr "丟棄"
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:92
+#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
 msgid "Slots:"
 msgstr "欄位:"
 
@@ -667,6 +676,10 @@ msgstr "欄位:"
 msgid "Weight:"
 msgstr "重量:"
 
+#: src/gui/itemamount.cpp:95
+msgid "Ok"
+msgstr "確認"
+
 #: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "全部"
@@ -716,11 +729,6 @@ msgstr "最近的:"
 msgid "Remember Username"
 msgstr "保存用戶名"
 
-#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "確定"
-
 #: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "註冊"
@@ -742,7 +750,7 @@ msgstr "施展測試咒文 2"
 msgid "Cast Test Spell 3"
 msgstr "施展測試咒文 3"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
 msgid "Map"
 msgstr "地圖"
 
@@ -762,10 +770,19 @@ msgstr "NPC"
 msgid "Reset"
 msgstr "重設"
 
+#: src/gui/npcpostdialog.cpp:44
+#, fuzzy
+msgid "To:"
+msgstr "主題: "
+
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr "傳送"
 
+#: src/gui/npcpostdialog.cpp:85
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr "文字"
@@ -964,6 +981,34 @@ msgstr "1/4 HP 量"
 msgid "Party (%s)"
 msgstr "隊伍"
 
+#: src/gui/partywindow.cpp:174
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/partywindow.cpp:182
+#, fuzzy, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s 已經離開您的隊伍。"
+
+#: src/gui/partywindow.cpp:185
+#, fuzzy, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s 已經離開您的隊伍。"
+
+#: src/gui/partywindow.cpp:191
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/partywindow.cpp:204
+#, c-format
+msgid "Accepted invite from %s."
+msgstr ""
+
+#: src/gui/partywindow.cpp:211
+#, fuzzy, c-format
+msgid "Rejected invite from %s."
+msgstr "被伺服器拒絕"
+
 #: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|增加聊天名單@@"
@@ -1148,15 +1193,15 @@ msgstr "請輸入伺服氣得IP地址和Port"
 msgid "Select Server"
 msgstr "選擇伺服器"
 
-#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:931
+#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
 msgid "Setup"
 msgstr "設定"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Apply"
 msgstr "確定"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:73
 msgid "Reset Windows"
 msgstr "重置視窗"
 
@@ -1475,10 +1520,6 @@ msgstr "粒子效果設定值已變更。"
 msgid "Changes will take effect on map change."
 msgstr "變更會在地圖改變後生效。"
 
-#: src/gui/skill.cpp:44
-msgid "skills.xml"
-msgstr "skills.xml"
-
 #: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "神秘技能"
@@ -1613,10 +1654,6 @@ msgstr "寄放"
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/storagewindow.cpp:78
-msgid "Slots: "
-msgstr "欄位: "
-
 #: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "是否交易"
@@ -1663,7 +1700,8 @@ msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
 #: src/gui/trade.cpp:311
-msgid "You don't have enough money"
+#, fuzzy
+msgid "You don't have enough money."
 msgstr "您沒有足夠的錢"
 
 #: src/gui/updatewindow.cpp:91
@@ -1788,10 +1826,6 @@ msgstr "%s 主要公告："
 msgid "%s whispers: "
 msgstr "%s 的悄悄話: "
 
-#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
-msgid "Unknown item"
-msgstr "不明的物品"
-
 #: src/gui/widgets/whispertab.cpp:49
 msgid "Cannot send empty chat!"
 msgstr "不能傳送空的聊天訊息！"
@@ -1920,7 +1954,8 @@ msgid "Inventory Window"
 msgstr "物品欄視窗"
 
 #: src/keyboardconfig.cpp:74
-msgid "Equipment WIndow"
+#, fuzzy
+msgid "Equipment Window"
 msgstr "裝備視窗"
 
 #: src/keyboardconfig.cpp:75
@@ -2049,103 +2084,106 @@ msgstr "工藝品"
 msgid "Unknown Skill"
 msgstr "不明的技能"
 
-#: src/main.cpp:255
+#: src/main.cpp:263
 msgid "Invalid update host: "
 msgstr "無效的更新主機: "
 
-#: src/main.cpp:288 src/main.cpp:294
+#: src/main.cpp:296 src/main.cpp:302
 msgid "Error creating updates directory!"
 msgstr "建立更新目錄失敗！"
 
-#: src/main.cpp:327
+#: src/main.cpp:340
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr " 不能建立，但是它也不存在！現在結束。"
 
-#: src/main.cpp:483
+#: src/main.cpp:492
 msgid "Couldn't set "
 msgstr "無法設定 "
 
-#: src/main.cpp:484
+#: src/main.cpp:493
 msgid " video mode: "
 msgstr " 視訊模式: "
 
-#: src/main.cpp:566
+#: src/main.cpp:575
 msgid "tmw"
 msgstr "tmw"
 
-#: src/main.cpp:567
+#: src/main.cpp:576
 msgid "Options:"
 msgstr "選項:"
 
-#: src/main.cpp:568
+#: src/main.cpp:577
 msgid "  -C --config-file : Configuration file to use"
 msgstr "  -C --config-file : 使用此設定檔"
 
-#: src/main.cpp:569
+#: src/main.cpp:578
 msgid "  -d --data        : Directory to load game data from"
 msgstr "  -d -data : 指定遊戲資料所在的目錄"
 
-#: src/main.cpp:570
+#: src/main.cpp:579
 msgid "  -D --default     : Choose default character server and character"
 msgstr "  -D --default : 選擇預設的角色伺服器及角色"
 
-#: src/main.cpp:572
+#: src/main.cpp:581
 msgid "  -h --help        : Display this help"
 msgstr "  -h --help : 顯示求助說明"
 
-#: src/main.cpp:573
+#: src/main.cpp:582
 msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr "  -S --home-dir : 設定此目錄為家目錄"
 
-#: src/main.cpp:574
+#: src/main.cpp:583
 msgid "  -H --update-host : Use this update host"
 msgstr "  -H --update-host : 使用此更新伺服器"
 
-#: src/main.cpp:575
+#: src/main.cpp:584
 msgid "  -P --password    : Login with this password"
 msgstr "  -P --password : 用此密碼登入"
 
-#: src/main.cpp:576
+#: src/main.cpp:585
 msgid "  -c --character   : Login with this character"
 msgstr "  -c --character : 用此帳號登入"
 
-#: src/main.cpp:577
-msgid "  -p --port        : Login Server Port"
+#: src/main.cpp:586
+#, fuzzy
+msgid "  -p --port        : Login server port"
 msgstr "  -p --port : 伺服器端口"
 
-#: src/main.cpp:578
-msgid "  -s --server      : Login Server name or IP"
+#: src/main.cpp:587
+#, fuzzy
+msgid "  -s --server      : Login server name or IP"
 msgstr "  -s --server : 登入伺服器名稱或IP位址"
 
-#: src/main.cpp:579
+#: src/main.cpp:588
 msgid "  -u --skip-update : Skip the update downloads"
 msgstr "  -u --skip-update : 不使用更新"
 
-#: src/main.cpp:580
+#: src/main.cpp:589
 msgid "  -U --username    : Login with this username"
 msgstr "  -U -username : 使用此帳號登入"
 
-#: src/main.cpp:582
+#: src/main.cpp:591
 msgid "  -O --no-opengl   : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : 不使用OpenGL"
 
-#: src/main.cpp:584
+#: src/main.cpp:593
 msgid "  -v --version     : Display the version"
 msgstr "  -v --version : 顯示遊戲版本"
 
-#: src/main.cpp:589
-msgid "The Mana World "
+#: src/main.cpp:598
+#, fuzzy, c-format
+msgid "The Mana World %s"
 msgstr "瑪那世界 "
 
-#: src/main.cpp:1512
+#: src/main.cpp:1527
 msgid "Connecting to map server..."
 msgstr "正在連接到地圖伺服器..."
 
-#: src/main.cpp:1520
+#: src/main.cpp:1535
 msgid "Connecting to character server..."
 msgstr "正在連接角色伺服器..."
 
-#: src/main.cpp:1528
+#: src/main.cpp:1543
 msgid "Connecting to account server..."
 msgstr "正在連接帳號伺服器..."
 
@@ -2158,23 +2196,28 @@ msgid "Kick succeeded!"
 msgstr "踢人成功！"
 
 #: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+#, fuzzy
+msgid "Nothing to sell."
 msgstr "沒有東西可賣"
 
 #: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+#, fuzzy
+msgid "Thanks for buying."
 msgstr "感謝購買"
 
 #: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+#, fuzzy
+msgid "Unable to buy."
 msgstr "無法購買"
 
 #: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+#, fuzzy
+msgid "Thanks for selling."
 msgstr "感謝賣出"
 
 #: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+#, fuzzy
+msgid "Unable to sell."
 msgstr "無法販賣"
 
 #: src/net/ea/charserverhandler.cpp:95
@@ -2198,8 +2241,9 @@ msgid "Info"
 msgstr "資訊"
 
 #: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
-msgstr "玩家已刪除"
+#, fuzzy
+msgid "Character deleted."
+msgstr "確認刪除角色"
 
 #: src/net/ea/charserverhandler.cpp:140
 msgid "Failed to delete character."
@@ -2235,17 +2279,19 @@ msgid "Luck:"
 msgstr "幸運:"
 
 #: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline"
+#, fuzzy
+msgid "Whisper could not be sent, user is offline."
 msgstr "無法傳送悄悄話，使用者已離線"
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/chathandler.cpp:82
+#, fuzzy
+msgid "Whisper could not be sent, ignored by user."
 msgstr "無法傳送悄悄話，被使用者忽略"
 
-#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
-#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
-#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
-#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
+#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
+#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
+#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
+#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
 msgid "Channels are not supported!"
 msgstr "頻道不支援！"
 
@@ -2451,59 +2497,82 @@ msgstr "經驗值分享已停用。"
 msgid "Experience sharing not possible."
 msgstr "經驗值分享不可能。"
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/inventoryhandler.cpp:185
+#, fuzzy
+msgid "Unable to pick up item."
 msgstr "無法撿拾物品"
 
-#: src/net/ea/inventoryhandler.cpp:194
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]"
+#. TRANSLATORS: Used as in "You picked up a ...", when
+#. picking up only one item.
+#: src/net/ea/inventoryhandler.cpp:195
+msgid "a"
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:199
+#, fuzzy, c-format
+msgid "You picked up %s [@@%d|%s@@]."
 msgstr "你撿起了 %s [@@%d|%s@@]"
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:245
+#, fuzzy
+msgid "Failed to use item."
 msgstr "使用物品失敗"
 
-#: src/net/ea/loginhandler.cpp:110
+#: src/net/ea/loginhandler.cpp:76
+#, fuzzy
+msgid "Account was not found. Please re-login."
+msgstr "帳號還沒連線,請先登入"
+
+#: src/net/ea/loginhandler.cpp:79 src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr "舊密碼輸入錯誤"
+
+#: src/net/ea/loginhandler.cpp:82
+#, fuzzy
+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
+msgid "Unknown error"
+msgstr "不明的錯誤"
+
+#: src/net/ea/loginhandler.cpp:142
 msgid "Unregistered ID"
 msgstr "未註冊的 ID"
 
-#: src/net/ea/loginhandler.cpp:113
+#: src/net/ea/loginhandler.cpp:145
 msgid "Wrong password"
 msgstr "錯誤的密碼"
 
-#: src/net/ea/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:148
 msgid "Account expired"
 msgstr "帳號已過期"
 
-#: src/net/ea/loginhandler.cpp:119
+#: src/net/ea/loginhandler.cpp:151
 msgid "Rejected from server"
 msgstr "被伺服器拒絕"
 
-#: src/net/ea/loginhandler.cpp:123
+#: src/net/ea/loginhandler.cpp:155
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr "您已經被這個遊戲永遠列入黑名單。請連絡 GM 團隊。"
 
-#: src/net/ea/loginhandler.cpp:127
-#, c-format
+#: src/net/ea/loginhandler.cpp:159
+#, fuzzy, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 "您暫時被此遊戲列入黑名單，直到 %s。\n"
 " 請透過討論區連絡 GM 團隊。"
 
-#: src/net/ea/loginhandler.cpp:134
+#: src/net/ea/loginhandler.cpp:166
 msgid "This user name is already taken"
 msgstr "這個使用者名稱已經被使用了"
 
-#: src/net/ea/loginhandler.cpp:137 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
-msgid "Unknown error"
-msgstr "不明的錯誤"
-
 #: src/net/ea/partyhandler.cpp:77
 msgid "Could not create party."
 msgstr "無法建立隊伍。"
@@ -2684,7 +2753,8 @@ msgid "You picked up "
 msgstr "您已經撿起 "
 
 #: src/net/ea/playerhandler.cpp:413
-msgid "Equip arrows first"
+#, fuzzy
+msgid "Equip arrows first."
 msgstr "請先裝備弓箭"
 
 #: src/net/ea/skillhandler.cpp:139
@@ -2767,59 +2837,60 @@ msgstr "無法偷取任何物品..."
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/ea/tradehandler.cpp:101
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:103 src/net/tmwserv/tradehandler.cpp:114
+#, fuzzy
+msgid "Request for Trade"
 msgstr "交易的要求"
 
-#: src/net/ea/tradehandler.cpp:103
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:104 src/net/tmwserv/tradehandler.cpp:115
+#, fuzzy, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr " 想要跟您交易，您接受嗎？"
 
-#: src/net/ea/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:119
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "交易無法進行。交易對象太遠了。"
 
-#: src/net/ea/tradehandler.cpp:121
+#: src/net/ea/tradehandler.cpp:123
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "無法進行交易。該角色不存在。"
 
-#: src/net/ea/tradehandler.cpp:125
+#: src/net/ea/tradehandler.cpp:127
 msgid "Trade cancelled due to an unknown reason."
 msgstr "由於不明的原因已取消交易。"
 
-#: src/net/ea/tradehandler.cpp:131
-msgid "Trade: You and "
+#: src/net/ea/tradehandler.cpp:132
+#, fuzzy, c-format
+msgid "Trade: You and %s"
 msgstr "交易：您和 "
 
-#: src/net/ea/tradehandler.cpp:137
-msgid "Trade with "
-msgstr "交易對象: "
-
-#: src/net/ea/tradehandler.cpp:138
-msgid " cancelled"
-msgstr " 已取消"
+#: src/net/ea/tradehandler.cpp:139
+#, fuzzy, c-format
+msgid "Trade with %s cancelled."
+msgstr "交易已取消。"
 
-#: src/net/ea/tradehandler.cpp:145
-msgid "Unhandled trade cancel packet"
+#: src/net/ea/tradehandler.cpp:148
+#, fuzzy
+msgid "Unhandled trade cancel packet."
 msgstr "未處理的交易取消封包"
 
-#: src/net/ea/tradehandler.cpp:195
+#: src/net/ea/tradehandler.cpp:198
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "加入物品失敗。交易的伙伴已經超重。"
 
-#: src/net/ea/tradehandler.cpp:200
+#: src/net/ea/tradehandler.cpp:203
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "加入物品失敗。交易對象沒有空的欄位。"
 
-#: src/net/ea/tradehandler.cpp:204
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item for unknown reason."
 msgstr "由於不明的原因加入物品失敗。"
 
-#: src/net/ea/tradehandler.cpp:217
+#: src/net/ea/tradehandler.cpp:220 src/net/tmwserv/tradehandler.cpp:147
 msgid "Trade canceled."
 msgstr "交易已取消。"
 
-#: src/net/ea/tradehandler.cpp:224
+#: src/net/ea/tradehandler.cpp:227 src/net/tmwserv/tradehandler.cpp:154
 msgid "Trade completed."
 msgstr "交易已完成。"
 
@@ -2839,8 +2910,9 @@ msgstr "沒有可用的遊戲伺服器。"
 msgid "Willpower:"
 msgstr "意志力:"
 
-#: src/net/tmwserv/chathandler.cpp:157
-msgid "Topic: "
+#: src/net/tmwserv/chathandler.cpp:158 src/net/tmwserv/guildhandler.cpp:250
+#, fuzzy, c-format
+msgid "Topic: %s"
 msgstr "主題: "
 
 #: src/net/tmwserv/generalhandler.cpp:87
@@ -2848,6 +2920,29 @@ msgstr "主題: "
 msgid "Willpower %+d"
 msgstr "意志力 %+d"
 
+#: src/net/tmwserv/guildhandler.cpp:74
+msgid "Guild created."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:79
+#, fuzzy
+msgid "Error creating guild."
+msgstr "建立更新目錄失敗！"
+
+#: src/net/tmwserv/guildhandler.cpp:89
+#, fuzzy
+msgid "Invite sent."
+msgstr "邀請使用者"
+
+#: src/net/tmwserv/guildhandler.cpp:194
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/tmwserv/guildhandler.cpp:199
+#, fuzzy
+msgid "Failed to promote member."
+msgstr "使用物品失敗"
+
 #: src/net/tmwserv/loginhandler.cpp:80
 msgid "Wrong magic_token"
 msgstr "錯誤的魔法代號"
@@ -2864,10 +2959,6 @@ msgstr "伺服器人數已滿"
 msgid "New password incorrect"
 msgstr "新密碼不正確"
 
-#: src/net/tmwserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr "舊密碼輸入錯誤"
-
 #: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
 msgid "Account not connected. Please login first."
 msgstr "帳號還沒連線,請先登入"
@@ -2904,6 +2995,30 @@ msgstr "名字已經有人使用"
 msgid "Email address already exists"
 msgstr "E-mail已經存在"
 
+#: src/net/tmwserv/partyhandler.cpp:86
+msgid "Joined party."
+msgstr ""
+
+#: src/net/tmwserv/partyhandler.cpp:103
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/tmwserv/tradehandler.cpp:93
+#, fuzzy
+msgid "Accepting incoming trade requests."
+msgstr "接受收到的交易要求"
+
+#: src/net/tmwserv/tradehandler.cpp:95
+#, fuzzy
+msgid "Ignoring incoming trade requests."
+msgstr "忽略收到的交易要求"
+
+#: src/net/tmwserv/tradehandler.cpp:133
+#, fuzzy, c-format
+msgid "Trading with %s"
+msgstr "交易對象: "
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2924,11 +3039,11 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:112
-msgid "items.xml"
-msgstr "items.xml"
+#: src/resources/itemdb.cpp:113
+msgid "Unknown item"
+msgstr "不明的物品"
 
-#: src/resources/itemdb.cpp:150
+#: src/resources/itemdb.cpp:156
 msgid "Unnamed"
 msgstr "未知物品"
 
@@ -2936,13 +3051,29 @@ msgstr "未知物品"
 msgid "unnamed"
 msgstr "未知物品"
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr "monsters.xml"
+#~ msgid "Select Character"
+#~ msgstr "選擇角色"
 
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr "NPC 資料庫：當載入 npcs.xml 時發生錯誤！"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "無法讀取 selection.png"
+
+#~ msgid "skills.xml"
+#~ msgstr "skills.xml"
+
+#~ msgid "Slots: "
+#~ msgstr "欄位: "
+
+#~ msgid "Player deleted"
+#~ msgstr "玩家已刪除"
+
+#~ msgid " cancelled"
+#~ msgstr " 已取消"
+
+#~ msgid "items.xml"
+#~ msgstr "items.xml"
+
+#~ msgid "monsters.xml"
+#~ msgstr "monsters.xml"
 
 #~ msgid "MiniMap"
 #~ msgstr "小地圖"
@@ -3002,11 +3133,6 @@ msgstr "NPC 資料庫：當載入 npcs.xml 時發生錯誤！"
 #~ msgstr "不能送出空的悄悄話！"
 
 #~ msgid ""
-#~ "Cannont create a whisper tab for nick '%s'!It either already exists, or "
-#~ "is you."
-#~ msgstr "不能建立 nick 「%s」的悄悄話分頁！它已經存在，或者對象是你自己。"
-
-#~ msgid ""
 #~ "\n"
 #~ "> Cancel\n"
 #~ msgstr ""