Updated translations

25 files changed, 11914 insertions, 1796 deletions

diff --git a/po/aethyra.pot b/po/aethyra.pot
index ae49bb32..9e8e8579 100644
--- a/po/aethyra.pot
+++ b/po/aethyra.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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\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,122 +16,130 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr ""
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr ""
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr ""
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr ""
 
@@ -144,6 +152,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr ""
@@ -152,7 +379,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr ""
 
@@ -160,11 +387,20 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
@@ -190,31 +426,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
@@ -222,7 +454,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -230,7 +462,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr ""
 
@@ -322,14 +554,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr ""
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -390,6 +618,62 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+msgid "Name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -464,6 +748,100 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, c-format
+msgid "Money: %d GP"
+msgstr ""
+
+#: src/gui/status.cpp:127
+msgid "Stats"
+msgstr ""
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+msgid "Strength"
+msgstr ""
+
+#: src/gui/status.cpp:283
+msgid "Agility"
+msgstr ""
+
+#: src/gui/status.cpp:284
+msgid "Vitality"
+msgstr ""
+
+#: src/gui/status.cpp:285
+msgid "Intelligence"
+msgstr ""
+
+#: src/gui/status.cpp:286
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -481,6 +859,38 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
+
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+msgid "Connecting to map server..."
+msgstr ""
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
diff --git a/po/ar.po b/po/ar.po
index f8cead32..0a19529e 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "السعر: %d GP / الإجمالي: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "الوصف: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "التأثير: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "إيقاف"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "بيع"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "إلغاء"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "إنتقاء الشخصيّة"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "موافق"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "إلغاء"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "جديد"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "حذف"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "السّابق"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "التّالي"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "الاسم: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "النقود: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "الاسم:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "لون الشعر:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "قصّة الشعر:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "إنشاء"
 
@@ -146,6 +155,225 @@ msgstr "إنتقاء الشخصيّة"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "الخادوم:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "نعم"
@@ -154,7 +382,7 @@ msgstr "نعم"
 msgid "No"
 msgstr "لا"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
@@ -162,11 +390,20 @@ msgstr "جارِ الاتّصال..."
 msgid "Equipment"
 msgstr "العتاد"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "الجردة"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "استخدام"
 
@@ -192,31 +429,27 @@ msgstr "تجريد من العتاد"
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "ولوج"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "الخادوم:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "تسجيل"
 
@@ -224,7 +457,7 @@ msgstr "تسجيل"
 msgid "Status"
 msgstr "الحالة"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "مهارات"
 
@@ -232,7 +465,7 @@ msgstr "مهارات"
 msgid "Shortcut"
 msgstr "اختصار"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "تثبيت"
 
@@ -325,14 +558,10 @@ msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محار�
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "خطأ"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "بيع"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "صوت"
@@ -393,6 +622,64 @@ msgstr "إيقاف"
 msgid "Rotate the stick"
 msgstr "تدوير العصا"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "حذف"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "الاسم:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "ملء الشاشة"
@@ -467,6 +754,110 @@ msgstr "تغيير OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "المستوى: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "النقود: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "الحالة"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "مهاجمة %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "دفاع %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "مهاجمة %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "دفاع %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "القوّة:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "خفّة الحركة:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "نشاط:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "ذكاء:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "المهارة:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "إضافة"
@@ -484,27 +875,45 @@ msgstr "أنت تحصل على %d GP."
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "إلغاء التسجيل"
-
-#~ msgid "Strength:"
-#~ msgstr "القوّة:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "خفّة الحركة:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "جارِ الاتّصال..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "المهارة:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "نشاط:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "ذكاء:"
+#~ msgid "Unregister"
+#~ msgstr "إلغاء التسجيل"
 
 #~ msgid "Willpower:"
 #~ msgstr "قوّة الذات:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "تغيير"
 
-#~ msgid "Attack %+d"
-#~ msgstr "مهاجمة %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "دفاع %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/ca.po b/po/ca.po
index 97527d96..7325a252 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-07-03 17:21+0000\n"
 "Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -17,122 +17,130 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "preu %d GP / total %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "sortir"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr ""
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "nom"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr ""
 
@@ -145,6 +153,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "si"
@@ -153,7 +380,7 @@ msgstr "si"
 msgid "No"
 msgstr "no"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr ""
 
@@ -161,11 +388,20 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
@@ -191,31 +427,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
@@ -223,7 +455,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -231,7 +463,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr ""
 
@@ -323,14 +555,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr ""
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -391,6 +619,63 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "nom"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -465,6 +750,100 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, c-format
+msgid "Money: %d GP"
+msgstr ""
+
+#: src/gui/status.cpp:127
+msgid "Stats"
+msgstr ""
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+msgid "Strength"
+msgstr ""
+
+#: src/gui/status.cpp:283
+msgid "Agility"
+msgstr ""
+
+#: src/gui/status.cpp:284
+msgid "Vitality"
+msgstr ""
+
+#: src/gui/status.cpp:285
+msgid "Intelligence"
+msgstr ""
+
+#: src/gui/status.cpp:286
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -482,9 +861,41 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+msgid "Connecting to map server..."
+msgstr ""
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Change"
 #~ msgstr "canvi"
diff --git a/po/cs.po b/po/cs.po
index 67a31efc..efb03f63 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-17 16:31+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,123 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Prodej"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Potvrďte vymazání postavy"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nová"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Předchozí"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Další"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Peníze: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Barva vlasů:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Styl vlasů:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -147,6 +155,225 @@ msgstr "Server:"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ano"
@@ -155,7 +382,7 @@ msgstr "Ano"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
@@ -163,11 +390,20 @@ msgstr "Připojuji se..."
 msgid "Equipment"
 msgstr "Vybavení"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventář"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
@@ -193,31 +429,27 @@ msgstr ""
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství zboží, se kterým budete obchodovat."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství zboží, které chcete upustit."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Zapamatovat uživatelské jméno"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrace"
 
@@ -225,7 +457,7 @@ msgstr "Registrace"
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -233,7 +465,7 @@ msgstr "Dovednosti"
 msgid "Shortcut"
 msgstr "Zkratka"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Nastavení"
 
@@ -325,14 +557,10 @@ msgstr "Heslo musí být kratší než %d znaků."
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Prodej"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Zvuk"
@@ -393,6 +621,64 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Odstranit"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Jméno:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -467,6 +753,109 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Úroveň: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Peníze: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Stav"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Útok %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Obrana %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Útok %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Obrana %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Síla:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Vitalita:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalita:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligence:"
+
+#: src/gui/status.cpp:286
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -484,10 +873,43 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Připojuji se..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Správa účtu a postavy"
 
@@ -503,15 +925,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Účet: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Síla:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalita:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligence:"
-
 #~ msgid "Please distribute %d points"
 #~ msgstr "Rozdělte prosím %d bodů"
 
@@ -541,9 +954,3 @@ msgstr ""
 
 #~ msgid "Change"
 #~ msgstr "Změnit"
-
-#~ msgid "Attack %+d"
-#~ msgstr "Útok %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Obrana %+d"
diff --git a/po/da.po b/po/da.po
index ff2506c1..dae66aca 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Køb"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stop"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Sælg"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Fortryd"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Er du sikker på at du vil slette denne figur?"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne figur?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Vælg Bruger"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "O.k."
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Fortryd"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Opret"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Slet"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Forrige"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Næste"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Navn; %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Penge: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Lav figur."
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Hårfarve:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Frisure:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Opret"
 
@@ -146,6 +155,225 @@ msgstr "Vælg Bruger"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ja"
@@ -154,7 +382,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
@@ -162,11 +390,20 @@ msgstr "Opretter forbindelse..."
 msgid "Equipment"
 msgstr "Udstyr"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventarliste"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Brug"
 
@@ -192,31 +429,27 @@ msgstr "Tag af"
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Vælge hvor mange du vil bytte."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange du vil smide,"
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Log Ind"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Husk dette brugernavn."
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrer"
 
@@ -224,7 +457,7 @@ msgstr "Registrer"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Færdigheder"
 
@@ -232,7 +465,7 @@ msgstr "Færdigheder"
 msgid "Shortcut"
 msgstr "Genvej"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Opsætning"
 
@@ -325,14 +558,10 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 msgid "Passwords do not match."
 msgstr "Adgangskoder stemmer ikke overens."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Fejl"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Sælg"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Lyd"
@@ -393,6 +622,64 @@ msgstr "Stop"
 msgid "Rotate the stick"
 msgstr "Roter joystick"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Slet"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Navn:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Fuld Skærm"
@@ -467,6 +754,110 @@ msgstr "Skrifter til OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Niveau: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Penge: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Angrib %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Forsvar %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Angrib %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Forsvar %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Styrke"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Adræthed"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Helbred:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligens:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Behændighed:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Tilføj"
@@ -484,10 +875,43 @@ msgstr "Du får %d GP."
 msgid "You give:"
 msgstr "Du giver:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Opretter forbindelse..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Ret konto og figurer"
 
@@ -503,21 +927,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Bruger: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Styrke"
-
-#~ msgid "Agility:"
-#~ msgstr "Adræthed"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Behændighed:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Helbred:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligens:"
-
 #~ msgid "Willpower:"
 #~ msgstr "Viljestyrke:"
 
@@ -581,12 +990,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Ændre"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Angrib %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Forsvar %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/de.po b/po/de.po
index 578ae8b8..6e71b451 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-10-13 00:25+0000\n"
 "Last-Translator: Aeneas Jaißle <Unknown>\n"
 "Language-Team: German\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Kaufen"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preis: %d GP / Summe: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stopp"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Verkaufen"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Bestätige Charakter-Löschung"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Spielfigur auswählen"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Neu"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Zurück"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Weiter"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Name :"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Haarfarbe"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Frisur"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Erstellen"
 
@@ -146,6 +155,225 @@ msgstr "Spielfigur auswählen"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ja"
@@ -154,7 +382,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Verbinde..."
 
@@ -162,11 +390,20 @@ msgstr "Verbinde..."
 msgid "Equipment"
 msgstr "Ausrüstung"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventar"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Benutzen"
 
@@ -192,31 +429,27 @@ msgstr "Ablegen"
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wieviele Gegenstände Du tauschen möchtest."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Benutzernamen merken"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrieren"
 
@@ -224,7 +457,7 @@ msgstr "Registrieren"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Fertigkeiten"
 
@@ -232,7 +465,7 @@ msgstr "Fertigkeiten"
 msgid "Shortcut"
 msgstr "Tastenkürzel"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -325,14 +558,10 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Fehler"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Verkaufen"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Ton"
@@ -393,6 +622,64 @@ msgstr "Stopp"
 msgid "Rotate the stick"
 msgstr "Kreise den Steuerknüppel"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Löschen"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Name :"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Vollbild"
@@ -469,6 +756,110 @@ msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Stufe: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Geld: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Angriff %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Verteidigung %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Angriff %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Verteidigung %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Stärke:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilität:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalität:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligenz:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Geschicklichkeit:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Hinzufügen"
@@ -486,10 +877,43 @@ msgstr "Du erhälst %d GP."
 msgid "You give:"
 msgstr "Du gibst:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Verbinde..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Account- und Charakterverwaltung"
 
@@ -505,21 +929,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Account: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Stärke:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilität:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Geschicklichkeit:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalität:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligenz:"
-
 #~ msgid "Willpower:"
 #~ msgstr "Willenskraft:"
 
@@ -583,12 +992,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Ändern"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Angriff %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Verteidigung %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index c17c3ad7..80a6ef41 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-05-10 16:51+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Price: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stop"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Sell"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Cancel"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Select Character"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Cancel"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "New"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Previous"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Next"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Money: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Create Character"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Name:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Hair Colour:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Hair Style:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Create"
 
@@ -146,6 +155,225 @@ msgstr "Select Character"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Yes"
@@ -154,7 +382,7 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Connecting..."
 
@@ -162,11 +390,20 @@ msgstr "Connecting..."
 msgid "Equipment"
 msgstr "Equipment"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventory"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Use"
 
@@ -192,31 +429,27 @@ msgstr "Unequip"
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Register"
 
@@ -224,7 +457,7 @@ msgstr "Register"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Skills"
 
@@ -232,7 +465,7 @@ msgstr "Skills"
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Setup"
 
@@ -325,14 +558,10 @@ msgstr "The password needs to be less than %d characters long."
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Sell"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Sound"
@@ -393,6 +622,64 @@ msgstr "Stop"
 msgid "Rotate the stick"
 msgstr "Rotate the stick"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Delete"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Name:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Full screen"
@@ -467,6 +754,110 @@ msgstr "Changing OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Level: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Money: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Attack %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Defense %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Attack %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Defense %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Strength:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agility:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitality:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligence:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Dexterity:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Add"
@@ -484,27 +875,45 @@ msgstr "You get %d GP."
 msgid "You give:"
 msgstr "You give:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Unregister"
-
-#~ msgid "Strength:"
-#~ msgstr "Strength:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Agility:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Connecting..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Dexterity:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitality:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligence:"
+#~ msgid "Unregister"
+#~ msgstr "Unregister"
 
 #~ msgid "Willpower:"
 #~ msgstr "Willpower:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Change"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Attack %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Defense %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/eo.po b/po/eo.po
index ad4bcdca..928b0fbf 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-11-10 22:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -17,122 +17,130 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr ""
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr ""
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr ""
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr ""
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr ""
 
@@ -145,6 +153,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr ""
@@ -153,7 +380,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr ""
 
@@ -161,11 +388,20 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
@@ -191,31 +427,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
@@ -223,7 +455,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -231,7 +463,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr ""
 
@@ -323,14 +555,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr ""
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -391,6 +619,62 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+msgid "Name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -465,6 +749,100 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, c-format
+msgid "Money: %d GP"
+msgstr ""
+
+#: src/gui/status.cpp:127
+msgid "Stats"
+msgstr ""
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+msgid "Strength"
+msgstr ""
+
+#: src/gui/status.cpp:283
+msgid "Agility"
+msgstr ""
+
+#: src/gui/status.cpp:284
+msgid "Vitality"
+msgstr ""
+
+#: src/gui/status.cpp:285
+msgid "Intelligence"
+msgstr ""
+
+#: src/gui/status.cpp:286
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -482,6 +860,38 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
+
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+msgid "Connecting to map server..."
+msgstr ""
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
diff --git a/po/es.po b/po/es.po
index e544ff86..f4f67a3f 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Precio: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efecto: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Detener"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Vender"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Seleccionar personaje"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Aceptar"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nuevo"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Dinero: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Color de pelo:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "corte de pelo"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Crear"
 
@@ -146,6 +155,225 @@ msgstr "Seleccionar personaje"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Sí"
@@ -154,7 +382,7 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Conectando…"
 
@@ -162,11 +390,20 @@ msgstr "Conectando…"
 msgid "Equipment"
 msgstr "Equipo"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventario"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Usar"
 
@@ -192,31 +429,27 @@ msgstr "quitarselo"
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Seleccione objetos para comerciar."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Seleccione objetos para soltar."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "conectarse"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Servidor:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrar"
 
@@ -224,7 +457,7 @@ msgstr "Registrar"
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -232,7 +465,7 @@ msgstr "Habilidades"
 msgid "Shortcut"
 msgstr "Atajos"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Configuración"
 
@@ -325,14 +558,10 @@ msgstr "La contraseña puede tener como máximo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Vender"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Sonido"
@@ -393,6 +622,64 @@ msgstr "Detener"
 msgid "Rotate the stick"
 msgstr "Gire el stick"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Eliminar"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nombre:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Pantalla completa"
@@ -467,6 +754,110 @@ msgstr "Cambiar a OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Nivel: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Dinero: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Estado"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Ataque %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Defensa %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Ataque %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Defensa %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Fuerza:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilidad:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalidad:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligencia:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Destreza:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Añadir"
@@ -484,27 +875,45 @@ msgstr "Tu consigues %d GP."
 msgid "You give:"
 msgstr "Tu das:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Cancelar Cuenta"
-
-#~ msgid "Strength:"
-#~ msgstr "Fuerza:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Agilidad:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Conectando…"
 
-#~ msgid "Dexterity:"
-#~ msgstr "Destreza:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitalidad:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencia:"
+#~ msgid "Unregister"
+#~ msgstr "Cancelar Cuenta"
 
 #~ msgid "Willpower:"
 #~ msgstr "Fuerza de voluntad:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Modificar"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Ataque %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Defensa %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/fi.po b/po/fi.po
index e4b01584..80b21093 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-30 10:23+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -17,123 +17,132 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Kappalehinta: %d GP / Yhteensä: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Kuvaus: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Vaikutus: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Lopeta"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Myy"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Peru"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Vahvista hahmon poistopyyntö"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Luo hahmo"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Peru"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Uusi"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Edellinen"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Rahatilanne: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Hiusten väri:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Hiustyyli:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Luo"
 
@@ -147,6 +156,225 @@ msgstr "Vaihda palvelinta"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Palvelin:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Kyllä"
@@ -155,7 +383,7 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
@@ -163,11 +391,20 @@ msgstr "Yhdistetään..."
 msgid "Equipment"
 msgstr "Varusteet"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Tavaraluettelo"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Käytä"
 
@@ -193,31 +430,27 @@ msgstr "Poista varuste käytöstä"
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Anna vaihdettavien tavaroiden määrä."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Palvelin:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Muista käyttäjätunnus"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Rekisteröidy"
 
@@ -225,7 +458,7 @@ msgstr "Rekisteröidy"
 msgid "Status"
 msgstr "Hahmon tiedot"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Taidot"
 
@@ -233,7 +466,7 @@ msgstr "Taidot"
 msgid "Shortcut"
 msgstr "Pikavalinnat"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -326,14 +559,10 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Virhe"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Myy"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Ääni"
@@ -394,6 +623,64 @@ msgstr "Lopeta"
 msgid "Rotate the stick"
 msgstr "Käytä ohjain ääriasennoissaan pyörittämällä"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Poista"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nimi:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Kokoruututila"
@@ -468,6 +755,110 @@ msgstr "Vaihdetaan OpenGL -toimintatilaan"
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Taso: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Rahatilanne: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Hahmon tiedot"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Hyökkäys %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Puolustus %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Hyökkäys %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Puolustus %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Voima:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Ketteryys:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Elinvoima:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Älykkyys:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Näppäryys:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lisää"
@@ -485,10 +876,43 @@ msgstr "Sait %d GP"
 msgid "You give:"
 msgstr "Annat:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Yhdistetään..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Tilin ja hahmojen hallinta"
 
@@ -504,21 +928,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Tili: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Voima:"
-
-#~ msgid "Agility:"
-#~ msgstr "Ketteryys:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Näppäryys:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Elinvoima:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Älykkyys:"
-
 #~ msgid "Willpower:"
 #~ msgstr "Tahdonvoima:"
 
@@ -579,12 +988,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Muuta"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Hyökkäys %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Puolustus %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "Iskupisteet %+d"
 
diff --git a/po/fr.po b/po/fr.po
index ed1340d3..3d8a121c 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -18,122 +18,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Acheter"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prix : %d PO / Total : %d PO"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effet : %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stop"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Vendre"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Confirmer la suppression du personnage"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Choix du personnage"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nouveau"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Précédent"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Suivant"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Argent : %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Création du personnage"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Couleur des cheveux"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Coiffure :"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Créer"
 
@@ -147,6 +156,225 @@ msgstr "Choix du personnage"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Serveur :"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Oui"
@@ -155,7 +383,7 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Connexion..."
 
@@ -163,11 +391,20 @@ msgstr "Connexion..."
 msgid "Equipment"
 msgstr "Équipement"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventaire"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Utiliser"
 
@@ -193,31 +430,27 @@ msgstr "Retirer"
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Choisissez le nombre d'objets à troquer."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Choisissez le nombre d'objets à lâcher."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Connexion"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Serveur :"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Se souvenir du nom d'utilisateur"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "S'inscrire"
 
@@ -225,7 +458,7 @@ msgstr "S'inscrire"
 msgid "Status"
 msgstr "Statut"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Compétences"
 
@@ -233,7 +466,7 @@ msgstr "Compétences"
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Configuration"
 
@@ -326,14 +559,10 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Vendre"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Son"
@@ -394,6 +623,64 @@ msgstr "Stop"
 msgid "Rotate the stick"
 msgstr "Tourner le joystick"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Supprimer"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nom :"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Plein écran"
@@ -470,6 +757,110 @@ msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Niveau : %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Argent : %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Statut"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Attaque %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Défense %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Attaque %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Défense %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Force :"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilité :"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalité :"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligence :"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Dextérité :"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Ajouter"
@@ -487,10 +878,43 @@ msgstr "Vous obtenez %d PO."
 msgid "You give:"
 msgstr "Vous donnez :"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Connexion..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Gestion du compte et du personnage"
 
@@ -506,21 +930,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Compte: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Force :"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilité :"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Dextérité :"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalité :"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligence :"
-
 #~ msgid "Willpower:"
 #~ msgstr "Volonté :"
 
@@ -584,12 +993,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Changer"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Attaque %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Défense %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "PV %+d"
 
diff --git a/po/he.po b/po/he.po
index 0b78dda9..87766812 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-10-20 00:23+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -17,123 +17,132 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "קנה"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "מחיר: %d זהב / סה\"כ %d זהב"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "תיאור: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "השפעה: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "עצור"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "מכר"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "ביטול"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "אשר מחיקת שחקן"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "צור שחקן"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "אישור"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "ביטול"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "חדש"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "מחק"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "הקודם"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "הבא"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "שם: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "זהב: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "צור שחקן"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "שם:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "צבע שיער:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "תיספורת:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "צור"
 
@@ -147,6 +156,225 @@ msgstr "החלף שרת"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "שרת:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "כן"
@@ -155,7 +383,7 @@ msgstr "כן"
 msgid "No"
 msgstr "לא"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "מתחבר..."
 
@@ -163,11 +391,20 @@ msgstr "מתחבר..."
 msgid "Equipment"
 msgstr "ציוד"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "ציוד"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "השתמש"
 
@@ -193,31 +430,27 @@ msgstr "הורד"
 msgid "Equip"
 msgstr "החזק"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצים לסחור."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצים להשליך."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "התחברות"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "שרת:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "זכור שם משתמש"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "הרשם"
 
@@ -225,7 +458,7 @@ msgstr "הרשם"
 msgid "Status"
 msgstr "מצב"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "כישורים"
 
@@ -233,7 +466,7 @@ msgstr "כישורים"
 msgid "Shortcut"
 msgstr "קיצור-דרך"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "הגדרות"
 
@@ -326,14 +559,10 @@ msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "מכר"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "צליל"
@@ -394,6 +623,64 @@ msgstr "עצור"
 msgid "Rotate the stick"
 msgstr "סובב את המקל"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "מחק"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "שם:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "מסך מלא"
@@ -468,6 +755,110 @@ msgstr "משנה OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "רמה: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "זהב: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "מצב"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "התקפה %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "הגנה %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "התקפה %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "הגנה %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "עוצמה:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "זריזות:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "חיוניות:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "תבונה:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "מיומנות:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "הוסף"
@@ -485,10 +876,43 @@ msgstr "אתה מקבל %d זהב."
 msgid "You give:"
 msgstr "אתה נותן:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "מתחבר..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "ניהול משתמש ושחקן"
 
@@ -504,21 +928,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "משתמש: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "עוצמה:"
-
-#~ msgid "Agility:"
-#~ msgstr "זריזות:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "מיומנות:"
-
-#~ msgid "Vitality:"
-#~ msgstr "חיוניות:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "תבונה:"
-
 #~ msgid "Willpower:"
 #~ msgstr "כח רצון:"
 
@@ -579,12 +988,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "שנה"
 
-#~ msgid "Attack %+d"
-#~ msgstr "התקפה %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "הגנה %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/hr.po b/po/hr.po
index 70fabbce..cef7cc6f 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-28 23:36+0000\n"
 "Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -17,123 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Kupi"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cijena: %d zlatnika / Ukupno: %d zlatnika"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Učinak: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Poništi"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Potvrdi Brisanje Lika"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Stvori Lika"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "U redu"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Poništi"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Novi"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Prethodni"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Slijedeći"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Ime: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Novac: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Stvori Lika"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Boja kose:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Frizura:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Stvori"
 
@@ -146,6 +154,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Da"
@@ -154,7 +381,7 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Spajanje..."
 
@@ -162,11 +389,20 @@ msgstr "Spajanje..."
 msgid "Equipment"
 msgstr "Oprema"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Zalihe"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Upotrijebi"
 
@@ -192,31 +428,27 @@ msgstr "Skini opremu"
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Lozinka"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registriraj se"
 
@@ -224,7 +456,7 @@ msgstr "Registriraj se"
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Vještine"
 
@@ -232,7 +464,7 @@ msgstr "Vještine"
 msgid "Shortcut"
 msgstr "Kratica"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Podešavanje"
 
@@ -325,14 +557,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Greška"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -393,6 +621,64 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Obriši"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Ime:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -467,6 +753,106 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Nivo: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Novac: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Stanje"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Snaga:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Okretnost:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalnost:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligencija:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Spretnost:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -484,10 +870,43 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Spajanje..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Upravljanje Računom i Likovima"
 
@@ -503,21 +922,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Korisnički račun: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Snaga:"
-
-#~ msgid "Agility:"
-#~ msgstr "Okretnost:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Spretnost:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalnost:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencija:"
-
 #~ msgid "Willpower:"
 #~ msgstr "Snaga volje:"
 
diff --git a/po/id.po b/po/id.po
index c470df15..6f2dda71 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-03-26 09:11+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Harga: %d GP / Jumlah: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Deskripsi: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efek: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Berhenti"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Jual"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Batal"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Pilih Karakter"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Batal"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Buat baru"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Berikutnya"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Uang: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Warna Rambut:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Gaya Rambut:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Buat"
 
@@ -146,6 +155,225 @@ msgstr "Pilih Karakter"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ya"
@@ -154,7 +382,7 @@ msgstr "Ya"
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Menyambung..."
 
@@ -162,11 +390,20 @@ msgstr "Menyambung..."
 msgid "Equipment"
 msgstr "Perlengkapan"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventaris"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Gunakan"
 
@@ -192,31 +429,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang mau di buang"
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Kata Sandi:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Mendaftar"
 
@@ -224,7 +457,7 @@ msgstr "Mendaftar"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -232,7 +465,7 @@ msgstr "Keahlian"
 msgid "Shortcut"
 msgstr "Tombol Singkat"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Atur"
 
@@ -325,14 +558,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Jual"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Suara"
@@ -393,6 +622,64 @@ msgstr "Berhenti"
 msgid "Rotate the stick"
 msgstr "Memutar tongkat"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Hapus"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nama:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Layar penuh"
@@ -467,6 +754,110 @@ msgstr "Mengubah OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Tingkatan: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Uang: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Serangan %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Pertahanan %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Serangan %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Pertahanan %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Kekuatan"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Daya/Tenaga Hidup"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Daya/Tenaga Hidup"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Kecerdasan"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Ketangkasan"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Tambah"
@@ -484,24 +875,45 @@ msgstr "Anda mendapatkan %d GP."
 msgid "You give:"
 msgstr "Anda memberikan:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Tidak terdaftar"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Strength:"
-#~ msgstr "Kekuatan"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Menyambung..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Ketangkasan"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Daya/Tenaga Hidup"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Kecerdasan"
+#~ msgid "Unregister"
+#~ msgstr "Tidak terdaftar"
 
 #~ msgid "Willpower:"
 #~ msgstr "Ketekunan"
@@ -554,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Ubah"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Serangan %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Pertahanan %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/it.po b/po/it.po
index 3f3cd860..a86caec2 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -19,122 +19,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Compra"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prezzo: %d GP / Totale: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Esci"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrizione : %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effetto : %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Ferma"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Vendi"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Cancella"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Scelta Personaggio"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Cancella"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nuovo"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Precedente"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Prossimo"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome : %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Monete: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nome :"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Colore Capelli"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Stile Capelli:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Create"
 
@@ -148,6 +157,225 @@ msgstr "Scelta Personaggio"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Si"
@@ -156,7 +384,7 @@ msgstr "Si"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Connessione..."
 
@@ -164,11 +392,20 @@ msgstr "Connessione..."
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventario"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Usa"
 
@@ -194,31 +431,27 @@ msgstr "Rimuovi"
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Autenticazione"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registra"
 
@@ -226,7 +459,7 @@ msgstr "Registra"
 msgid "Status"
 msgstr "Stato"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Abilità"
 
@@ -234,7 +467,7 @@ msgstr "Abilità"
 msgid "Shortcut"
 msgstr "Scorciatoia"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Impostazioni"
 
@@ -327,14 +560,10 @@ msgstr "La password deve contenere meno di %d caratteri."
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Errore"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Vendi"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Suono"
@@ -395,6 +624,64 @@ msgstr "Ferma"
 msgid "Rotate the stick"
 msgstr "Ruota la manopola"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Elimina"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nome :"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Schermo intero"
@@ -469,6 +756,110 @@ msgstr "Modifica OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Livello: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Monete: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Stato"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Attacco %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Difesa %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Attacco %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Difesa %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Forza:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilità:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalità:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligenza:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Destrezza:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Aggiungi"
@@ -486,27 +877,45 @@ msgstr "Ottieni %d GP."
 msgid "You give:"
 msgstr "Dai:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Cancella registrazione"
-
-#~ msgid "Strength:"
-#~ msgstr "Forza:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Agilità:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Connessione..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Destrezza:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitalità:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligenza:"
+#~ msgid "Unregister"
+#~ msgstr "Cancella registrazione"
 
 #~ msgid "Willpower:"
 #~ msgstr "Volontà:"
@@ -559,12 +968,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Cambia"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Attacco %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Difesa %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "PF %+d"
 
diff --git a/po/ja.po b/po/ja.po
index 9f3ee5a3..bd629cd2 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,122 +17,130 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "買う"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "価格: %d GP / 合計: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "終了"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "名状: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "効用: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "取消"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラは消してもいいですか?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "キャラを選択"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "了解"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "取消"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "新規"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "削除"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "前へ"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "次へ"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "GP: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "キャラを作成"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "名前:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "髪の色："
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "髪型："
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "作成"
 
@@ -146,6 +154,225 @@ msgstr "キャラを選択"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "サーバ:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "はい"
@@ -154,7 +381,7 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "接続しています..."
 
@@ -162,11 +389,20 @@ msgstr "接続しています..."
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "使う"
 
@@ -192,31 +428,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "サーバ:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
@@ -224,7 +456,7 @@ msgstr ""
 msgid "Status"
 msgstr "状態"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -232,7 +464,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "セットアップ"
 
@@ -325,14 +557,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "エラー"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -393,6 +621,64 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "削除"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "名前:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -467,6 +753,106 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "レベル: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "GP: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "状態"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "筋力:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "素早さ:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "体力:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "知性:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "敏捷:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -484,27 +870,45 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "登録削除"
-
-#~ msgid "Strength:"
-#~ msgstr "筋力:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "素早さ:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "接続しています..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "敏捷:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "体力:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "知性:"
+#~ msgid "Unregister"
+#~ msgstr "登録削除"
 
 #~ msgid "Willpower:"
 #~ msgstr "精神:"
diff --git a/po/nl.po b/po/nl.po
index 3d8aaf75..c2700ada 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-10-10 00:04+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stoppen"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Kies Personage"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Oké"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nieuw"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Vorige"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Volgende"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Haarkleur:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Haarstijl:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -146,6 +155,225 @@ msgstr "Kies Personage"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ja"
@@ -154,7 +382,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Verbinden..."
 
@@ -162,11 +390,20 @@ msgstr "Verbinden..."
 msgid "Equipment"
 msgstr "Uitrusting"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventaris"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -192,31 +429,27 @@ msgstr "Afdoen"
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Wachtword:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Aanmelden"
 
@@ -224,7 +457,7 @@ msgstr "Aanmelden"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -232,7 +465,7 @@ msgstr "Vaardigheden"
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Configureren"
 
@@ -325,14 +558,10 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Fout"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Geluid"
@@ -393,6 +622,64 @@ msgstr "Stoppen"
 msgid "Rotate the stick"
 msgstr "Maak rondjes met de stick"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Verwijderen"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Naam:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Volledig scherm"
@@ -467,6 +754,106 @@ msgstr "Veranderen van OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Level: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Geld: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Sterkte:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agiliteit:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitaliteit:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligentie:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Dexteriteit:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -484,27 +871,45 @@ msgstr ""
 msgid "You give:"
 msgstr "Je geeft:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Registreren"
-
-#~ msgid "Strength:"
-#~ msgstr "Sterkte:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Agiliteit:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Verbinden..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Dexteriteit:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitaliteit:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligentie:"
+#~ msgid "Unregister"
+#~ msgstr "Registreren"
 
 #~ msgid "Willpower:"
 #~ msgstr "Wilskracht:"
diff --git a/po/pl.po b/po/pl.po
index 114ba4fa..46cee40e 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -19,122 +19,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Kup"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Razem: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efekt: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Zatrzymaj"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Sprzedaj"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Wybierz postać"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nowa"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Następny"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Pieniądze: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Imię:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Kolor włosów:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Fryzura:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Stwórz"
 
@@ -148,6 +157,225 @@ msgstr "Wybierz postać"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Serwer:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Tak"
@@ -156,7 +384,7 @@ msgstr "Tak"
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Łączenie..."
 
@@ -164,11 +392,20 @@ msgstr "Łączenie..."
 msgid "Equipment"
 msgstr "Ekwipunek"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inwentarz"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Użyj"
 
@@ -194,31 +431,27 @@ msgstr "Zdejmij"
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do wymiany."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Użytkownik"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Serwer:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Rejestruj"
 
@@ -226,7 +459,7 @@ msgstr "Rejestruj"
 msgid "Status"
 msgstr "Stan"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -234,7 +467,7 @@ msgstr "Zdolności"
 msgid "Shortcut"
 msgstr "Skrót"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Konfiguracja"
 
@@ -327,14 +560,10 @@ msgstr "Hasło nie może mieć więcej jak %d znaków."
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Błąd"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Sprzedaj"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Dźwięk"
@@ -395,6 +624,64 @@ msgstr "Zatrzymaj"
 msgid "Rotate the stick"
 msgstr "Obróć drążek"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Usuń"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Imię:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Pełen ekran"
@@ -470,6 +757,110 @@ msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Poziom: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Pieniądze: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Stan"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Atak %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Obrona %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Atak %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Obrona %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Siła:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Zwinność:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Witalność:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligencja:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Zręczność:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Dodaj"
@@ -487,30 +878,48 @@ msgstr "Otrzymujesz %d GP"
 msgid "You give:"
 msgstr "Dajesz:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Wyrejestruj"
-
-#~ msgid "Change Password"
-#~ msgstr "Zmień hasło"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Strength:"
-#~ msgstr "Siła:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Łączenie..."
 
-#~ msgid "Agility:"
-#~ msgstr "Zwinność:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Dexterity:"
-#~ msgstr "Zręczność:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Witalność:"
+#~ msgid "Unregister"
+#~ msgstr "Wyrejestruj"
 
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencja:"
+#~ msgid "Change Password"
+#~ msgstr "Zmień hasło"
 
 #~ msgid "Willpower:"
 #~ msgstr "Siła woli:"
@@ -563,12 +972,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Zmień"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Atak %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Obrona %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "PŻ %+d"
 
diff --git a/po/pt.po b/po/pt.po
index a49fcaec..bd9630d1 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Parar"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Vender"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Seleccione um Personagem"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Novo"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Cor de Cabelo:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Criar"
 
@@ -146,6 +155,225 @@ msgstr "Seleccione um Personagem"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Sim"
@@ -154,7 +382,7 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Conectando..."
 
@@ -162,11 +390,20 @@ msgstr "Conectando..."
 msgid "Equipment"
 msgstr "Equipamento"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventário"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Usar"
 
@@ -192,31 +429,27 @@ msgstr "Desequipar"
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Seleccionar a quantidade de itens a negociar."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Seleccionar a quantidade de itens a largar."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Autenticar"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Servidor:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registo"
 
@@ -224,7 +457,7 @@ msgstr "Registo"
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Competências"
 
@@ -232,7 +465,7 @@ msgstr "Competências"
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Configuração"
 
@@ -325,14 +558,10 @@ msgstr "A password só pode ter até %d caracteres."
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Vender"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Som"
@@ -393,6 +622,64 @@ msgstr "Parar"
 msgid "Rotate the stick"
 msgstr "Rode o manipulo"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Eliminar"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nome:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Ecrã completo"
@@ -467,6 +754,118 @@ msgstr "Mudando OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Nível: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Dinheiro: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Estado"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr ""
+"Copy text   \t\r\n"
+"Ataque %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr ""
+"Copy text   \t\r\n"
+"Defesa %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr ""
+"Copy text   \t\r\n"
+"Ataque %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr ""
+"Copy text   \t\r\n"
+"Defesa %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Força:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilidade:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalidade:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligência:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Destreza:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Adicionar"
@@ -484,27 +883,45 @@ msgstr "Recebe %d GP."
 msgid "You give:"
 msgstr "Dá:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Remover o Registo"
-
-#~ msgid "Strength:"
-#~ msgstr "Força:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Agilidade:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Conectando..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Destreza:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitalidade:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligência:"
+#~ msgid "Unregister"
+#~ msgstr "Remover o Registo"
 
 #~ msgid "Willpower:"
 #~ msgstr "Força de Vontade:"
@@ -557,16 +974,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Modificar"
 
-#~ msgid "Attack %+d"
-#~ msgstr ""
-#~ "Copy text   \t\r\n"
-#~ "Ataque %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr ""
-#~ "Copy text   \t\r\n"
-#~ "Defesa %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b9bc6820..586cfc2d 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-14 21:37+0000\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Parar"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Vender"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza de que deseja excluir este personagem?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Selecionar personagem"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Novo"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Próximo"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Cor do Cabelo:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Criar"
 
@@ -146,6 +155,225 @@ msgstr "Selecionar personagem"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Sim"
@@ -154,7 +382,7 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Conectando..."
 
@@ -162,11 +390,20 @@ msgstr "Conectando..."
 msgid "Equipment"
 msgstr "Equipamento"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventório"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Usar"
 
@@ -192,31 +429,27 @@ msgstr "Desequipar"
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Selecionar montante de itens para negociar."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Selecionar montante de itens para descartar."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Servidor:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr "Lembrar nome de usuário"
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrar"
 
@@ -224,7 +457,7 @@ msgstr "Registrar"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -232,7 +465,7 @@ msgstr "Habilidades"
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Configurar"
 
@@ -325,14 +558,10 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Erro"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Vender"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Som"
@@ -393,6 +622,64 @@ msgstr "Parar"
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Excluir"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Nome:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Tela cheia"
@@ -467,6 +754,110 @@ msgstr "Trocando OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Nível: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Dinheiro: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Ataque %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Defesa %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Ataque %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Defesa %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Força:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agilidade:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitalidade:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligência:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Destreza:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Adicionar"
@@ -484,10 +875,43 @@ msgstr "Voc pegou %d GP."
 msgid "You give:"
 msgstr "Você dá:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Conectando..."
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Gerenciamento de Conta e Personagem"
 
@@ -503,21 +927,6 @@ msgstr ""
 #~ msgid "Account: %s"
 #~ msgstr "Conta: %s"
 
-#~ msgid "Strength:"
-#~ msgstr "Força:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilidade:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Destreza:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalidade:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligência:"
-
 #~ msgid "Willpower:"
 #~ msgstr "Força de Vontade:"
 
@@ -581,12 +990,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Mudar"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Ataque %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Defesa %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/ru.po b/po/ru.po
index 2eaa1a05..94be1f08 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Стоимость: %d GP / Всегоl: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Выход"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Эффект: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Стоп"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Продать"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Выбор персонажа"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Отмена"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Новый"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Следующий"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Деньги: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Цвет волос:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Стрижка:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Создать"
 
@@ -146,6 +155,225 @@ msgstr "Выбор персонажа"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Сервер:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Да"
@@ -154,7 +382,7 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Соединение..."
 
@@ -162,11 +390,20 @@ msgstr "Соединение..."
 msgid "Equipment"
 msgstr "Снаряжение"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Инвентарь"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Использовать"
 
@@ -192,31 +429,27 @@ msgstr "Снять"
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Сервер:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Зарегистрироваться"
 
@@ -224,7 +457,7 @@ msgstr "Зарегистрироваться"
 msgid "Status"
 msgstr "Состояние"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Умения"
 
@@ -232,7 +465,7 @@ msgstr "Умения"
 msgid "Shortcut"
 msgstr "Клавиша"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Настройка"
 
@@ -325,14 +558,10 @@ msgstr "Пароль не должен содержать более %d симв
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Продать"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Звук"
@@ -393,6 +622,64 @@ msgstr "Стоп"
 msgid "Rotate the stick"
 msgstr "Вращайте рукоять"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Удалить"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Имя:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "На полный экран"
@@ -467,6 +754,110 @@ msgstr "Переключение на OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Уровень: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Деньги: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Состояние"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Атака %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Защита %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Атака %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Защита %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Сила:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Выносливость:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Живучесть:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Интеллект:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Ловкость:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Добавить"
@@ -484,27 +875,45 @@ msgstr "Вы получили %d GP."
 msgid "You give:"
 msgstr "Вы отдаете:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Удалить регистрацию"
-
-#~ msgid "Strength:"
-#~ msgstr "Сила:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Выносливость:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Соединение..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Ловкость:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Живучесть:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Интеллект:"
+#~ msgid "Unregister"
+#~ msgstr "Удалить регистрацию"
 
 #~ msgid "Willpower:"
 #~ msgstr "Сила волиr:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Сменить"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Атака %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Защита %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"
 
diff --git a/po/sk.po b/po/sk.po
index 682fa81a..453c67dc 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-12-30 14:07+0000\n"
 "Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -17,123 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Spolu: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "Potvrdte zmazanie postavy"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ano"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Nový"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Vymazať"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Predchádzajúci"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Peniaze: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Meno"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Farba vlasov:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Štýl vlasov:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Vytvoriť"
 
@@ -146,6 +154,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr ""
@@ -154,7 +381,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr ""
 
@@ -162,11 +389,20 @@ msgstr ""
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr ""
 
@@ -192,31 +428,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr ""
 
@@ -224,7 +456,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -232,7 +464,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr ""
 
@@ -324,14 +556,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr ""
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -392,6 +620,64 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Vymazať"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Meno"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -466,6 +752,102 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Level: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Peniaze: %d"
+
+#: src/gui/status.cpp:127
+msgid "Stats"
+msgstr ""
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Sila:"
+
+#: src/gui/status.cpp:283
+msgid "Agility"
+msgstr ""
+
+#: src/gui/status.cpp:284
+msgid "Vitality"
+msgstr ""
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Inteligencia:"
+
+#: src/gui/status.cpp:286
+msgid "Dexterity"
+msgstr ""
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -483,10 +865,42 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/main.cpp:956
+msgid "Connecting to map server..."
+msgstr ""
+
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
+
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Účet a správa postáv"
 
@@ -501,9 +915,3 @@ msgstr ""
 
 #~ msgid "Account: %s"
 #~ msgstr "Účet: %s"
-
-#~ msgid "Strength:"
-#~ msgstr "Sila:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencia:"
diff --git a/po/sv.po b/po/sv.po
index 0d029cf5..85e37a50 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-05-07 19:04+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "Köp"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Totalt: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "Stopp"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "Sälj"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 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/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "Välj karaktär"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "Ny"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "Föregående"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "Nästa"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "Pengar: %d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "Hårfärg:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "Frisyr:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "Skapa"
 
@@ -146,6 +155,225 @@ msgstr "Välj karaktär"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "Ja"
@@ -154,7 +382,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "Ansluter..."
 
@@ -162,11 +390,20 @@ msgstr "Ansluter..."
 msgid "Equipment"
 msgstr "Utrustning"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "Inventarium"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "Använd"
 
@@ -192,31 +429,27 @@ msgstr "Avrusta"
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "Användarnamn"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "Registrera"
 
@@ -224,7 +457,7 @@ msgstr "Registrera"
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "Färdigheter"
 
@@ -232,7 +465,7 @@ msgstr "Färdigheter"
 msgid "Shortcut"
 msgstr "Genväg"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "Inställningar"
 
@@ -325,14 +558,10 @@ msgstr "Lösenordet måste vara kortare än %d tecken."
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "Fel"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "Sälj"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "Ljud"
@@ -393,6 +622,64 @@ msgstr "Stopp"
 msgid "Rotate the stick"
 msgstr "Rotera spaken"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "Ta bort"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "Namn:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "Helskärm"
@@ -467,6 +754,110 @@ msgstr "Ändrar OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Nivå: %d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "Pengar: %d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "Status"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "Attack %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "Försvar %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "Attack %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "Försvar %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Styrka:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Smidighet:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Hälsa:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligens:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Skicklighet:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lägg till"
@@ -484,27 +875,45 @@ msgstr "Du får %d GP."
 msgid "You give:"
 msgstr "Du ger:"
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "Avregistrera"
-
-#~ msgid "Strength:"
-#~ msgstr "Styrka:"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "Smidighet:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "Ansluter..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "Skicklighet:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Hälsa:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligens:"
+#~ msgid "Unregister"
+#~ msgstr "Avregistrera"
 
 #~ msgid "Willpower:"
 #~ msgstr "Viljestyrka:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "Ändra"
 
-#~ msgid "Attack %+d"
-#~ msgstr "Attack %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "Försvar %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "Hälsa %+d"
 
diff --git a/po/th.po b/po/th.po
index beaa5a31..e2ee2ab5 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,123 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "ราคา: %d GP / ทั้งหมด: %d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "ออก"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr "ยืนยันการลบตัวละคร"
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 #, fuzzy
 msgid "Select Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "ตกลง"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "ยกเลิก"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "สร้างใหม่"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "ถัดไป"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "ชื่อ: %s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "สีผม:"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "ทรงผม:"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "สร้าง"
 
@@ -146,6 +154,225 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr ""
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "ใช่"
@@ -154,7 +381,7 @@ msgstr "ใช่"
 msgid "No"
 msgstr "ไม่"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
@@ -162,11 +389,20 @@ msgstr "กำลังเชื่อมต่อ..."
 msgid "Equipment"
 msgstr ""
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "ใช้"
 
@@ -192,31 +428,27 @@ msgstr ""
 msgid "Equip"
 msgstr ""
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr ""
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
@@ -224,7 +456,7 @@ msgstr "สมัครสมาชิก"
 msgid "Status"
 msgstr "สถานะ"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr ""
 
@@ -232,7 +464,7 @@ msgstr ""
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "ตั้งค่า"
 
@@ -324,14 +556,10 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr ""
@@ -392,6 +620,64 @@ msgstr ""
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "ลบทิ้ง"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "ชื่อ:"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr ""
@@ -466,6 +752,106 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, c-format
+msgid "Money: %d GP"
+msgstr ""
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "สถานะ"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+msgid "Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:133
+msgid "Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:134
+msgid "M.Attack:"
+msgstr ""
+
+#: src/gui/status.cpp:135
+msgid "M.Defense:"
+msgstr ""
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "Strength:"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "Agility:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "Vitality:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligence:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "Dexterity:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
@@ -483,30 +869,48 @@ msgstr ""
 msgid "You give:"
 msgstr ""
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Change Password"
-#~ msgstr "เปลี่ยนรหัสผ่าน"
-
-#~ msgid "Change Email Address"
-#~ msgstr "เปลี่ยนที่อยู่ Email"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Strength:"
-#~ msgstr "Strength:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "กำลังเชื่อมต่อ..."
 
-#~ msgid "Agility:"
-#~ msgstr "Agility:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Dexterity:"
-#~ msgstr "Dexterity:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "Vitality:"
+#~ msgid "Change Password"
+#~ msgstr "เปลี่ยนรหัสผ่าน"
 
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligence:"
+#~ msgid "Change Email Address"
+#~ msgstr "เปลี่ยนที่อยู่ Email"
 
 #~ msgid "Willpower:"
 #~ msgstr "Willpower:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1dc7a3f0..031fde9c 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-01-06 14:37+0100\n"
+"POT-Creation-Date: 2009-01-08 22:10+0100\n"
 "PO-Revision-Date: 2008-09-17 14:41+0000\n"
 "Last-Translator: luojie-dune <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -17,122 +17,131 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/gui/buy.cpp:41 src/gui/buy.cpp:59
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
 msgid "Buy"
 msgstr "买"
 
-#: src/gui/buy.cpp:56 src/gui/buy.cpp:284 src/gui/sell.cpp:63
-#: src/gui/sell.cpp:304
+#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
+#: src/gui/sell.cpp:259
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "价格：%d GP/总数：%d GP"
 
-#: src/gui/buy.cpp:60 src/gui/sell.cpp:67
+#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buy.cpp:61 src/gui/buy.cpp:251 src/gui/buy.cpp:269
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:206 src/gui/buy.cpp:224
 #: src/gui/inventorywindow.cpp:150 src/gui/inventorywindow.cpp:160
-#: src/gui/sell.cpp:68 src/gui/sell.cpp:275 src/gui/sell.cpp:289
+#: src/gui/sell.cpp:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
 #: src/gui/trade.cpp:94 src/gui/trade.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
-#: src/gui/buy.cpp:62 src/gui/buy.cpp:253 src/gui/buy.cpp:270
+#: src/gui/buy.cpp:64 src/gui/buy.cpp:208 src/gui/buy.cpp:225
 #: src/gui/inventorywindow.cpp:149 src/gui/inventorywindow.cpp:158
-#: src/gui/sell.cpp:69 src/gui/sell.cpp:277 src/gui/sell.cpp:290
+#: src/gui/sell.cpp:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
 #, c-format
 msgid "Effect: %s"
 msgstr "影响: %s"
 
-#: src/gui/char_select.cpp:61
+#: src/gui/buysell.cpp:31
+#, fuzzy
+msgid "Shop"
+msgstr "停止"
+
+#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+msgid "Sell"
+msgstr "出售"
+
+#: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
+#: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
+#: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
+msgid "Cancel"
+msgstr "取消"
+
+#: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:62
+#: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个较色"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/char_select.cpp:81
 msgid "Select Character"
 msgstr "选择较色"
 
-#: src/gui/char_select.cpp:82 src/gui/item_amount.cpp:50 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:84 src/gui/item_amount.cpp:60 src/gui/login.cpp:51
 #: src/gui/ok_dialog.cpp:37 src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "OK"
 
-#: src/gui/char_select.cpp:83 src/gui/char_select.cpp:271
-#: src/gui/char_server.cpp:60 src/gui/connection.cpp:47
-#: src/gui/item_amount.cpp:51 src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:76 src/gui/setup.cpp:58
-#: src/gui/trade.cpp:63
-msgid "Cancel"
-msgstr "取消"
-
-#: src/gui/char_select.cpp:84
+#: src/gui/char_select.cpp:86
 msgid "New"
 msgstr "新建"
 
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/char_select.cpp:86
+#: src/gui/char_select.cpp:88
 msgid "Previous"
 msgstr "上一页"
 
-#: src/gui/char_select.cpp:87
+#: src/gui/char_select.cpp:89
 msgid "Next"
 msgstr "下一页"
 
-#: src/gui/char_select.cpp:89 src/gui/char_select.cpp:184
-#: src/gui/char_select.cpp:196 src/gui/inventorywindow.cpp:148
+#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:171
+#: src/gui/char_select.cpp:183 src/gui/inventorywindow.cpp:148
 #: src/gui/inventorywindow.cpp:156 src/gui/trade.cpp:92 src/gui/trade.cpp:264
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:185
-#: src/gui/char_select.cpp:197
+#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/char_select.cpp:91 src/gui/char_select.cpp:186
-#: src/gui/char_select.cpp:198
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
+#: src/gui/char_select.cpp:185
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/char_select.cpp:92 src/gui/char_select.cpp:199
+#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
 msgid "Money: %d"
 msgstr "金钱：%d"
 
-#: src/gui/char_select.cpp:187
+#: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: src/gui/char_select.cpp:243
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/char_select.cpp:263 src/gui/login.cpp:42 src/gui/register.cpp:65
+#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
 msgid "Name:"
 msgstr "名称"
 
-#: src/gui/char_select.cpp:266
+#: src/gui/char_select.cpp:253
 msgid "Hair Color:"
 msgstr "头发颜色"
 
-#: src/gui/char_select.cpp:269
+#: src/gui/char_select.cpp:256
 msgid "Hair Style:"
 msgstr "发型"
 
-#: src/gui/char_select.cpp:270
+#: src/gui/char_select.cpp:257
 msgid "Create"
 msgstr "建立"
 
@@ -146,6 +155,225 @@ msgstr "选择较色"
 msgid "OK"
 msgstr ""
 
+#: src/gui/chat.cpp:122
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/chat.cpp:125
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+msgid "Server:"
+msgstr "服务器："
+
+#: src/gui/chat.cpp:146
+#, c-format
+msgid "%s whispers:"
+msgstr ""
+
+#: src/gui/chat.cpp:283
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/chat.cpp:356
+msgid "Unknown command"
+msgstr ""
+
+#: src/gui/chat.cpp:366
+msgid "Trade failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:369
+msgid "Emote failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:372
+msgid "Sit failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:375
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/gui/chat.cpp:378
+msgid "Could not join party!"
+msgstr ""
+
+#: src/gui/chat.cpp:381
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/gui/chat.cpp:389
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/gui/chat.cpp:392
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/gui/chat.cpp:395
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/gui/chat.cpp:398
+msgid "You have no memos!"
+msgstr ""
+
+#: src/gui/chat.cpp:401
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/gui/chat.cpp:404
+msgid "Seems you need more Zeny... ;-)"
+msgstr ""
+
+#: src/gui/chat.cpp:407
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/gui/chat.cpp:410
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:413
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/gui/chat.cpp:416
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/gui/chat.cpp:419
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/gui/chat.cpp:425
+msgid "Warp failed..."
+msgstr ""
+
+#: src/gui/chat.cpp:428
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/gui/chat.cpp:431
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/gui/chat.cpp:496
+msgid "-- Help --"
+msgstr ""
+
+#: src/gui/chat.cpp:499
+msgid "/announce: Global announcement (GM only)"
+msgstr ""
+
+#: src/gui/chat.cpp:500
+msgid "/clear: Clears this window"
+msgstr ""
+
+#: src/gui/chat.cpp:501
+msgid "/help: Display this help"
+msgstr ""
+
+#: src/gui/chat.cpp:502
+msgid "/where: Display map name"
+msgstr ""
+
+#: src/gui/chat.cpp:503
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: src/gui/chat.cpp:505
+msgid "/w <nick> <message>: Short form for /whisper"
+msgstr ""
+
+#: src/gui/chat.cpp:506
+msgid "/who: Display number of online users"
+msgstr ""
+
+#: src/gui/chat.cpp:507
+msgid "For more information, type /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:512
+msgid "Command: /announce <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:513
+msgid "*** only available to a GM ***"
+msgstr ""
+
+#: src/gui/chat.cpp:514
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:520
+msgid "Command: /clear"
+msgstr ""
+
+#: src/gui/chat.cpp:521
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+
+#: src/gui/chat.cpp:527
+msgid "Command: /help"
+msgstr ""
+
+#: src/gui/chat.cpp:528
+msgid "This command displays a list of all commands available."
+msgstr ""
+
+#: src/gui/chat.cpp:530
+msgid "Command: /help <command>"
+msgstr ""
+
+#: src/gui/chat.cpp:531
+msgid "This command displays help on <command>."
+msgstr ""
+
+#: src/gui/chat.cpp:536
+msgid "Command: /where"
+msgstr ""
+
+#: src/gui/chat.cpp:537
+msgid "This command displays the name of the current map."
+msgstr ""
+
+#: src/gui/chat.cpp:543
+msgid "Command: /whisper <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:544
+msgid "Command: /w <nick> <msg>"
+msgstr ""
+
+#: src/gui/chat.cpp:545
+msgid "This command sends the message <msg> to <nick>."
+msgstr ""
+
+#: src/gui/chat.cpp:547
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/chat.cpp:553
+msgid "Command: /who"
+msgstr ""
+
+#: src/gui/chat.cpp:554
+msgid "This command displays the number of players currently online."
+msgstr ""
+
+#: src/gui/chat.cpp:558
+msgid "Unknown command."
+msgstr ""
+
+#: src/gui/chat.cpp:559
+msgid "Type /help for a list of commands."
+msgstr ""
+
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
 msgstr "是"
@@ -154,7 +382,7 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/connection.cpp:49
+#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
 msgid "Connecting..."
 msgstr "连接中..."
 
@@ -162,11 +390,20 @@ msgstr "连接中..."
 msgid "Equipment"
 msgstr "装备"
 
+#: src/gui/help.cpp:33
+msgid "Help"
+msgstr ""
+
+#: src/gui/help.cpp:41
+msgid "Close"
+msgstr ""
+
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
 msgstr "清单"
 
 #: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
+#: src/gui/skill.cpp:134
 msgid "Use"
 msgstr "使用"
 
@@ -192,31 +429,27 @@ msgstr "卸下装备"
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/item_amount.cpp:75
+#: src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量"
 
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量"
 
-#: src/gui/login.cpp:40
+#: src/gui/login.cpp:42
 msgid "Login"
 msgstr "登陆"
 
-#: src/gui/login.cpp:43 src/gui/register.cpp:66
+#: src/gui/login.cpp:45 src/gui/register.cpp:66
 msgid "Password:"
 msgstr "密码："
 
-#: src/gui/login.cpp:44 src/gui/register.cpp:68
-msgid "Server:"
-msgstr "服务器："
-
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
 msgid "Remember Username"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:75
 msgid "Register"
 msgstr "注册"
 
@@ -224,7 +457,7 @@ msgstr "注册"
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
 msgid "Skills"
 msgstr "技能"
 
@@ -232,7 +465,7 @@ msgstr "技能"
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: src/gui/menuwindow.cpp:66
+#: src/gui/menuwindow.cpp:66 src/main.cpp:716
 msgid "Setup"
 msgstr "安装"
 
@@ -325,14 +558,10 @@ msgstr "密码不能少于%d个字符"
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/register.cpp:227
+#: src/gui/register.cpp:227 src/main.cpp:945
 msgid "Error"
 msgstr "错误"
 
-#: src/gui/sell.cpp:46 src/gui/sell.cpp:66
-msgid "Sell"
-msgstr "出售"
-
 #: src/gui/setup_audio.cpp:40
 msgid "Sound"
 msgstr "声音"
@@ -393,6 +622,64 @@ msgstr "停止"
 msgid "Rotate the stick"
 msgstr "旋转手柄"
 
+#: src/gui/setup_keyboard.cpp:88
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:94
+#, fuzzy
+msgid "Default"
+msgstr "删除"
+
+#: src/gui/setup_keyboard.cpp:115
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:116
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+#, fuzzy
+msgid "Name"
+msgstr "名称"
+
+#: src/gui/setup_players.cpp:54
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_players.cpp:58
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_players.cpp:60
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_players.cpp:214
+msgid "Save player list"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_players.cpp:218
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_players.cpp:245
+msgid "When ignoring:"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Full screen"
 msgstr "全屏"
@@ -467,6 +754,110 @@ msgstr "改变成OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
+#: src/gui/skill.cpp:79
+msgid "Mystery Skill"
+msgstr ""
+
+#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#, c-format
+msgid "Skill points: %d"
+msgstr ""
+
+#: src/gui/skill.cpp:133
+msgid "Up"
+msgstr ""
+
+#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "等级：%d"
+
+#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#, fuzzy, c-format
+msgid "Money: %d GP"
+msgstr "金钱：%d"
+
+#: src/gui/status.cpp:127
+#, fuzzy
+msgid "Stats"
+msgstr "状态"
+
+#: src/gui/status.cpp:128
+msgid "Total"
+msgstr ""
+
+#: src/gui/status.cpp:129
+msgid "Cost"
+msgstr ""
+
+#: src/gui/status.cpp:132
+#, fuzzy
+msgid "Attack:"
+msgstr "攻击 %+d"
+
+#: src/gui/status.cpp:133
+#, fuzzy
+msgid "Defense:"
+msgstr "防护 %+d"
+
+#: src/gui/status.cpp:134
+#, fuzzy
+msgid "M.Attack:"
+msgstr "攻击 %+d"
+
+#: src/gui/status.cpp:135
+#, fuzzy
+msgid "M.Defense:"
+msgstr "防护 %+d"
+
+#: src/gui/status.cpp:136
+#, c-format
+msgid "% Accuracy:"
+msgstr ""
+
+#: src/gui/status.cpp:137
+#, c-format
+msgid "% Evade:"
+msgstr ""
+
+#: src/gui/status.cpp:138
+msgid "% Reflex:"
+msgstr ""
+
+#: src/gui/status.cpp:282
+#, fuzzy
+msgid "Strength"
+msgstr "力量"
+
+#: src/gui/status.cpp:283
+#, fuzzy
+msgid "Agility"
+msgstr "敏捷:"
+
+#: src/gui/status.cpp:284
+#, fuzzy
+msgid "Vitality"
+msgstr "体力:"
+
+#: src/gui/status.cpp:285
+#, fuzzy
+msgid "Intelligence"
+msgstr "智力:"
+
+#: src/gui/status.cpp:286
+#, fuzzy
+msgid "Dexterity"
+msgstr "智慧:"
+
+#: src/gui/status.cpp:287
+msgid "Luck"
+msgstr ""
+
+#: src/gui/status.cpp:305
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr ""
+
 #: src/gui/trade.cpp:61
 msgid "Add"
 msgstr "添加"
@@ -484,27 +875,45 @@ msgstr "你得到%d GP."
 msgid "You give:"
 msgstr "你得到："
 
+#: src/gui/trade.cpp:283
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:93
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updatewindow.cpp:119
+msgid "Play"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:525
+msgid "Completed"
+msgstr ""
+
 #: src/resources/itemdb.cpp:99
 msgid "Unnamed"
 msgstr ""
 
-#~ msgid "Unregister"
-#~ msgstr "注销"
-
-#~ msgid "Strength:"
-#~ msgstr "力量"
+#: src/main.cpp:769
+msgid "Got disconnected from server!"
+msgstr ""
 
-#~ msgid "Agility:"
-#~ msgstr "敏捷:"
+#: src/main.cpp:956
+#, fuzzy
+msgid "Connecting to map server..."
+msgstr "连接中..."
 
-#~ msgid "Dexterity:"
-#~ msgstr "智慧:"
+#: src/main.cpp:964
+msgid "Connecting to character server..."
+msgstr ""
 
-#~ msgid "Vitality:"
-#~ msgstr "体力:"
+#: src/main.cpp:972
+msgid "Connecting to account server..."
+msgstr ""
 
-#~ msgid "Intelligence:"
-#~ msgstr "智力:"
+#~ msgid "Unregister"
+#~ msgstr "注销"
 
 #~ msgid "Willpower:"
 #~ msgstr "意志力:"
@@ -557,12 +966,6 @@ msgstr ""
 #~ msgid "Change"
 #~ msgstr "改变"
 
-#~ msgid "Attack %+d"
-#~ msgstr "攻击 %+d"
-
-#~ msgid "Defense %+d"
-#~ msgstr "防护 %+d"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"